From 967d4defb2556edf9540346e0dc4b8eee73747f3 Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Fri, 23 May 2025 14:36:31 +0200 Subject: [PATCH 1/6] CI: rename stage [publishing] into [publish] Consistent with main stages (build, test, etc). --- .gitlab/ci/pipelines/debian_repository_full.yml | 6 +++--- .gitlab/ci/pipelines/debian_repository_partial.yml | 4 ++-- .../ci/pipelines/debian_repository_partial_auto.yml | 4 ++-- .gitlab/ci/pipelines/master_branch.yml | 4 ++-- .gitlab/ci/pipelines/non_release_tag.yml | 10 +++++----- .gitlab/ci/pipelines/non_release_tag_test.yml | 10 +++++----- .gitlab/ci/pipelines/octez_beta_release_tag.yml | 10 +++++----- .gitlab/ci/pipelines/octez_release_tag.yml | 10 +++++----- .gitlab/ci/pipelines/octez_release_tag_test.yml | 10 +++++----- .gitlab/ci/pipelines/rpm_repository_full.yml | 6 +++--- .gitlab/ci/pipelines/rpm_repository_partial.yml | 4 ++-- .gitlab/ci/pipelines/rpm_repository_partial_auto.yml | 4 ++-- .gitlab/ci/pipelines/schedule_documentation.yml | 4 ++-- .gitlab/ci/pipelines/schedule_master_test_release.yml | 10 +++++----- ci/bin/common.ml | 2 +- ci/bin/debian_repository.ml | 2 +- ci/bin/rpm_repository.ml | 2 +- ci/lib_tezos_ci/tezos_ci.ml | 2 +- ci/lib_tezos_ci/tezos_ci.mli | 2 +- 19 files changed, 53 insertions(+), 53 deletions(-) diff --git a/.gitlab/ci/pipelines/debian_repository_full.yml b/.gitlab/ci/pipelines/debian_repository_full.yml index ec019d7fb053..df3d7a5cd19a 100644 --- a/.gitlab/ci/pipelines/debian_repository_full.yml +++ b/.gitlab/ci/pipelines/debian_repository_full.yml @@ -10,7 +10,7 @@ stages: - start - images - build -- publishing +- publish - publishing_tests datadog_pipeline_trace: @@ -204,7 +204,7 @@ oc.build-data_packages: apt_repo_debian: image: debian:bookworm - stage: publishing + stage: publish tags: - gcp needs: @@ -317,7 +317,7 @@ oc.build-ubuntu: apt_repo_ubuntu: image: public.ecr.aws/lts/ubuntu:24.04_stable - stage: publishing + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/debian_repository_partial.yml b/.gitlab/ci/pipelines/debian_repository_partial.yml index 5ae45603b1ed..d33fc34d1787 100644 --- a/.gitlab/ci/pipelines/debian_repository_partial.yml +++ b/.gitlab/ci/pipelines/debian_repository_partial.yml @@ -10,7 +10,7 @@ stages: - start - images - build -- publishing +- publish - publishing_tests datadog_pipeline_trace: @@ -164,7 +164,7 @@ oc.build-data_packages: apt_repo_debian: image: debian:bookworm - stage: publishing + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml index 5ae45603b1ed..d33fc34d1787 100644 --- a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml +++ b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml @@ -10,7 +10,7 @@ stages: - start - images - build -- publishing +- publish - publishing_tests datadog_pipeline_trace: @@ -164,7 +164,7 @@ oc.build-data_packages: apt_repo_debian: image: debian:bookworm - stage: publishing + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index c0035c36f453..4be8424ec650 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -6,7 +6,7 @@ stages: - images - build - test_coverage -- publishing +- publish - prepare_release - manual @@ -623,7 +623,7 @@ documentation:build_all: documentation:publish: image: ${ci_image_name}/test:${ci_image_tag} - stage: publishing + stage: publish tags: - gcp rules: diff --git a/.gitlab/ci/pipelines/non_release_tag.yml b/.gitlab/ci/pipelines/non_release_tag.yml index 16915983cc88..a2d18116e66b 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -5,7 +5,7 @@ stages: - start - images - build -- publishing +- publish - prepare_release - publish_package_gitlab @@ -401,7 +401,7 @@ oc.build-data_packages: apt_repo_debian: image: debian:bookworm - stage: publishing + stage: publish tags: - gcp needs: @@ -514,7 +514,7 @@ oc.build-ubuntu: apt_repo_ubuntu: image: public.ecr.aws/lts/ubuntu:24.04_stable - stage: publishing + stage: publish tags: - gcp needs: @@ -697,7 +697,7 @@ oc.build-rockylinux-data: rpm_repo_rockylinux: image: rockylinux:9.3 - stage: publishing + stage: publish tags: - gcp needs: @@ -883,7 +883,7 @@ oc.build-fedora-data: rpm_repo_fedora: image: fedora:39 - stage: publishing + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/non_release_tag_test.yml b/.gitlab/ci/pipelines/non_release_tag_test.yml index c1dcd2f98f6b..e00c26b9d01f 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -5,7 +5,7 @@ stages: - start - images - build -- publishing +- publish - prepare_release - publish_package_gitlab @@ -401,7 +401,7 @@ oc.build-data_packages: apt_repo_debian: image: debian:bookworm - stage: publishing + stage: publish tags: - gcp needs: @@ -514,7 +514,7 @@ oc.build-ubuntu: apt_repo_ubuntu: image: public.ecr.aws/lts/ubuntu:24.04_stable - stage: publishing + stage: publish tags: - gcp needs: @@ -697,7 +697,7 @@ oc.build-rockylinux-data: rpm_repo_rockylinux: image: rockylinux:9.3 - stage: publishing + stage: publish tags: - gcp needs: @@ -883,7 +883,7 @@ oc.build-fedora-data: rpm_repo_fedora: image: fedora:39 - stage: publishing + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml index d70000ef6af6..74b6a50f89a6 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -5,7 +5,7 @@ stages: - start - images - build -- publishing +- publish - prepare_release - publish_release_gitlab @@ -402,7 +402,7 @@ oc.build-data_packages: apt_repo_debian: image: debian:bookworm - stage: publishing + stage: publish tags: - gcp needs: @@ -515,7 +515,7 @@ oc.build-ubuntu: apt_repo_ubuntu: image: public.ecr.aws/lts/ubuntu:24.04_stable - stage: publishing + stage: publish tags: - gcp needs: @@ -698,7 +698,7 @@ oc.build-rockylinux-data: rpm_repo_rockylinux: image: rockylinux:9.3 - stage: publishing + stage: publish tags: - gcp needs: @@ -884,7 +884,7 @@ oc.build-fedora-data: rpm_repo_fedora: image: fedora:39 - stage: publishing + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/octez_release_tag.yml b/.gitlab/ci/pipelines/octez_release_tag.yml index 841984c70b17..e97a8a95be9d 100644 --- a/.gitlab/ci/pipelines/octez_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_release_tag.yml @@ -5,7 +5,7 @@ stages: - start - images - build -- publishing +- publish - prepare_release - publish_release_gitlab - publish_release @@ -403,7 +403,7 @@ oc.build-data_packages: apt_repo_debian: image: debian:bookworm - stage: publishing + stage: publish tags: - gcp needs: @@ -516,7 +516,7 @@ oc.build-ubuntu: apt_repo_ubuntu: image: public.ecr.aws/lts/ubuntu:24.04_stable - stage: publishing + stage: publish tags: - gcp needs: @@ -699,7 +699,7 @@ oc.build-rockylinux-data: rpm_repo_rockylinux: image: rockylinux:9.3 - stage: publishing + stage: publish tags: - gcp needs: @@ -885,7 +885,7 @@ oc.build-fedora-data: rpm_repo_fedora: image: fedora:39 - stage: publishing + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/octez_release_tag_test.yml b/.gitlab/ci/pipelines/octez_release_tag_test.yml index 816c6a3d444d..6f24539e06bd 100644 --- a/.gitlab/ci/pipelines/octez_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_release_tag_test.yml @@ -5,7 +5,7 @@ stages: - start - images - build -- publishing +- publish - prepare_release - publish_release_gitlab - publish_release @@ -403,7 +403,7 @@ oc.build-data_packages: apt_repo_debian: image: debian:bookworm - stage: publishing + stage: publish tags: - gcp needs: @@ -516,7 +516,7 @@ oc.build-ubuntu: apt_repo_ubuntu: image: public.ecr.aws/lts/ubuntu:24.04_stable - stage: publishing + stage: publish tags: - gcp needs: @@ -699,7 +699,7 @@ oc.build-rockylinux-data: rpm_repo_rockylinux: image: rockylinux:9.3 - stage: publishing + stage: publish tags: - gcp needs: @@ -885,7 +885,7 @@ oc.build-fedora-data: rpm_repo_fedora: image: fedora:39 - stage: publishing + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/rpm_repository_full.yml b/.gitlab/ci/pipelines/rpm_repository_full.yml index a5bb466d04e1..1c4dbc2081c3 100644 --- a/.gitlab/ci/pipelines/rpm_repository_full.yml +++ b/.gitlab/ci/pipelines/rpm_repository_full.yml @@ -10,7 +10,7 @@ stages: - start - images - build -- publishing +- publish - publishing_tests datadog_pipeline_trace: @@ -181,7 +181,7 @@ oc.build-rockylinux-data: rpm_repo_rockylinux: image: rockylinux:9.3 - stage: publishing + stage: publish tags: - gcp needs: @@ -367,7 +367,7 @@ oc.build-fedora-data: rpm_repo_fedora: image: fedora:39 - stage: publishing + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/rpm_repository_partial.yml b/.gitlab/ci/pipelines/rpm_repository_partial.yml index f9ec8eab2462..be83aa730926 100644 --- a/.gitlab/ci/pipelines/rpm_repository_partial.yml +++ b/.gitlab/ci/pipelines/rpm_repository_partial.yml @@ -10,7 +10,7 @@ stages: - start - images - build -- publishing +- publish - publishing_tests datadog_pipeline_trace: @@ -177,7 +177,7 @@ oc.build-rockylinux-data: rpm_repo_rockylinux: image: rockylinux:9.3 - stage: publishing + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml b/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml index f9ec8eab2462..be83aa730926 100644 --- a/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml +++ b/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml @@ -10,7 +10,7 @@ stages: - start - images - build -- publishing +- publish - publishing_tests datadog_pipeline_trace: @@ -177,7 +177,7 @@ oc.build-rockylinux-data: rpm_repo_rockylinux: image: rockylinux:9.3 - stage: publishing + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/schedule_documentation.yml b/.gitlab/ci/pipelines/schedule_documentation.yml index dde90399b815..ed788a706ba9 100644 --- a/.gitlab/ci/pipelines/schedule_documentation.yml +++ b/.gitlab/ci/pipelines/schedule_documentation.yml @@ -5,7 +5,7 @@ stages: - start - images - build -- publishing +- publish oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -314,7 +314,7 @@ documentation:build_all: documentation:publish: image: ${ci_image_name}/test:${ci_image_tag} - stage: publishing + stage: publish tags: - gcp rules: diff --git a/.gitlab/ci/pipelines/schedule_master_test_release.yml b/.gitlab/ci/pipelines/schedule_master_test_release.yml index b71fd7790562..c39bf2eb2cfa 100644 --- a/.gitlab/ci/pipelines/schedule_master_test_release.yml +++ b/.gitlab/ci/pipelines/schedule_master_test_release.yml @@ -5,7 +5,7 @@ stages: - start - images - build -- publishing +- publish - prepare_release - publish_package_gitlab @@ -404,7 +404,7 @@ oc.build-data_packages: apt_repo_debian: image: debian:bookworm - stage: publishing + stage: publish tags: - gcp needs: @@ -517,7 +517,7 @@ oc.build-ubuntu: apt_repo_ubuntu: image: public.ecr.aws/lts/ubuntu:24.04_stable - stage: publishing + stage: publish tags: - gcp needs: @@ -700,7 +700,7 @@ oc.build-rockylinux-data: rpm_repo_rockylinux: image: rockylinux:9.3 - stage: publishing + stage: publish tags: - gcp needs: @@ -886,7 +886,7 @@ oc.build-fedora-data: rpm_repo_fedora: image: fedora:39 - stage: publishing + stage: publish tags: - gcp needs: diff --git a/ci/bin/common.ml b/ci/bin/common.ml index 63c2beb8c6a7..4759717b7692 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -1326,7 +1326,7 @@ module Documentation = struct ~__POS__ ~name:"documentation:publish" ~image:Images.CI.test - ~stage:Stages.publishing + ~stage:Stages.publish ~dependencies ~before_script: (before_script diff --git a/ci/bin/debian_repository.ml b/ci/bin/debian_repository.ml index a5723d92e240..a5870f84881f 100644 --- a/ci/bin/debian_repository.ml +++ b/ci/bin/debian_repository.ml @@ -66,7 +66,7 @@ let archs_variables pipeline = | Full | Release -> [("ARCHITECTURES", String.concat " " all)] (* Push .deb artifacts to storagecloud apt repository. *) -let make_job_apt_repo ?rules ~__POS__ ~name ?(stage = Stages.publishing) +let make_job_apt_repo ?rules ~__POS__ ~name ?(stage = Stages.publish) ?dependencies ~prefix ~variables ~image script : tezos_job = let variables = variables @ [("GNUPGHOME", "$CI_PROJECT_DIR/.gnupg")] @ [("PREFIX", prefix)] diff --git a/ci/bin/rpm_repository.ml b/ci/bin/rpm_repository.ml index 7cbe52ccb326..d48f5110dcec 100644 --- a/ci/bin/rpm_repository.ml +++ b/ci/bin/rpm_repository.ml @@ -47,7 +47,7 @@ let fedora_package_release_matrix = function ] (* Push .rpm artifacts to storagecloud rpm repository. *) -let make_job_repo ?rules ~__POS__ ~name ?(stage = Stages.publishing) +let make_job_repo ?rules ~__POS__ ~name ?(stage = Stages.publish) ?(prefix = false) ?dependencies ~variables ?id_tokens ~image ~before_script script : tezos_job = let variables = diff --git a/ci/lib_tezos_ci/tezos_ci.ml b/ci/lib_tezos_ci/tezos_ci.ml index d41ed90744cf..62ee48786fc5 100644 --- a/ci/lib_tezos_ci/tezos_ci.ml +++ b/ci/lib_tezos_ci/tezos_ci.ml @@ -1291,7 +1291,7 @@ module Stages = struct let packaging = Stage.register "packaging" - let publishing = Stage.register "publishing" + let publish = Stage.register "publish" let publishing_tests = Stage.register "publishing_tests" diff --git a/ci/lib_tezos_ci/tezos_ci.mli b/ci/lib_tezos_ci/tezos_ci.mli index 35173a473b29..33224dc28a63 100644 --- a/ci/lib_tezos_ci/tezos_ci.mli +++ b/ci/lib_tezos_ci/tezos_ci.mli @@ -564,7 +564,7 @@ module Stages : sig val packaging : Stage.t - val publishing : Stage.t + val publish : Stage.t val publishing_tests : Stage.t -- GitLab From 81667c283be2c2e22b7f36baf0080a471283c35d Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Fri, 23 May 2025 14:46:04 +0200 Subject: [PATCH 2/6] CI: merge [publish_release_gitlab] stage into [publish] We need only one stage for jobs that publish assets. --- .gitlab/ci/pipelines/grafazos_release_tag_test.yml | 4 ++-- .gitlab/ci/pipelines/octez_beta_release_tag.yml | 3 +-- .gitlab/ci/pipelines/octez_evm_node_release_tag.yml | 4 ++-- .gitlab/ci/pipelines/octez_release_tag.yml | 3 +-- .gitlab/ci/pipelines/octez_release_tag_test.yml | 3 +-- .gitlab/ci/pipelines/teztale_release_tag_test.yml | 4 ++-- ci/bin/release_tag.ml | 4 ++-- ci/lib_tezos_ci/tezos_ci.ml | 2 -- ci/lib_tezos_ci/tezos_ci.mli | 2 -- grafazos/ci/release.ml | 2 +- teztale/ci/release.ml | 2 +- 11 files changed, 13 insertions(+), 20 deletions(-) diff --git a/.gitlab/ci/pipelines/grafazos_release_tag_test.yml b/.gitlab/ci/pipelines/grafazos_release_tag_test.yml index 009979fc06b7..a55f04d36a49 100644 --- a/.gitlab/ci/pipelines/grafazos_release_tag_test.yml +++ b/.gitlab/ci/pipelines/grafazos_release_tag_test.yml @@ -4,7 +4,7 @@ stages: - images - build -- publish_release_gitlab +- publish - publish_release oc.docker:jsonnet:amd64: @@ -51,7 +51,7 @@ build_grafazos_dashboards: gitlab:release: image: ${GCP_REGISTRY}/tezos/docker-images/ci-release:v1.8.0 - stage: publish_release_gitlab + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml index 74b6a50f89a6..0b459b0de60c 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -7,7 +7,6 @@ stages: - build - publish - prepare_release -- publish_release_gitlab oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -261,7 +260,7 @@ docker:merge_manifests: gitlab:release: image: ${GCP_REGISTRY}/tezos/docker-images/ci-release:v1.8.0 - stage: publish_release_gitlab + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml index 85de037a58a2..bff59b61516c 100644 --- a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml @@ -5,8 +5,8 @@ stages: - start - images - build +- publish - prepare_release -- publish_release_gitlab - publish_release oc.docker:ci:amd64: @@ -232,7 +232,7 @@ docker:merge_manifests: gitlab:octez-evm-node-release: image: ${GCP_REGISTRY}/tezos/docker-images/ci-release:v1.8.0 - stage: publish_release_gitlab + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/octez_release_tag.yml b/.gitlab/ci/pipelines/octez_release_tag.yml index e97a8a95be9d..c1bec3133914 100644 --- a/.gitlab/ci/pipelines/octez_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_release_tag.yml @@ -7,7 +7,6 @@ stages: - build - publish - prepare_release -- publish_release_gitlab - publish_release oc.docker:ci:amd64: @@ -262,7 +261,7 @@ docker:merge_manifests: gitlab:release: image: ${GCP_REGISTRY}/tezos/docker-images/ci-release:v1.8.0 - stage: publish_release_gitlab + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/octez_release_tag_test.yml b/.gitlab/ci/pipelines/octez_release_tag_test.yml index 6f24539e06bd..575aa15baad6 100644 --- a/.gitlab/ci/pipelines/octez_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_release_tag_test.yml @@ -7,7 +7,6 @@ stages: - build - publish - prepare_release -- publish_release_gitlab - publish_release oc.docker:ci:amd64: @@ -262,7 +261,7 @@ docker:merge_manifests: gitlab:release: image: ${GCP_REGISTRY}/tezos/docker-images/ci-release:v1.8.0 - stage: publish_release_gitlab + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/teztale_release_tag_test.yml b/.gitlab/ci/pipelines/teztale_release_tag_test.yml index e20d9668537b..0fc3c7a23b04 100644 --- a/.gitlab/ci/pipelines/teztale_release_tag_test.yml +++ b/.gitlab/ci/pipelines/teztale_release_tag_test.yml @@ -4,7 +4,7 @@ stages: - images - build -- publish_release_gitlab +- publish - publish_release oc.docker:ci:amd64: @@ -137,7 +137,7 @@ teztale.build:static-arm64: gitlab:release: image: ${GCP_REGISTRY}/tezos/docker-images/ci-release:v1.8.0 - stage: publish_release_gitlab + stage: publish tags: - gcp needs: diff --git a/ci/bin/release_tag.ml b/ci/bin/release_tag.ml index 1ff9992b12d6..e0df1e8cef54 100644 --- a/ci/bin/release_tag.ml +++ b/ci/bin/release_tag.ml @@ -171,7 +171,7 @@ let octez_jobs ?(test = false) release_tag_pipeline_type = job ~__POS__ ~image:Images.ci_release - ~stage:Stages.publish_release_gitlab + ~stage:Stages.publish ~interruptible:false ~dependencies ~name:"gitlab:release" @@ -345,7 +345,7 @@ let octez_evm_node_jobs ?(test = false) () = job ~__POS__ ~image:Images.ci_release - ~stage:Stages.publish_release_gitlab + ~stage:Stages.publish ~interruptible:false ~dependencies ~name:"gitlab:octez-evm-node-release" diff --git a/ci/lib_tezos_ci/tezos_ci.ml b/ci/lib_tezos_ci/tezos_ci.ml index 62ee48786fc5..aa0097d08afd 100644 --- a/ci/lib_tezos_ci/tezos_ci.ml +++ b/ci/lib_tezos_ci/tezos_ci.ml @@ -1299,8 +1299,6 @@ module Stages = struct let prepare_release = Stage.register "prepare_release" - let publish_release_gitlab = Stage.register "publish_release_gitlab" - let publish_release = Stage.register "publish_release" let publish_package_gitlab = Stage.register "publish_package_gitlab" diff --git a/ci/lib_tezos_ci/tezos_ci.mli b/ci/lib_tezos_ci/tezos_ci.mli index 33224dc28a63..a690fa393d73 100644 --- a/ci/lib_tezos_ci/tezos_ci.mli +++ b/ci/lib_tezos_ci/tezos_ci.mli @@ -573,8 +573,6 @@ module Stages : sig val prepare_release : Stage.t - val publish_release_gitlab : Stage.t - val publish_release : Stage.t val publish_package_gitlab : Stage.t diff --git a/grafazos/ci/release.ml b/grafazos/ci/release.ml index 8b5fe4bc259c..daf56a893d2c 100644 --- a/grafazos/ci/release.ml +++ b/grafazos/ci/release.ml @@ -25,7 +25,7 @@ let job_gitlab_release = job ~__POS__ ~image:Images.ci_release - ~stage:Stages.publish_release_gitlab + ~stage:Stages.publish ~interruptible:false ~dependencies:(Dependent [Artifacts (Common.job_build_grafazos ())]) ~name:"gitlab:release" diff --git a/teztale/ci/release.ml b/teztale/ci/release.ml index 323dac2511c3..5eb80782770f 100644 --- a/teztale/ci/release.ml +++ b/teztale/ci/release.ml @@ -25,7 +25,7 @@ let job_gitlab_release = job ~__POS__ ~image:Images.ci_release - ~stage:Stages.publish_release_gitlab + ~stage:Stages.publish ~interruptible:false ~dependencies: (Dependent -- GitLab From e008d18f8c045dbbd399a6b32f94e30ddb03d270 Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Fri, 23 May 2025 14:54:55 +0200 Subject: [PATCH 3/6] CI: merge [publish_package_gitlab] stage into [publish] --- .gitlab/ci/pipelines/non_release_tag.yml | 3 +-- .gitlab/ci/pipelines/non_release_tag_test.yml | 3 +-- .gitlab/ci/pipelines/schedule_master_test_release.yml | 3 +-- ci/bin/release_tag.ml | 2 +- ci/lib_tezos_ci/tezos_ci.ml | 2 -- ci/lib_tezos_ci/tezos_ci.mli | 2 -- 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.gitlab/ci/pipelines/non_release_tag.yml b/.gitlab/ci/pipelines/non_release_tag.yml index a2d18116e66b..086b24548c33 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -7,7 +7,6 @@ stages: - build - publish - prepare_release -- publish_package_gitlab oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -261,7 +260,7 @@ docker:merge_manifests: gitlab:publish: image: ${GCP_REGISTRY}/tezos/docker-images/ci-release:v1.8.0 - stage: publish_package_gitlab + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/non_release_tag_test.yml b/.gitlab/ci/pipelines/non_release_tag_test.yml index e00c26b9d01f..11401a696bad 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -7,7 +7,6 @@ stages: - build - publish - prepare_release -- publish_package_gitlab oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -261,7 +260,7 @@ docker:merge_manifests: gitlab:publish: image: ${GCP_REGISTRY}/tezos/docker-images/ci-release:v1.8.0 - stage: publish_package_gitlab + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/schedule_master_test_release.yml b/.gitlab/ci/pipelines/schedule_master_test_release.yml index c39bf2eb2cfa..8b32e92603a6 100644 --- a/.gitlab/ci/pipelines/schedule_master_test_release.yml +++ b/.gitlab/ci/pipelines/schedule_master_test_release.yml @@ -7,7 +7,6 @@ stages: - build - publish - prepare_release -- publish_package_gitlab oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -261,7 +260,7 @@ docker:merge_manifests: gitlab:publish: image: ${GCP_REGISTRY}/tezos/docker-images/ci-release:v1.8.0 - stage: publish_package_gitlab + stage: publish tags: - gcp needs: diff --git a/ci/bin/release_tag.ml b/ci/bin/release_tag.ml index e0df1e8cef54..aa025715ac1f 100644 --- a/ci/bin/release_tag.ml +++ b/ci/bin/release_tag.ml @@ -190,7 +190,7 @@ let octez_jobs ?(test = false) release_tag_pipeline_type = job ~__POS__ ~image:Images.ci_release - ~stage:Stages.publish_package_gitlab + ~stage:Stages.publish ~interruptible:false ~dependencies ?before_script diff --git a/ci/lib_tezos_ci/tezos_ci.ml b/ci/lib_tezos_ci/tezos_ci.ml index aa0097d08afd..20a229209aae 100644 --- a/ci/lib_tezos_ci/tezos_ci.ml +++ b/ci/lib_tezos_ci/tezos_ci.ml @@ -1301,8 +1301,6 @@ module Stages = struct let publish_release = Stage.register "publish_release" - let publish_package_gitlab = Stage.register "publish_package_gitlab" - let manual = Stage.register "manual" end diff --git a/ci/lib_tezos_ci/tezos_ci.mli b/ci/lib_tezos_ci/tezos_ci.mli index a690fa393d73..de2e2030f1cf 100644 --- a/ci/lib_tezos_ci/tezos_ci.mli +++ b/ci/lib_tezos_ci/tezos_ci.mli @@ -575,8 +575,6 @@ module Stages : sig val publish_release : Stage.t - val publish_package_gitlab : Stage.t - val manual : Stage.t end -- GitLab From 4fe7ef0d8e4f8742a3b9013ac2ef569476749cef Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Fri, 23 May 2025 15:04:00 +0200 Subject: [PATCH 4/6] CI: merge [publish_release] in [publish] --- .gitlab/ci/pipelines/grafazos_release_tag_test.yml | 3 +-- .gitlab/ci/pipelines/octez_evm_node_release_tag.yml | 3 +-- .gitlab/ci/pipelines/octez_latest_release.yml | 4 ++-- .gitlab/ci/pipelines/octez_latest_release_test.yml | 4 ++-- .gitlab/ci/pipelines/octez_release_tag.yml | 5 ++--- .gitlab/ci/pipelines/octez_release_tag_test.yml | 7 +++---- .gitlab/ci/pipelines/publish_release_page.yml | 4 ++-- .gitlab/ci/pipelines/publish_test_release_page.yml | 4 ++-- .gitlab/ci/pipelines/teztale_release_tag_test.yml | 3 +-- ci/bin/common.ml | 2 +- ci/bin/release_tag.ml | 6 +++--- ci/lib_tezos_ci/tezos_ci.ml | 2 -- ci/lib_tezos_ci/tezos_ci.mli | 2 -- grafazos/ci/release.ml | 2 +- teztale/ci/release.ml | 2 +- 15 files changed, 22 insertions(+), 31 deletions(-) diff --git a/.gitlab/ci/pipelines/grafazos_release_tag_test.yml b/.gitlab/ci/pipelines/grafazos_release_tag_test.yml index a55f04d36a49..dc3667457b5d 100644 --- a/.gitlab/ci/pipelines/grafazos_release_tag_test.yml +++ b/.gitlab/ci/pipelines/grafazos_release_tag_test.yml @@ -5,7 +5,6 @@ stages: - images - build - publish -- publish_release oc.docker:jsonnet:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -67,7 +66,7 @@ gitlab:release: publish:release-page: image: ${GCP_REGISTRY}/tezos/docker-images/ci-release:v1.8.0 - stage: publish_release + stage: publish tags: - gcp rules: diff --git a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml index bff59b61516c..64dc5cbc51a8 100644 --- a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml @@ -7,7 +7,6 @@ stages: - build - publish - prepare_release -- publish_release oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -250,7 +249,7 @@ gitlab:octez-evm-node-release: docker:promote_to_latest: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 - stage: publish_release + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/octez_latest_release.yml b/.gitlab/ci/pipelines/octez_latest_release.yml index ff0ab2f91ccd..d8f7bc994ad2 100644 --- a/.gitlab/ci/pipelines/octez_latest_release.yml +++ b/.gitlab/ci/pipelines/octez_latest_release.yml @@ -3,7 +3,7 @@ stages: - start -- publish_release +- publish datadog_pipeline_trace: image: datadog/ci:v2.44.0 @@ -22,7 +22,7 @@ datadog_pipeline_trace: docker:promote_to_latest: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 - stage: publish_release + stage: publish tags: - gcp dependencies: [] diff --git a/.gitlab/ci/pipelines/octez_latest_release_test.yml b/.gitlab/ci/pipelines/octez_latest_release_test.yml index f6ca964309ac..5ceb0ceb454f 100644 --- a/.gitlab/ci/pipelines/octez_latest_release_test.yml +++ b/.gitlab/ci/pipelines/octez_latest_release_test.yml @@ -3,7 +3,7 @@ stages: - start -- publish_release +- publish datadog_pipeline_trace: image: datadog/ci:v2.44.0 @@ -22,7 +22,7 @@ datadog_pipeline_trace: docker:promote_to_latest: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 - stage: publish_release + stage: publish tags: - gcp dependencies: [] diff --git a/.gitlab/ci/pipelines/octez_release_tag.yml b/.gitlab/ci/pipelines/octez_release_tag.yml index c1bec3133914..bc4aa41a669c 100644 --- a/.gitlab/ci/pipelines/octez_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_release_tag.yml @@ -7,7 +7,6 @@ stages: - build - publish - prepare_release -- publish_release oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -915,7 +914,7 @@ rpm_repo_fedora: opam:release: image: ${ci_image_name}/prebuild:${ci_image_tag} - stage: publish_release + stage: publish tags: - gcp dependencies: @@ -929,7 +928,7 @@ opam:release: publish:release-page: image: ${GCP_REGISTRY}/tezos/docker-images/ci-release:v1.8.0 - stage: publish_release + stage: publish tags: - gcp rules: diff --git a/.gitlab/ci/pipelines/octez_release_tag_test.yml b/.gitlab/ci/pipelines/octez_release_tag_test.yml index 575aa15baad6..76541c29204f 100644 --- a/.gitlab/ci/pipelines/octez_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_release_tag_test.yml @@ -7,7 +7,6 @@ stages: - build - publish - prepare_release -- publish_release oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -915,7 +914,7 @@ rpm_repo_fedora: docker:promote_to_latest: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 - stage: publish_release + stage: publish tags: - gcp needs: @@ -935,7 +934,7 @@ docker:promote_to_latest: opam:release: image: ${ci_image_name}/prebuild:${ci_image_tag} - stage: publish_release + stage: publish tags: - gcp dependencies: @@ -949,7 +948,7 @@ opam:release: publish:release-page: image: ${GCP_REGISTRY}/tezos/docker-images/ci-release:v1.8.0 - stage: publish_release + stage: publish tags: - gcp rules: diff --git a/.gitlab/ci/pipelines/publish_release_page.yml b/.gitlab/ci/pipelines/publish_release_page.yml index 5170c9e43090..d6e8aaa9c41d 100644 --- a/.gitlab/ci/pipelines/publish_release_page.yml +++ b/.gitlab/ci/pipelines/publish_release_page.yml @@ -3,7 +3,7 @@ stages: - start -- publish_release +- publish datadog_pipeline_trace: image: datadog/ci:v2.44.0 @@ -22,7 +22,7 @@ datadog_pipeline_trace: publish:release-page: image: ${GCP_REGISTRY}/tezos/docker-images/ci-release:v1.8.0 - stage: publish_release + stage: publish tags: - gcp rules: diff --git a/.gitlab/ci/pipelines/publish_test_release_page.yml b/.gitlab/ci/pipelines/publish_test_release_page.yml index 5efa07e15860..3779635cc102 100644 --- a/.gitlab/ci/pipelines/publish_test_release_page.yml +++ b/.gitlab/ci/pipelines/publish_test_release_page.yml @@ -2,11 +2,11 @@ # Edit file ci/bin/main.ml instead. stages: -- publish_release +- publish publish:release-page: image: ${GCP_REGISTRY}/tezos/docker-images/ci-release:v1.8.0 - stage: publish_release + stage: publish tags: - gcp rules: diff --git a/.gitlab/ci/pipelines/teztale_release_tag_test.yml b/.gitlab/ci/pipelines/teztale_release_tag_test.yml index 0fc3c7a23b04..edd66d221586 100644 --- a/.gitlab/ci/pipelines/teztale_release_tag_test.yml +++ b/.gitlab/ci/pipelines/teztale_release_tag_test.yml @@ -5,7 +5,6 @@ stages: - images - build - publish -- publish_release oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -155,7 +154,7 @@ gitlab:release: publish:release-page: image: ${GCP_REGISTRY}/tezos/docker-images/ci-release:v1.8.0 - stage: publish_release + stage: publish tags: - gcp rules: diff --git a/ci/bin/common.ml b/ci/bin/common.ml index 4759717b7692..e9b1b63c49cd 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -730,7 +730,7 @@ let job_docker_promote_to_latest ?dependencies ~ci_docker_hub () : tezos_job = job_docker_authenticated ~__POS__ ?dependencies - ~stage:Stages.publish_release + ~stage:Stages.publish ~name:"docker:promote_to_latest" ~ci_docker_hub ["./scripts/ci/docker_promote_to_latest.sh"] diff --git a/ci/bin/release_tag.ml b/ci/bin/release_tag.ml index aa025715ac1f..1bdafd3e931c 100644 --- a/ci/bin/release_tag.ml +++ b/ci/bin/release_tag.ml @@ -61,7 +61,7 @@ let job_release_page ~test ?dependencies () = job ~__POS__ ~image:Images.ci_release - ~stage:Stages.publish_release + ~stage:Stages.publish ~description: "A job to update the Octez release page. If running in a test pipleine, \ the assets are pushed in the [release-page-test.nomadic-labs.com] \ @@ -234,7 +234,7 @@ let octez_jobs ?(test = false) release_tag_pipeline_type = job ~__POS__ ~image:Images.CI.prebuild - ~stage:Stages.publish_release + ~stage:Stages.publish ~description: "Update opam package descriptions on tezos/tezos opam-repository fork.\n\n\ This job does preliminary work for releasing Octez opam packages on \ @@ -356,7 +356,7 @@ let octez_evm_node_jobs ?(test = false) () = job_docker_authenticated ~__POS__ ~dependencies:(Dependent [Job job_docker_merge]) - ~stage:Stages.publish_release + ~stage:Stages.publish ~name:"docker:promote_to_latest" ~ci_docker_hub [ diff --git a/ci/lib_tezos_ci/tezos_ci.ml b/ci/lib_tezos_ci/tezos_ci.ml index 20a229209aae..93b22804beb7 100644 --- a/ci/lib_tezos_ci/tezos_ci.ml +++ b/ci/lib_tezos_ci/tezos_ci.ml @@ -1299,8 +1299,6 @@ module Stages = struct let prepare_release = Stage.register "prepare_release" - let publish_release = Stage.register "publish_release" - let manual = Stage.register "manual" end diff --git a/ci/lib_tezos_ci/tezos_ci.mli b/ci/lib_tezos_ci/tezos_ci.mli index de2e2030f1cf..87759ab17509 100644 --- a/ci/lib_tezos_ci/tezos_ci.mli +++ b/ci/lib_tezos_ci/tezos_ci.mli @@ -573,8 +573,6 @@ module Stages : sig val prepare_release : Stage.t - val publish_release : Stage.t - val manual : Stage.t end diff --git a/grafazos/ci/release.ml b/grafazos/ci/release.ml index daf56a893d2c..9e338c8ec106 100644 --- a/grafazos/ci/release.ml +++ b/grafazos/ci/release.ml @@ -35,7 +35,7 @@ let job_release_page ~test () = job ~__POS__ ~image:Images.ci_release - ~stage:Stages.publish_release + ~stage:Stages.publish ~description: "A job to update the Grafazos release page. If running in a test \ pipeline, the assets are pushed in the \ diff --git a/teztale/ci/release.ml b/teztale/ci/release.ml index 5eb80782770f..88bdd82eb73b 100644 --- a/teztale/ci/release.ml +++ b/teztale/ci/release.ml @@ -40,7 +40,7 @@ let job_release_page ~test () = job ~__POS__ ~image:Images.ci_release - ~stage:Stages.publish_release + ~stage:Stages.publish ~description: "A job to update the Teztale release page. If running in a test \ pipeline, the assets are pushed in the \ -- GitLab From a8b09130505ffcda207877ac013c9614ed02757e Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Fri, 23 May 2025 15:06:50 +0200 Subject: [PATCH 5/6] CI: merge [prepare_release] in [publish] --- .gitlab/ci/pipelines/master_branch.yml | 3 +-- .gitlab/ci/pipelines/non_release_tag.yml | 3 +-- .gitlab/ci/pipelines/non_release_tag_test.yml | 3 +-- .gitlab/ci/pipelines/octez_beta_release_tag.yml | 3 +-- .gitlab/ci/pipelines/octez_evm_node_release_tag.yml | 3 +-- .gitlab/ci/pipelines/octez_release_tag.yml | 3 +-- .gitlab/ci/pipelines/octez_release_tag_test.yml | 3 +-- .gitlab/ci/pipelines/schedule_docker_build_pipeline.yml | 4 ++-- .gitlab/ci/pipelines/schedule_master_test_release.yml | 3 +-- ci/bin/common.ml | 2 +- ci/lib_tezos_ci/tezos_ci.ml | 2 -- ci/lib_tezos_ci/tezos_ci.mli | 2 -- 12 files changed, 11 insertions(+), 23 deletions(-) diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index 4be8424ec650..e51614de0fda 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -7,7 +7,6 @@ stages: - build - test_coverage - publish -- prepare_release - manual oc.docker:ci:amd64: @@ -389,7 +388,7 @@ oc.docker:arm64: docker:merge_manifests: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 - stage: prepare_release + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/non_release_tag.yml b/.gitlab/ci/pipelines/non_release_tag.yml index 086b24548c33..e0af71685963 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -6,7 +6,6 @@ stages: - images - build - publish -- prepare_release oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -239,7 +238,7 @@ oc.install-release-homebrew: docker:merge_manifests: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 - stage: prepare_release + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/non_release_tag_test.yml b/.gitlab/ci/pipelines/non_release_tag_test.yml index 11401a696bad..6d8775bd526f 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -6,7 +6,6 @@ stages: - images - build - publish -- prepare_release oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -239,7 +238,7 @@ oc.install-release-homebrew: docker:merge_manifests: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 - stage: prepare_release + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml index 0b459b0de60c..2ae90c6cbd89 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -6,7 +6,6 @@ stages: - images - build - publish -- prepare_release oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -239,7 +238,7 @@ oc.install-release-homebrew: docker:merge_manifests: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 - stage: prepare_release + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml index 64dc5cbc51a8..6111778fe977 100644 --- a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml @@ -6,7 +6,6 @@ stages: - images - build - publish -- prepare_release oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -210,7 +209,7 @@ oc.docker:arm64: docker:merge_manifests: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 - stage: prepare_release + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/octez_release_tag.yml b/.gitlab/ci/pipelines/octez_release_tag.yml index bc4aa41a669c..feca7a971b8a 100644 --- a/.gitlab/ci/pipelines/octez_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_release_tag.yml @@ -6,7 +6,6 @@ stages: - images - build - publish -- prepare_release oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -239,7 +238,7 @@ oc.install-release-homebrew: docker:merge_manifests: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 - stage: prepare_release + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/octez_release_tag_test.yml b/.gitlab/ci/pipelines/octez_release_tag_test.yml index 76541c29204f..b45a40c64713 100644 --- a/.gitlab/ci/pipelines/octez_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_release_tag_test.yml @@ -6,7 +6,6 @@ stages: - images - build - publish -- prepare_release oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -239,7 +238,7 @@ oc.install-release-homebrew: docker:merge_manifests: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 - stage: prepare_release + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/schedule_docker_build_pipeline.yml b/.gitlab/ci/pipelines/schedule_docker_build_pipeline.yml index b6bde3ad54be..f1d29539808a 100644 --- a/.gitlab/ci/pipelines/schedule_docker_build_pipeline.yml +++ b/.gitlab/ci/pipelines/schedule_docker_build_pipeline.yml @@ -4,7 +4,7 @@ stages: - images - build -- prepare_release +- publish oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -123,7 +123,7 @@ oc.docker:arm64: docker:merge_manifests: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 - stage: prepare_release + stage: publish tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/schedule_master_test_release.yml b/.gitlab/ci/pipelines/schedule_master_test_release.yml index 8b32e92603a6..969dfcaa5e2f 100644 --- a/.gitlab/ci/pipelines/schedule_master_test_release.yml +++ b/.gitlab/ci/pipelines/schedule_master_test_release.yml @@ -6,7 +6,6 @@ stages: - images - build - publish -- prepare_release oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -239,7 +238,7 @@ oc.install-release-homebrew: docker:merge_manifests: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 - stage: prepare_release + stage: publish tags: - gcp needs: diff --git a/ci/bin/common.ml b/ci/bin/common.ml index e9b1b63c49cd..1bee1ae0568f 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -717,7 +717,7 @@ let job_docker_merge_manifests ~__POS__ ~ci_docker_hub ~job_docker_amd64 ~job_docker_arm64 : tezos_job = job_docker_authenticated ~__POS__ - ~stage:Stages.prepare_release + ~stage:Stages.publish ~name:"docker:merge_manifests" (* This job merges the images produced in the jobs [docker:{amd64,arm64}] into a single multi-architecture image, and diff --git a/ci/lib_tezos_ci/tezos_ci.ml b/ci/lib_tezos_ci/tezos_ci.ml index 93b22804beb7..f9932b219668 100644 --- a/ci/lib_tezos_ci/tezos_ci.ml +++ b/ci/lib_tezos_ci/tezos_ci.ml @@ -1297,8 +1297,6 @@ module Stages = struct let scan = Stage.register "scan" - let prepare_release = Stage.register "prepare_release" - let manual = Stage.register "manual" end diff --git a/ci/lib_tezos_ci/tezos_ci.mli b/ci/lib_tezos_ci/tezos_ci.mli index 87759ab17509..b8f981e2890d 100644 --- a/ci/lib_tezos_ci/tezos_ci.mli +++ b/ci/lib_tezos_ci/tezos_ci.mli @@ -571,8 +571,6 @@ module Stages : sig (* Scanning vulnerabilities of Docker images. *) val scan : Stage.t - val prepare_release : Stage.t - val manual : Stage.t end -- GitLab From 1640c860f1ebaf565e268dcd0c7ea9745ad4640b Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Fri, 23 May 2025 16:06:07 +0200 Subject: [PATCH 6/6] CI: fix typo --- ci/bin/debian_repository.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/bin/debian_repository.ml b/ci/bin/debian_repository.ml index a5870f84881f..40bd7f5a48ab 100644 --- a/ci/bin/debian_repository.ml +++ b/ci/bin/debian_repository.ml @@ -343,7 +343,7 @@ let jobs pipeline_type = in let test_ubuntu_packages_jobs = (* in merge pipelines we tests only debian. ubuntu packages - are built and tested in the sheduled pipelines*) + are built and tested in the scheduled pipelines*) [ job_lintian ~__POS__ -- GitLab