diff --git a/.gitlab/ci/pipelines/debian_repository_full.yml b/.gitlab/ci/pipelines/debian_repository_full.yml index ec019d7fb053c2abff7d72f9000c3c9c29395930..df3d7a5cd19a778e192accece1765dcef7499cb6 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 5ae45603b1ed02407f0c99fc5f88e659f3fbd52b..d33fc34d17870c8a8462e7f577927e6e3b65775a 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 5ae45603b1ed02407f0c99fc5f88e659f3fbd52b..d33fc34d17870c8a8462e7f577927e6e3b65775a 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/grafazos_release_tag_test.yml b/.gitlab/ci/pipelines/grafazos_release_tag_test.yml index 009979fc06b7fe299d5ee2f3a9a6041234ab75cb..dc3667457b5d6f7b4bf97a4a1472db56394d0965 100644 --- a/.gitlab/ci/pipelines/grafazos_release_tag_test.yml +++ b/.gitlab/ci/pipelines/grafazos_release_tag_test.yml @@ -4,8 +4,7 @@ stages: - images - build -- publish_release_gitlab -- publish_release +- publish oc.docker:jsonnet:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -51,7 +50,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: @@ -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/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index c0035c36f4537c769879ef7ad61ecedb04d1a9c2..e51614de0fdac262e4836eace385ea0a721b9bf3 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -6,8 +6,7 @@ stages: - images - build - test_coverage -- publishing -- prepare_release +- publish - 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: @@ -623,7 +622,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 16915983cc885ffbd3262a81af397e632fd391f3..e0af716859632ff225f3c5b6b31c3fb421fc4251 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -5,9 +5,7 @@ stages: - start - images - build -- publishing -- prepare_release -- publish_package_gitlab +- publish oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -240,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: @@ -261,7 +259,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: @@ -401,7 +399,7 @@ oc.build-data_packages: apt_repo_debian: image: debian:bookworm - stage: publishing + stage: publish tags: - gcp needs: @@ -514,7 +512,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 +695,7 @@ oc.build-rockylinux-data: rpm_repo_rockylinux: image: rockylinux:9.3 - stage: publishing + stage: publish tags: - gcp needs: @@ -883,7 +881,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 c1dcd2f98f6bb77c59403c021772e57fe3891ef6..6d8775bd526f26c8bdfa4e42e2de905634485e67 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -5,9 +5,7 @@ stages: - start - images - build -- publishing -- prepare_release -- publish_package_gitlab +- publish oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -240,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: @@ -261,7 +259,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: @@ -401,7 +399,7 @@ oc.build-data_packages: apt_repo_debian: image: debian:bookworm - stage: publishing + stage: publish tags: - gcp needs: @@ -514,7 +512,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 +695,7 @@ oc.build-rockylinux-data: rpm_repo_rockylinux: image: rockylinux:9.3 - stage: publishing + stage: publish tags: - gcp needs: @@ -883,7 +881,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 d70000ef6af6b5d17651ff65353ef825850ecc49..2ae90c6cbd8972d2a3a0a017d583cd903ef14f81 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -5,9 +5,7 @@ stages: - start - images - build -- publishing -- prepare_release -- publish_release_gitlab +- publish oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -240,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: @@ -261,7 +259,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: @@ -402,7 +400,7 @@ oc.build-data_packages: apt_repo_debian: image: debian:bookworm - stage: publishing + stage: publish tags: - gcp needs: @@ -515,7 +513,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 +696,7 @@ oc.build-rockylinux-data: rpm_repo_rockylinux: image: rockylinux:9.3 - stage: publishing + stage: publish tags: - gcp needs: @@ -884,7 +882,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_evm_node_release_tag.yml b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml index 85de037a58a2e166a74d7f05fe196714a58ff9f5..6111778fe977e01d03248f78f856f40e8afd34e1 100644 --- a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml @@ -5,9 +5,7 @@ stages: - start - images - build -- prepare_release -- publish_release_gitlab -- publish_release +- publish oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -211,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: @@ -232,7 +230,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: @@ -250,7 +248,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 ff0ab2f91ccd62a1577d798b1f37385dec352273..d8f7bc994ad235b94a82b80b0468668220298bcc 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 f6ca964309ac1301b5df9c940007c533594ae36d..5ceb0ceb454fb3dc7f034d90b364aaaceecb796e 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 841984c70b17060a2073ac8bfa18a3cf69944736..feca7a971b8acd8bae40c747f33ec2c39de1c0e9 100644 --- a/.gitlab/ci/pipelines/octez_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_release_tag.yml @@ -5,10 +5,7 @@ stages: - start - images - build -- publishing -- prepare_release -- publish_release_gitlab -- publish_release +- publish oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -241,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: @@ -262,7 +259,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: @@ -403,7 +400,7 @@ oc.build-data_packages: apt_repo_debian: image: debian:bookworm - stage: publishing + stage: publish tags: - gcp needs: @@ -516,7 +513,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 +696,7 @@ oc.build-rockylinux-data: rpm_repo_rockylinux: image: rockylinux:9.3 - stage: publishing + stage: publish tags: - gcp needs: @@ -885,7 +882,7 @@ oc.build-fedora-data: rpm_repo_fedora: image: fedora:39 - stage: publishing + stage: publish tags: - gcp needs: @@ -916,7 +913,7 @@ rpm_repo_fedora: opam:release: image: ${ci_image_name}/prebuild:${ci_image_tag} - stage: publish_release + stage: publish tags: - gcp dependencies: @@ -930,7 +927,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 816c6a3d444dcc01d16d1e5eb73be81a38ee0a30..b45a40c64713ce0ca962d2a593fa31e0915f673b 100644 --- a/.gitlab/ci/pipelines/octez_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_release_tag_test.yml @@ -5,10 +5,7 @@ stages: - start - images - build -- publishing -- prepare_release -- publish_release_gitlab -- publish_release +- publish oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -241,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: @@ -262,7 +259,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: @@ -403,7 +400,7 @@ oc.build-data_packages: apt_repo_debian: image: debian:bookworm - stage: publishing + stage: publish tags: - gcp needs: @@ -516,7 +513,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 +696,7 @@ oc.build-rockylinux-data: rpm_repo_rockylinux: image: rockylinux:9.3 - stage: publishing + stage: publish tags: - gcp needs: @@ -885,7 +882,7 @@ oc.build-fedora-data: rpm_repo_fedora: image: fedora:39 - stage: publishing + stage: publish tags: - gcp needs: @@ -916,7 +913,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: @@ -936,7 +933,7 @@ docker:promote_to_latest: opam:release: image: ${ci_image_name}/prebuild:${ci_image_tag} - stage: publish_release + stage: publish tags: - gcp dependencies: @@ -950,7 +947,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 5170c9e4309000ade1b3f05a130effa5a4eb3607..d6e8aaa9c41df3f149fa5e84b7f83b708474f20c 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 5efa07e158602900e2748f3d02cce72a34be5eb6..3779635cc1022b5247736b82714d1459bb719cc7 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/rpm_repository_full.yml b/.gitlab/ci/pipelines/rpm_repository_full.yml index a5bb466d04e1ab9338259ca76e19ee56c9eb0728..1c4dbc2081c329cbdaab35932a67fd2821d4fc50 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 f9ec8eab246248a9eb822ab47b400eeb09a4e617..be83aa73092668c627d239535fcbb2abc69ab220 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 f9ec8eab246248a9eb822ab47b400eeb09a4e617..be83aa73092668c627d239535fcbb2abc69ab220 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_docker_build_pipeline.yml b/.gitlab/ci/pipelines/schedule_docker_build_pipeline.yml index b6bde3ad54be2fc8f41a0ae9a2596fb38cb2a0b1..f1d29539808ad960b31cb138956f51d5daf4c103 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_documentation.yml b/.gitlab/ci/pipelines/schedule_documentation.yml index dde90399b81516f2eaddac9e1f44e430ca9b937d..ed788a706ba9b47b023aad435546cf3ed59755c1 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 b71fd7790562c6f90225fd3bf44c74906580ffcf..969dfcaa5e2f1ade04de8292576039d5a73c35b3 100644 --- a/.gitlab/ci/pipelines/schedule_master_test_release.yml +++ b/.gitlab/ci/pipelines/schedule_master_test_release.yml @@ -5,9 +5,7 @@ stages: - start - images - build -- publishing -- prepare_release -- publish_package_gitlab +- publish oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -240,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: @@ -261,7 +259,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: @@ -404,7 +402,7 @@ oc.build-data_packages: apt_repo_debian: image: debian:bookworm - stage: publishing + stage: publish tags: - gcp needs: @@ -517,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: @@ -700,7 +698,7 @@ oc.build-rockylinux-data: rpm_repo_rockylinux: image: rockylinux:9.3 - stage: publishing + stage: publish tags: - gcp needs: @@ -886,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/teztale_release_tag_test.yml b/.gitlab/ci/pipelines/teztale_release_tag_test.yml index e20d9668537b323cf246d0a1aa0fab3ccb35207b..edd66d22158692718ee3e75359e78ee5db0a92c8 100644 --- a/.gitlab/ci/pipelines/teztale_release_tag_test.yml +++ b/.gitlab/ci/pipelines/teztale_release_tag_test.yml @@ -4,8 +4,7 @@ stages: - images - build -- publish_release_gitlab -- publish_release +- publish oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -137,7 +136,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: @@ -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 63c2beb8c6a74c32f6a7a59356835f6c7d9c7a69..1bee1ae0568f2dabcd2739448d9fadad8a93ebe7 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 @@ -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"] @@ -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 a5723d92e2406c03077745a0a903a1a3634d68f7..40bd7f5a48ab0a34e1a312393fecc3bd4146ca05 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)] @@ -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__ diff --git a/ci/bin/release_tag.ml b/ci/bin/release_tag.ml index 1ff9992b12d6d15c84d616615e63a4d8448341c0..1bdafd3e931cfb047aa55847656e81bd60a84476 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] \ @@ -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" @@ -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 @@ -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 \ @@ -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" @@ -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/bin/rpm_repository.ml b/ci/bin/rpm_repository.ml index 7cbe52ccb3266832439b13420e6ef78bde13e0f3..d48f5110dcec2ce204a023489c8fb143ff7258fe 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 d41ed90744cf358bb9c9633bcd1985d2dd1ec8ca..f9932b219668f42cbf89f5dd809930763dc71fa1 100644 --- a/ci/lib_tezos_ci/tezos_ci.ml +++ b/ci/lib_tezos_ci/tezos_ci.ml @@ -1291,20 +1291,12 @@ 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" let scan = Stage.register "scan" - 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" - 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 35173a473b29212b104f08c10e6bf525c22c06a8..b8f981e2890d46489fdb3a3e12deb83921e4813b 100644 --- a/ci/lib_tezos_ci/tezos_ci.mli +++ b/ci/lib_tezos_ci/tezos_ci.mli @@ -564,21 +564,13 @@ module Stages : sig val packaging : Stage.t - val publishing : Stage.t + val publish : Stage.t val publishing_tests : Stage.t (* Scanning vulnerabilities of Docker images. *) val scan : Stage.t - val prepare_release : Stage.t - - val publish_release_gitlab : Stage.t - - val publish_release : Stage.t - - val publish_package_gitlab : Stage.t - val manual : Stage.t end diff --git a/grafazos/ci/release.ml b/grafazos/ci/release.ml index 8b5fe4bc259ca1af2f4c948700185c23d8fd62fb..9e338c8ec106c9d927814252d437a7f0367e9ee6 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" @@ -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 323dac2511c38fc7669fa62c9818ac96ab88662c..88bdd82eb73ba3970271e1b6346da92a417e7c58 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 @@ -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 \