diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45f98f11f91162121d0fdd4f36d6ded4e747dcba..4bf80a2c2da7f8f1a274c185184276de924c0d76 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,8 +14,8 @@ variables: GIT_SUBMODULE_STRATEGY: recursive FF_ENABLE_JOB_CLEANUP: 1 GIT_STRATEGY: clone - # uses registry.gitlab.syncad.com/hive/haf/ci-base-image:ubuntu22.04-16 - BUILDER_IMAGE_TAG: "@sha256:e5492a0fc58cf86009a1e27574f63bf597c4740767b837fa23af803cf606cffb" + # uses registry.gitlab.syncad.com/hive/haf/ci-base-image:ubuntu22.04-17 + BUILDER_IMAGE_TAG: "@sha256:234d3592e53d4cd7cc6df8e61366e8cbe69ac439355475c34fb2b0daf40e7a26" CI_DEBUG_SERVICES: "true" SETUP_SCRIPTS_PATH: "$CI_PROJECT_DIR/scripts" TEST_TOOLS_NODE_DEFAULT_WAIT_FOR_LIVE_TIMEOUT: 60 diff --git a/Dockerfile b/Dockerfile index c600e5e5a7d28f8df088e904c040aca3bc0facd6..d58734949cdfd342cb0b7bb4bb7c83f338562b17 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,12 @@ # docker buildx build --progress=plain --target=ci-base-image --tag registry.gitlab.syncad.com/hive/haf/ci-base-image$CI_IMAGE_TAG --file Dockerfile . # To be started from cloned haf source directory. ARG CI_REGISTRY_IMAGE=registry.gitlab.syncad.com/hive/haf/ -ARG CI_IMAGE_TAG=ubuntu22.04-16 +ARG CI_IMAGE_TAG=ubuntu22.04-17 ARG BUILD_IMAGE_TAG ARG IMAGE_TAG_PREFIX -FROM registry.gitlab.syncad.com/hive/hive/minimal-runtime:ubuntu22.04-10 AS minimal-runtime +FROM registry.gitlab.syncad.com/hive/hive/minimal-runtime:ubuntu22.04-13 AS minimal-runtime ENV PATH="/home/haf_admin/.local/bin:$PATH" @@ -44,7 +44,7 @@ RUN useradd -r -s /usr/sbin/nologin -b /nonexistent -c "HAF maintenance service USER haf_admin WORKDIR /home/haf_admin -FROM registry.gitlab.syncad.com/hive/hive/ci-base-image:ubuntu22.04-10 AS ci-base-image +FROM registry.gitlab.syncad.com/hive/hive/ci-base-image:ubuntu22.04-13 AS ci-base-image ENV PATH="/home/haf_admin/.local/bin:$PATH" diff --git a/hive b/hive index f8a89045f1ddce374b83e55aad21bd4418e71b9e..1c2fe378cbb7c61147881dce247a6d9c28188f9e 160000 --- a/hive +++ b/hive @@ -1 +1 @@ -Subproject commit f8a89045f1ddce374b83e55aad21bd4418e71b9e +Subproject commit 1c2fe378cbb7c61147881dce247a6d9c28188f9e diff --git a/scripts/ci-helpers/build_ci_base_image.sh b/scripts/ci-helpers/build_ci_base_image.sh index 85f386111f01eff81def071f05ef2e3e58485d38..21f631d0727093ecba0ed63f69208f20e93c87f1 100755 --- a/scripts/ci-helpers/build_ci_base_image.sh +++ b/scripts/ci-helpers/build_ci_base_image.sh @@ -1,7 +1,7 @@ #! /bin/bash REGISTRY=${1:-registry.gitlab.syncad.com/hive/haf/} -CI_IMAGE_TAG=ubuntu22.04-16 +CI_IMAGE_TAG=ubuntu22.04-17 # exit when any command fails set -e diff --git a/scripts/ci-helpers/prepare_data_image_job.yml b/scripts/ci-helpers/prepare_data_image_job.yml index a1a5bf293502f5be1e0d2f6c46fbc78d89322691..8f499d784cc18b7bc111ac3d55024f4e503266e6 100644 --- a/scripts/ci-helpers/prepare_data_image_job.yml +++ b/scripts/ci-helpers/prepare_data_image_job.yml @@ -1,6 +1,6 @@ include: - project: 'hive/hive' - ref: b2f0703551880c36797da6382fb1ee227877dedd #develop + ref: 1c2fe378cbb7c61147881dce247a6d9c28188f9e #develop file: '/scripts/ci-helpers/prepare_data_image_job.yml' .prepare_haf_image: diff --git a/tests/integration/haf-local-tools/poetry.lock b/tests/integration/haf-local-tools/poetry.lock index 35c39afd5ece709231045d133b19a1ec03b383d7..82c2238f0bfd2be68c641c0bbc30a09cf3b10585 100644 --- a/tests/integration/haf-local-tools/poetry.lock +++ b/tests/integration/haf-local-tools/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand. [[package]] name = "abstractcp" @@ -173,16 +173,16 @@ tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pyte [[package]] name = "beekeepy" -version = "0.0.1.dev274+5df076c" +version = "0.0.1.dev327+6dbc448" description = "All in one package for beekeeper interaction via Python interface." optional = false python-versions = ">=3.10,<4.0" files = [ - {file = "beekeepy-0.0.1.dev274+5df076c-py3-none-any.whl", hash = "sha256:f0572c8ca3511485857256a6fb5c2f1ddee6f15867b9002e27f050e3b62ddf67"}, + {file = "beekeepy-0.0.1.dev327+6dbc448-py3-none-any.whl", hash = "sha256:84420db8aa9858a8522e48b5ef491c4aa973658e0ef34fee9fdbd2a3a73fa0e8"}, ] [package.dependencies] -helpy = "0.0.1.dev274+5df076c" +helpy = "0.0.1.dev327+6dbc448" [package.source] type = "legacy" @@ -456,12 +456,12 @@ hyperframe = ">=6.0,<7" [[package]] name = "helpy" -version = "0.0.1.dev274+5df076c" +version = "0.0.1.dev327+6dbc448" description = "Easily interact with the Hive blockchain using Python." optional = false python-versions = ">=3.10,<4.0" files = [ - {file = "helpy-0.0.1.dev274+5df076c-py3-none-any.whl", hash = "sha256:a2b8b2cac5b8fb2304f43c43b7c08bedf3176988190ef7904cc35bbab31053a3"}, + {file = "helpy-0.0.1.dev327+6dbc448-py3-none-any.whl", hash = "sha256:cd22b4c98a9e16065db8e889d8488050ee305d6b2577e5b0256ff04f9a2950f3"}, ] [package.dependencies] @@ -471,7 +471,7 @@ loguru = "0.7.2" python-dateutil = "2.8.2" requests = "2.27.1" schemas = "0.0.1.dev323+e5a1ba1" -wax = "0.3.10.dev227+a000255" +wax = "0.3.10.dev321+1384595" [package.source] type = "legacy" @@ -1605,7 +1605,7 @@ files = [ ] [package.dependencies] -greenlet = {version = "!=0.4.17", markers = "python_version >= \"3\" and (platform_machine == \"aarch64\" or platform_machine == \"ppc64le\" or platform_machine == \"x86_64\" or platform_machine == \"amd64\" or platform_machine == \"AMD64\" or platform_machine == \"win32\" or platform_machine == \"WIN32\")"} +greenlet = {version = "!=0.4.17", markers = "python_version >= \"3\" and (platform_machine == \"win32\" or platform_machine == \"WIN32\" or platform_machine == \"AMD64\" or platform_machine == \"amd64\" or platform_machine == \"x86_64\" or platform_machine == \"ppc64le\" or platform_machine == \"aarch64\")"} [package.extras] aiomysql = ["aiomysql (>=0.2.0)", "greenlet (!=0.4.17)"] @@ -1707,7 +1707,7 @@ develop = true [package.dependencies] abstractcp = "0.9.9" -beekeepy = "0.0.1.dev274+5df076c" +beekeepy = "0.0.1.dev327+6dbc448" loguru = "0.7.2" python-dateutil = "2.8.2" requests = "2.27.1" @@ -1811,12 +1811,12 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "wax" -version = "0.3.10.dev227+a000255" +version = "0.3.10.dev321+1384595" description = "" optional = false python-versions = ">=3.10,<4.0" files = [ - {file = "wax-0.3.10.dev227+a000255-cp310-cp310-manylinux_2_35_x86_64.whl", hash = "sha256:33d35f07c91ae3916cd1ba3dc883c2f58a4eee33f2e5a04fe8139c61d1244b69"}, + {file = "wax-0.3.10.dev321+1384595-cp310-cp310-manylinux_2_35_x86_64.whl", hash = "sha256:747429dfa159864212acf5f4ad57684f551b33152fa6b2dc0a6d62b7cd50d1d0"}, ] [package.dependencies]