From 0fd325c031ac08fb7f472d988319291ee869c2ec Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Wed, 17 Dec 2025 15:24:56 +0000 Subject: [PATCH] Revert "Docker: Do not publish master branch Docker images on DockerHub" This reverts commit 26967735ee16ecf2d05787eec9041bc4fce216cb --- .gitlab/ci/pipelines/master_branch.yml | 6 +++--- .gitlab/ci/pipelines/schedule_docker_build_pipeline.yml | 6 +++--- ci/lib_tezos_ci_jobs/common.ml | 4 ++-- ci/lib_tezos_ci_jobs/master_branch.ml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index 5dc27a7215cb..d24129edfbc7 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -390,7 +390,7 @@ oc.docker:amd64: - docker:${DOCKER_VERSION}-dind variables: DOCKER_VERSION: 24.0.7 - CI_DOCKER_HUB: "false" + CI_DOCKER_HUB: "true" DOCKER_BUILD_TARGET: with-evm-artifacts IMAGE_ARCH_PREFIX: amd64_ EXECUTABLE_FILES: script-inputs/released-executables script-inputs/experimental-executables @@ -419,7 +419,7 @@ oc.docker:arm64: - docker:${DOCKER_VERSION}-dind variables: DOCKER_VERSION: 24.0.7 - CI_DOCKER_HUB: "false" + CI_DOCKER_HUB: "true" DOCKER_BUILD_TARGET: without-evm-artifacts IMAGE_ARCH_PREFIX: arm64_ EXECUTABLE_FILES: script-inputs/released-executables script-inputs/experimental-executables @@ -448,7 +448,7 @@ docker:merge_manifests: - docker:${DOCKER_VERSION}-dind variables: DOCKER_VERSION: 24.0.7 - CI_DOCKER_HUB: "false" + CI_DOCKER_HUB: "true" retry: 0 publish_kernel_sdk: diff --git a/.gitlab/ci/pipelines/schedule_docker_build_pipeline.yml b/.gitlab/ci/pipelines/schedule_docker_build_pipeline.yml index 530e72335627..db5433e90425 100644 --- a/.gitlab/ci/pipelines/schedule_docker_build_pipeline.yml +++ b/.gitlab/ci/pipelines/schedule_docker_build_pipeline.yml @@ -137,7 +137,7 @@ oc.docker:amd64: - docker:${DOCKER_VERSION}-dind variables: DOCKER_VERSION: 24.0.7 - CI_DOCKER_HUB: "false" + CI_DOCKER_HUB: "true" DOCKER_BUILD_TARGET: with-evm-artifacts IMAGE_ARCH_PREFIX: amd64_ EXECUTABLE_FILES: script-inputs/released-executables script-inputs/experimental-executables @@ -166,7 +166,7 @@ oc.docker:arm64: - docker:${DOCKER_VERSION}-dind variables: DOCKER_VERSION: 24.0.7 - CI_DOCKER_HUB: "false" + CI_DOCKER_HUB: "true" DOCKER_BUILD_TARGET: without-evm-artifacts IMAGE_ARCH_PREFIX: arm64_ EXECUTABLE_FILES: script-inputs/released-executables script-inputs/experimental-executables @@ -195,5 +195,5 @@ docker:merge_manifests: - docker:${DOCKER_VERSION}-dind variables: DOCKER_VERSION: 24.0.7 - CI_DOCKER_HUB: "false" + CI_DOCKER_HUB: "true" retry: 0 diff --git a/ci/lib_tezos_ci_jobs/common.ml b/ci/lib_tezos_ci_jobs/common.ml index 06ada3da0057..5b20d25cc773 100644 --- a/ci/lib_tezos_ci_jobs/common.ml +++ b/ci/lib_tezos_ci_jobs/common.ml @@ -327,8 +327,8 @@ module Docker = struct let arch_string = Runner.Arch.show_uniform arch in let ci_docker_hub = match docker_build_type with - | Release | Octez_evm_node_release -> true - | Experimental | Test | Test_manual -> false + | Release | Octez_evm_node_release | Experimental -> true + | Test | Test_manual -> false in (* Whether to include evm artifacts. Including these artifacts requires the rust-toolchain image. *) diff --git a/ci/lib_tezos_ci_jobs/master_branch.ml b/ci/lib_tezos_ci_jobs/master_branch.ml index 14e39f7d5e9b..ffd315c43b31 100644 --- a/ci/lib_tezos_ci_jobs/master_branch.ml +++ b/ci/lib_tezos_ci_jobs/master_branch.ml @@ -61,7 +61,7 @@ let octez_distribution_docker_jobs = let job_docker_merge_manifests = job_docker_merge_manifests ~__POS__ - ~ci_docker_hub:false + ~ci_docker_hub:true ~job_docker_amd64:job_docker_amd64_experimental ~job_docker_arm64:job_docker_arm64_experimental in -- GitLab