From 5a91894f6b1dbf3bd1e35356959247c5e37225d0 Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Tue, 16 Dec 2025 14:19:03 +0100 Subject: [PATCH] base image: use versioned base images --- .gitlab/ci/pipelines/before_merging.yml | 2 +- .gitlab/ci/pipelines/debian.daily.yml | 22 +++++++++---------- .../pipelines/debian_repository_partial.yml | 10 ++++----- .../debian_repository_partial_auto.yml | 10 ++++----- .gitlab/ci/pipelines/documentation.daily.yml | 6 ++--- .gitlab/ci/pipelines/homebrew.daily.yml | 4 ++-- .gitlab/ci/pipelines/homebrew.yml | 4 ++-- .gitlab/ci/pipelines/homebrew_auto.yml | 4 ++-- .gitlab/ci/pipelines/merge_train.yml | 2 +- .gitlab/ci/pipelines/non_release_tag.yml | 22 +++++++++---------- .gitlab/ci/pipelines/non_release_tag_test.yml | 22 +++++++++---------- .../ci/pipelines/octez_beta_release_tag.yml | 22 +++++++++---------- .../pipelines/octez_beta_release_tag_test.yml | 22 +++++++++---------- .../ci/pipelines/octez_major_release_tag.yml | 22 +++++++++---------- .../octez_major_release_tag_test.yml | 22 +++++++++---------- .../ci/pipelines/octez_minor_release_tag.yml | 22 +++++++++---------- .../octez_minor_release_tag_test.yml | 22 +++++++++---------- .gitlab/ci/pipelines/rpm.daily.yml | 16 +++++++------- .../ci/pipelines/rpm_repository_partial.yml | 8 +++---- .../pipelines/rpm_repository_partial_auto.yml | 8 +++---- .../schedule_master_test_release.yml | 22 +++++++++---------- ci/lib_tezos_ci/tezos_ci.ml | 5 +++-- ci/lib_tezos_ci_jobs/code_verification.ml | 2 ++ ci/lib_tezos_ci_jobs/debian_repository.ml | 14 ++++++++++-- ci/lib_tezos_ci_jobs/rpm_repository.ml | 14 ++++++++++-- 25 files changed, 176 insertions(+), 153 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 22d29b314cf9..a5c0fed25df5 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -3747,7 +3747,7 @@ documentation.linkcheck: - . ./scripts/ci/datadog_send_job_cache_info.sh 'after' documentation.install_python_bookworm: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:bookworm + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:bookworm-1.0 stage: test tags: - gcp diff --git a/.gitlab/ci/pipelines/debian.daily.yml b/.gitlab/ci/pipelines/debian.daily.yml index dbe2793ccd73..1b7cddcb0481 100644 --- a/.gitlab/ci/pipelines/debian.daily.yml +++ b/.gitlab/ci/pipelines/debian.daily.yml @@ -56,7 +56,7 @@ oc.docker-systemd_tests_debian: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: debian - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -93,7 +93,7 @@ oc.docker-systemd_tests_ubuntu: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: ubuntu - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -129,7 +129,7 @@ oc.docker-build-debian-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: debian - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -219,7 +219,7 @@ oc.build-data_packages: - packages/$DISTRIBUTION/$RELEASE apt_repo_debian: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie-1.0 stage: publish tags: - gcp_not_interruptible @@ -277,7 +277,7 @@ oc.docker-build-ubuntu-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: ubuntu - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -334,7 +334,7 @@ oc.build-ubuntu: - gcp_arm64 apt_repo_ubuntu: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble-1.0 stage: publish tags: - gcp_not_interruptible @@ -367,7 +367,7 @@ apt_repo_ubuntu: retry: 0 oc.lintian_debian: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:bookworm + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:bookworm-1.0 stage: publishing_tests tags: - gcp @@ -393,7 +393,7 @@ oc.lintian_debian: variables: {} oc.install_bin_debian_bookworm: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:bookworm + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:bookworm-1.0 stage: publishing_tests tags: - gcp @@ -483,7 +483,7 @@ oc.upgrade_bin_debian_bookworm-systemd: RELEASE: bookworm oc.lintian_ubuntu: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble-1.0 stage: publishing_tests tags: - gcp @@ -509,7 +509,7 @@ oc.lintian_ubuntu: variables: {} oc.install_bin_ubunty_jammy: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:jammy + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:jammy-1.0 stage: publishing_tests tags: - gcp @@ -531,7 +531,7 @@ oc.install_bin_ubunty_jammy: PREFIX: "" oc.install_bin_ubunty_noble: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble-1.0 stage: publishing_tests tags: - gcp diff --git a/.gitlab/ci/pipelines/debian_repository_partial.yml b/.gitlab/ci/pipelines/debian_repository_partial.yml index b545773148a3..cfa9aebb5afe 100644 --- a/.gitlab/ci/pipelines/debian_repository_partial.yml +++ b/.gitlab/ci/pipelines/debian_repository_partial.yml @@ -70,7 +70,7 @@ oc.docker-systemd_tests_debian: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: debian - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -104,7 +104,7 @@ oc.docker-build-debian-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: debian - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -187,7 +187,7 @@ oc.build-data_packages: - packages/$DISTRIBUTION/$RELEASE apt_repo_debian: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie-1.0 stage: publish tags: - gcp_not_interruptible @@ -219,7 +219,7 @@ apt_repo_debian: retry: 0 oc.lintian_debian: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:bookworm + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:bookworm-1.0 stage: publishing_tests tags: - gcp @@ -244,7 +244,7 @@ oc.lintian_debian: variables: {} oc.install_bin_debian_bookworm: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:bookworm + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:bookworm-1.0 stage: publishing_tests tags: - gcp diff --git a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml index b545773148a3..cfa9aebb5afe 100644 --- a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml +++ b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml @@ -70,7 +70,7 @@ oc.docker-systemd_tests_debian: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: debian - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -104,7 +104,7 @@ oc.docker-build-debian-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: debian - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -187,7 +187,7 @@ oc.build-data_packages: - packages/$DISTRIBUTION/$RELEASE apt_repo_debian: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie-1.0 stage: publish tags: - gcp_not_interruptible @@ -219,7 +219,7 @@ apt_repo_debian: retry: 0 oc.lintian_debian: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:bookworm + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:bookworm-1.0 stage: publishing_tests tags: - gcp @@ -244,7 +244,7 @@ oc.lintian_debian: variables: {} oc.install_bin_debian_bookworm: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:bookworm + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:bookworm-1.0 stage: publishing_tests tags: - gcp diff --git a/.gitlab/ci/pipelines/documentation.daily.yml b/.gitlab/ci/pipelines/documentation.daily.yml index 6d8de4aa658d..85ac8d152c97 100644 --- a/.gitlab/ci/pipelines/documentation.daily.yml +++ b/.gitlab/ci/pipelines/documentation.daily.yml @@ -308,7 +308,7 @@ documentation.linkcheck: - . ./scripts/ci/datadog_send_job_cache_info.sh 'after' documentation.install_python_bookworm: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:bookworm + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:bookworm-1.0 stage: test tags: - gcp @@ -327,7 +327,7 @@ documentation.install_python_bookworm: - . ./scripts/ci/datadog_send_job_cache_info.sh 'after' documentation.install_python_jammy: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:jammy + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:jammy-1.0 stage: test tags: - gcp @@ -346,7 +346,7 @@ documentation.install_python_jammy: - . ./scripts/ci/datadog_send_job_cache_info.sh 'after' documentation.install_python_noble: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble-1.0 stage: test tags: - gcp diff --git a/.gitlab/ci/pipelines/homebrew.daily.yml b/.gitlab/ci/pipelines/homebrew.daily.yml index 4342a87ec391..75bbe9b4add3 100644 --- a/.gitlab/ci/pipelines/homebrew.daily.yml +++ b/.gitlab/ci/pipelines/homebrew.daily.yml @@ -28,7 +28,7 @@ datadog_pipeline_trace: - . ./scripts/ci/datadog_send_job_cache_info.sh 'after' oc.build-homebrew-formula: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie-1.0 stage: build tags: - gcp_very_high_cpu @@ -52,7 +52,7 @@ oc.build-homebrew-formula: CARGO_NET_OFFLINE: "false" oc.create-homebrew-formula: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie-1.0 stage: build tags: - gcp diff --git a/.gitlab/ci/pipelines/homebrew.yml b/.gitlab/ci/pipelines/homebrew.yml index a6b1c4da271f..d9dda222cc83 100644 --- a/.gitlab/ci/pipelines/homebrew.yml +++ b/.gitlab/ci/pipelines/homebrew.yml @@ -43,7 +43,7 @@ datadog_pipeline_trace: - . ./scripts/ci/datadog_send_job_cache_info.sh 'after' oc.build-homebrew-formula: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie-1.0 stage: build tags: - gcp_very_high_cpu @@ -66,7 +66,7 @@ oc.build-homebrew-formula: CARGO_NET_OFFLINE: "false" oc.create-homebrew-formula: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie-1.0 stage: build tags: - gcp diff --git a/.gitlab/ci/pipelines/homebrew_auto.yml b/.gitlab/ci/pipelines/homebrew_auto.yml index a6b1c4da271f..d9dda222cc83 100644 --- a/.gitlab/ci/pipelines/homebrew_auto.yml +++ b/.gitlab/ci/pipelines/homebrew_auto.yml @@ -43,7 +43,7 @@ datadog_pipeline_trace: - . ./scripts/ci/datadog_send_job_cache_info.sh 'after' oc.build-homebrew-formula: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie-1.0 stage: build tags: - gcp_very_high_cpu @@ -66,7 +66,7 @@ oc.build-homebrew-formula: CARGO_NET_OFFLINE: "false" oc.create-homebrew-formula: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie-1.0 stage: build tags: - gcp diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index eb77ccf82d69..97cc927143ad 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -3635,7 +3635,7 @@ documentation.linkcheck: - . ./scripts/ci/datadog_send_job_cache_info.sh 'after' documentation.install_python_bookworm: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:bookworm + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:bookworm-1.0 stage: test tags: - gcp diff --git a/.gitlab/ci/pipelines/non_release_tag.yml b/.gitlab/ci/pipelines/non_release_tag.yml index a27938abfeb1..5daafc6ba0eb 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -259,7 +259,7 @@ oc.docker:arm64: EXECUTABLE_FILES: script-inputs/released-executables oc.create-homebrew-formula: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie-1.0 stage: build tags: - gcp @@ -377,7 +377,7 @@ oc.docker-build-debian-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: debian - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -463,7 +463,7 @@ oc.build-data_packages: - packages/$DISTRIBUTION/$RELEASE apt_repo_debian: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie-1.0 stage: publish tags: - gcp_not_interruptible @@ -519,7 +519,7 @@ oc.docker-build-ubuntu-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: ubuntu - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -575,7 +575,7 @@ oc.build-ubuntu: - gcp_arm64 apt_repo_ubuntu: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble-1.0 stage: publish tags: - gcp_not_interruptible @@ -631,7 +631,7 @@ oc.docker-build-rockylinux-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -665,7 +665,7 @@ oc.docker-systemd-tests-rpm-rockylinux: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -762,7 +762,7 @@ oc.build-rockylinux-data: - gcp_arm64 rpm_repo_rockylinux: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3-1.0 stage: publish tags: - gcp_not_interruptible @@ -818,7 +818,7 @@ oc.docker-build-fedora-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -853,7 +853,7 @@ oc.docker-systemd-tests-rpm-fedora: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -953,7 +953,7 @@ oc.build-fedora-data: - gcp_arm64 rpm_repo_fedora: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39-1.0 stage: publish tags: - gcp_not_interruptible diff --git a/.gitlab/ci/pipelines/non_release_tag_test.yml b/.gitlab/ci/pipelines/non_release_tag_test.yml index d8c4b2e39060..fbe7cf0a8b44 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -259,7 +259,7 @@ oc.docker:arm64: EXECUTABLE_FILES: script-inputs/released-executables script-inputs/experimental-executables oc.create-homebrew-formula: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie-1.0 stage: build tags: - gcp @@ -377,7 +377,7 @@ oc.docker-build-debian-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: debian - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -463,7 +463,7 @@ oc.build-data_packages: - packages/$DISTRIBUTION/$RELEASE apt_repo_debian: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie-1.0 stage: publish tags: - gcp_not_interruptible @@ -519,7 +519,7 @@ oc.docker-build-ubuntu-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: ubuntu - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -575,7 +575,7 @@ oc.build-ubuntu: - gcp_arm64 apt_repo_ubuntu: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble-1.0 stage: publish tags: - gcp_not_interruptible @@ -631,7 +631,7 @@ oc.docker-build-rockylinux-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -665,7 +665,7 @@ oc.docker-systemd-tests-rpm-rockylinux: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -762,7 +762,7 @@ oc.build-rockylinux-data: - gcp_arm64 rpm_repo_rockylinux: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3-1.0 stage: publish tags: - gcp_not_interruptible @@ -818,7 +818,7 @@ oc.docker-build-fedora-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -853,7 +853,7 @@ oc.docker-systemd-tests-rpm-fedora: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -953,7 +953,7 @@ oc.build-fedora-data: - gcp_arm64 rpm_repo_fedora: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39-1.0 stage: publish tags: - gcp_not_interruptible diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml index a9efaadc89a2..72a28c3cc796 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -259,7 +259,7 @@ oc.docker:arm64: EXECUTABLE_FILES: script-inputs/released-executables oc.create-homebrew-formula: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie-1.0 stage: build tags: - gcp @@ -379,7 +379,7 @@ oc.docker-build-debian-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: debian - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -465,7 +465,7 @@ oc.build-data_packages: - packages/$DISTRIBUTION/$RELEASE apt_repo_debian: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie-1.0 stage: publish tags: - gcp_not_interruptible @@ -521,7 +521,7 @@ oc.docker-build-ubuntu-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: ubuntu - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -577,7 +577,7 @@ oc.build-ubuntu: - gcp_arm64 apt_repo_ubuntu: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble-1.0 stage: publish tags: - gcp_not_interruptible @@ -633,7 +633,7 @@ oc.docker-build-rockylinux-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -667,7 +667,7 @@ oc.docker-systemd-tests-rpm-rockylinux: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -764,7 +764,7 @@ oc.build-rockylinux-data: - gcp_arm64 rpm_repo_rockylinux: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3-1.0 stage: publish tags: - gcp_not_interruptible @@ -820,7 +820,7 @@ oc.docker-build-fedora-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -855,7 +855,7 @@ oc.docker-systemd-tests-rpm-fedora: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -955,7 +955,7 @@ oc.build-fedora-data: - gcp_arm64 rpm_repo_fedora: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39-1.0 stage: publish tags: - gcp_not_interruptible diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag_test.yml b/.gitlab/ci/pipelines/octez_beta_release_tag_test.yml index dc8a1e86627e..24d5068023fb 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag_test.yml @@ -259,7 +259,7 @@ oc.docker:arm64: EXECUTABLE_FILES: script-inputs/released-executables script-inputs/experimental-executables oc.create-homebrew-formula: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie-1.0 stage: build tags: - gcp @@ -379,7 +379,7 @@ oc.docker-build-debian-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: debian - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -465,7 +465,7 @@ oc.build-data_packages: - packages/$DISTRIBUTION/$RELEASE apt_repo_debian: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie-1.0 stage: publish tags: - gcp_not_interruptible @@ -521,7 +521,7 @@ oc.docker-build-ubuntu-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: ubuntu - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -577,7 +577,7 @@ oc.build-ubuntu: - gcp_arm64 apt_repo_ubuntu: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble-1.0 stage: publish tags: - gcp_not_interruptible @@ -633,7 +633,7 @@ oc.docker-build-rockylinux-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -667,7 +667,7 @@ oc.docker-systemd-tests-rpm-rockylinux: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -764,7 +764,7 @@ oc.build-rockylinux-data: - gcp_arm64 rpm_repo_rockylinux: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3-1.0 stage: publish tags: - gcp_not_interruptible @@ -820,7 +820,7 @@ oc.docker-build-fedora-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -855,7 +855,7 @@ oc.docker-systemd-tests-rpm-fedora: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -955,7 +955,7 @@ oc.build-fedora-data: - gcp_arm64 rpm_repo_fedora: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39-1.0 stage: publish tags: - gcp_not_interruptible diff --git a/.gitlab/ci/pipelines/octez_major_release_tag.yml b/.gitlab/ci/pipelines/octez_major_release_tag.yml index 33241b73da10..8b0ae683e4cc 100644 --- a/.gitlab/ci/pipelines/octez_major_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_major_release_tag.yml @@ -259,7 +259,7 @@ oc.docker:arm64: EXECUTABLE_FILES: script-inputs/released-executables oc.create-homebrew-formula: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie-1.0 stage: build tags: - gcp @@ -379,7 +379,7 @@ oc.docker-build-debian-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: debian - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -465,7 +465,7 @@ oc.build-data_packages: - packages/$DISTRIBUTION/$RELEASE apt_repo_debian: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie-1.0 stage: publish tags: - gcp_not_interruptible @@ -521,7 +521,7 @@ oc.docker-build-ubuntu-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: ubuntu - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -577,7 +577,7 @@ oc.build-ubuntu: - gcp_arm64 apt_repo_ubuntu: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble-1.0 stage: publish tags: - gcp_not_interruptible @@ -633,7 +633,7 @@ oc.docker-build-rockylinux-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -667,7 +667,7 @@ oc.docker-systemd-tests-rpm-rockylinux: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -764,7 +764,7 @@ oc.build-rockylinux-data: - gcp_arm64 rpm_repo_rockylinux: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3-1.0 stage: publish tags: - gcp_not_interruptible @@ -820,7 +820,7 @@ oc.docker-build-fedora-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -855,7 +855,7 @@ oc.docker-systemd-tests-rpm-fedora: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -955,7 +955,7 @@ oc.build-fedora-data: - gcp_arm64 rpm_repo_fedora: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39-1.0 stage: publish tags: - gcp_not_interruptible diff --git a/.gitlab/ci/pipelines/octez_major_release_tag_test.yml b/.gitlab/ci/pipelines/octez_major_release_tag_test.yml index 64f7f6b6c78c..5024cd6bc8fa 100644 --- a/.gitlab/ci/pipelines/octez_major_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_major_release_tag_test.yml @@ -259,7 +259,7 @@ oc.docker:arm64: EXECUTABLE_FILES: script-inputs/released-executables script-inputs/experimental-executables oc.create-homebrew-formula: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie-1.0 stage: build tags: - gcp @@ -379,7 +379,7 @@ oc.docker-build-debian-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: debian - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -465,7 +465,7 @@ oc.build-data_packages: - packages/$DISTRIBUTION/$RELEASE apt_repo_debian: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie-1.0 stage: publish tags: - gcp_not_interruptible @@ -521,7 +521,7 @@ oc.docker-build-ubuntu-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: ubuntu - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -577,7 +577,7 @@ oc.build-ubuntu: - gcp_arm64 apt_repo_ubuntu: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble-1.0 stage: publish tags: - gcp_not_interruptible @@ -633,7 +633,7 @@ oc.docker-build-rockylinux-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -667,7 +667,7 @@ oc.docker-systemd-tests-rpm-rockylinux: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -764,7 +764,7 @@ oc.build-rockylinux-data: - gcp_arm64 rpm_repo_rockylinux: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3-1.0 stage: publish tags: - gcp_not_interruptible @@ -820,7 +820,7 @@ oc.docker-build-fedora-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -855,7 +855,7 @@ oc.docker-systemd-tests-rpm-fedora: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -955,7 +955,7 @@ oc.build-fedora-data: - gcp_arm64 rpm_repo_fedora: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39-1.0 stage: publish tags: - gcp_not_interruptible diff --git a/.gitlab/ci/pipelines/octez_minor_release_tag.yml b/.gitlab/ci/pipelines/octez_minor_release_tag.yml index c7849056c78b..592b4069428a 100644 --- a/.gitlab/ci/pipelines/octez_minor_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_minor_release_tag.yml @@ -233,7 +233,7 @@ oc.docker:arm64: EXECUTABLE_FILES: script-inputs/released-executables oc.create-homebrew-formula: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie-1.0 stage: build tags: - gcp @@ -353,7 +353,7 @@ oc.docker-build-debian-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: debian - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -439,7 +439,7 @@ oc.build-data_packages: - packages/$DISTRIBUTION/$RELEASE apt_repo_debian: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie-1.0 stage: publish tags: - gcp_not_interruptible @@ -495,7 +495,7 @@ oc.docker-build-ubuntu-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: ubuntu - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -551,7 +551,7 @@ oc.build-ubuntu: - gcp_arm64 apt_repo_ubuntu: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble-1.0 stage: publish tags: - gcp_not_interruptible @@ -607,7 +607,7 @@ oc.docker-build-rockylinux-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -641,7 +641,7 @@ oc.docker-systemd-tests-rpm-rockylinux: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -738,7 +738,7 @@ oc.build-rockylinux-data: - gcp_arm64 rpm_repo_rockylinux: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3-1.0 stage: publish tags: - gcp_not_interruptible @@ -794,7 +794,7 @@ oc.docker-build-fedora-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -829,7 +829,7 @@ oc.docker-systemd-tests-rpm-fedora: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -929,7 +929,7 @@ oc.build-fedora-data: - gcp_arm64 rpm_repo_fedora: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39-1.0 stage: publish tags: - gcp_not_interruptible diff --git a/.gitlab/ci/pipelines/octez_minor_release_tag_test.yml b/.gitlab/ci/pipelines/octez_minor_release_tag_test.yml index 54c7c418c43e..f790ccb2b71e 100644 --- a/.gitlab/ci/pipelines/octez_minor_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_minor_release_tag_test.yml @@ -233,7 +233,7 @@ oc.docker:arm64: EXECUTABLE_FILES: script-inputs/released-executables script-inputs/experimental-executables oc.create-homebrew-formula: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie-1.0 stage: build tags: - gcp @@ -353,7 +353,7 @@ oc.docker-build-debian-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: debian - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -439,7 +439,7 @@ oc.build-data_packages: - packages/$DISTRIBUTION/$RELEASE apt_repo_debian: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie-1.0 stage: publish tags: - gcp_not_interruptible @@ -495,7 +495,7 @@ oc.docker-build-ubuntu-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: ubuntu - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -551,7 +551,7 @@ oc.build-ubuntu: - gcp_arm64 apt_repo_ubuntu: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble-1.0 stage: publish tags: - gcp_not_interruptible @@ -607,7 +607,7 @@ oc.docker-build-rockylinux-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -641,7 +641,7 @@ oc.docker-systemd-tests-rpm-rockylinux: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -738,7 +738,7 @@ oc.build-rockylinux-data: - gcp_arm64 rpm_repo_rockylinux: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3-1.0 stage: publish tags: - gcp_not_interruptible @@ -794,7 +794,7 @@ oc.docker-build-fedora-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -829,7 +829,7 @@ oc.docker-systemd-tests-rpm-fedora: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -929,7 +929,7 @@ oc.build-fedora-data: - gcp_arm64 rpm_repo_fedora: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39-1.0 stage: publish tags: - gcp_not_interruptible diff --git a/.gitlab/ci/pipelines/rpm.daily.yml b/.gitlab/ci/pipelines/rpm.daily.yml index 9709e2d13131..732b1ad9a9e2 100644 --- a/.gitlab/ci/pipelines/rpm.daily.yml +++ b/.gitlab/ci/pipelines/rpm.daily.yml @@ -56,7 +56,7 @@ oc.docker-build-rockylinux-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -91,7 +91,7 @@ oc.docker-systemd-tests-rpm-rockylinux: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -190,7 +190,7 @@ oc.build-rockylinux-data: - gcp_arm64 rpm_repo_rockylinux: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3-1.0 stage: publish tags: - gcp_not_interruptible @@ -248,7 +248,7 @@ oc.docker-build-fedora-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -284,7 +284,7 @@ oc.docker-systemd-tests-rpm-fedora: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -386,7 +386,7 @@ oc.build-fedora-data: - gcp_arm64 rpm_repo_fedora: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39-1.0 stage: publish tags: - gcp_not_interruptible @@ -419,7 +419,7 @@ rpm_repo_fedora: retry: 0 oc.install_bin_fedora_39.doc: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39-1.0 stage: publishing_tests tags: - gcp @@ -473,7 +473,7 @@ oc.install_bin_fedora_39_systemd: RELEASE: "39" oc.install_bin_rockylinux_9.3.doc: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3-1.0 stage: publishing_tests tags: - gcp diff --git a/.gitlab/ci/pipelines/rpm_repository_partial.yml b/.gitlab/ci/pipelines/rpm_repository_partial.yml index a5594970293d..da284d13107f 100644 --- a/.gitlab/ci/pipelines/rpm_repository_partial.yml +++ b/.gitlab/ci/pipelines/rpm_repository_partial.yml @@ -70,7 +70,7 @@ oc.docker-build-rockylinux-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -103,7 +103,7 @@ oc.docker-systemd-tests-rpm-rockylinux: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -196,7 +196,7 @@ oc.build-rockylinux-data: - gcp_very_high_cpu rpm_repo_rockylinux: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3-1.0 stage: publish tags: - gcp_not_interruptible @@ -228,7 +228,7 @@ rpm_repo_rockylinux: retry: 0 oc.install_bin_rockylinux_9.3.doc: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3-1.0 stage: publishing_tests tags: - gcp diff --git a/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml b/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml index a5594970293d..da284d13107f 100644 --- a/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml +++ b/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml @@ -70,7 +70,7 @@ oc.docker-build-rockylinux-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -103,7 +103,7 @@ oc.docker-systemd-tests-rpm-rockylinux: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -196,7 +196,7 @@ oc.build-rockylinux-data: - gcp_very_high_cpu rpm_repo_rockylinux: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3-1.0 stage: publish tags: - gcp_not_interruptible @@ -228,7 +228,7 @@ rpm_repo_rockylinux: retry: 0 oc.install_bin_rockylinux_9.3.doc: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3-1.0 stage: publishing_tests tags: - gcp diff --git a/.gitlab/ci/pipelines/schedule_master_test_release.yml b/.gitlab/ci/pipelines/schedule_master_test_release.yml index 6968b185415b..29f2cf0c93c8 100644 --- a/.gitlab/ci/pipelines/schedule_master_test_release.yml +++ b/.gitlab/ci/pipelines/schedule_master_test_release.yml @@ -259,7 +259,7 @@ oc.docker:arm64: EXECUTABLE_FILES: script-inputs/released-executables script-inputs/experimental-executables oc.create-homebrew-formula: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-homebrew:trixie-1.0 stage: build tags: - gcp @@ -380,7 +380,7 @@ oc.docker-build-debian-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: debian - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -466,7 +466,7 @@ oc.build-data_packages: - packages/$DISTRIBUTION/$RELEASE apt_repo_debian: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian:trixie-1.0 stage: publish tags: - gcp_not_interruptible @@ -522,7 +522,7 @@ oc.docker-build-ubuntu-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: ubuntu - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$DISTRIBUTION:$RELEASE-1.0 parallel: matrix: - RELEASE: @@ -578,7 +578,7 @@ oc.build-ubuntu: - gcp_arm64 apt_repo_ubuntu: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/ubuntu:noble-1.0 stage: publish tags: - gcp_not_interruptible @@ -634,7 +634,7 @@ oc.docker-build-rockylinux-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -668,7 +668,7 @@ oc.docker-systemd-tests-rpm-rockylinux: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: rockylinux - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -765,7 +765,7 @@ oc.build-rockylinux-data: - gcp_arm64 rpm_repo_rockylinux: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/rockylinux:9.3-1.0 stage: publish tags: - gcp_not_interruptible @@ -821,7 +821,7 @@ oc.docker-build-fedora-dependencies: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -856,7 +856,7 @@ oc.docker-systemd-tests-rpm-fedora: DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DISTRIBUTION: fedora - BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE} + BASE_IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/${DISTRIBUTION}:${RELEASE}-1.0 parallel: matrix: - RELEASE: @@ -956,7 +956,7 @@ oc.build-fedora-data: - gcp_arm64 rpm_repo_fedora: - image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39 + image: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/fedora:39-1.0 stage: publish tags: - gcp_not_interruptible diff --git a/ci/lib_tezos_ci/tezos_ci.ml b/ci/lib_tezos_ci/tezos_ci.ml index ea713421168c..929cddba947b 100644 --- a/ci/lib_tezos_ci/tezos_ci.ml +++ b/ci/lib_tezos_ci/tezos_ci.ml @@ -1559,8 +1559,9 @@ module Images = struct let path_prefix = "${GCP_PROTECTED_REGISTRY}/tezos/tezos" - let make_img distro _version = - Image.mk_external ~image_path:(sf "%s/%s" path_prefix distro) + let make_img distro version = + Image.mk_external + ~image_path:(sf "%s/%s-%a" path_prefix distro version_pp version) let debian_version = {major = 1; minor = 0} diff --git a/ci/lib_tezos_ci_jobs/code_verification.ml b/ci/lib_tezos_ci_jobs/code_verification.ml index 07f22a0c439e..161d2c39de28 100644 --- a/ci/lib_tezos_ci_jobs/code_verification.ml +++ b/ci/lib_tezos_ci_jobs/code_verification.ml @@ -378,6 +378,8 @@ let jobs pipeline_type = ~image: (Image.mk_external ~image_path: + (* this is not a base image, but the dependency image + from the packages pipelines *) (Images.Base_images.path_prefix ^ "/build-ubuntu-noble:master")) ~rules:(make_rules ~manual:Yes ()) ~allow_failure:Yes diff --git a/ci/lib_tezos_ci_jobs/debian_repository.ml b/ci/lib_tezos_ci_jobs/debian_repository.ml index d3027ea3006e..583e8f129ca2 100644 --- a/ci/lib_tezos_ci_jobs/debian_repository.ml +++ b/ci/lib_tezos_ci_jobs/debian_repository.ml @@ -125,7 +125,12 @@ let jobs ?(limit_dune_build_jobs = false) pipeline_type = [ ("DISTRIBUTION", distribution); ( "BASE_IMAGE", - Images.Base_images.path_prefix ^ "/$DISTRIBUTION:$RELEASE" ); + Images.Base_images.( + sf + "%s/$DISTRIBUTION:$RELEASE-%a" + path_prefix + version_pp + debian_version) ); ]) ~parallel:(Matrix matrix) ~tag:Dynamic @@ -160,7 +165,12 @@ let jobs ?(limit_dune_build_jobs = false) pipeline_type = [ ("DISTRIBUTION", distribution); ( "BASE_IMAGE", - Images.Base_images.path_prefix ^ "/${DISTRIBUTION}:${RELEASE}" ); + Images.Base_images.( + sf + "%s/$DISTRIBUTION:$RELEASE-%a" + path_prefix + version_pp + debian_version) ); ]) ~parallel:(Matrix matrix) ~tag:Dynamic diff --git a/ci/lib_tezos_ci_jobs/rpm_repository.ml b/ci/lib_tezos_ci_jobs/rpm_repository.ml index ec352050100a..bf7d3ce36010 100644 --- a/ci/lib_tezos_ci_jobs/rpm_repository.ml +++ b/ci/lib_tezos_ci_jobs/rpm_repository.ml @@ -102,7 +102,12 @@ let jobs ?(limit_dune_build_jobs = false) pipeline_type = [ ("DISTRIBUTION", distribution); ( "BASE_IMAGE", - Images.Base_images.path_prefix ^ "/${DISTRIBUTION}:${RELEASE}" ); + Images.Base_images.( + sf + "%s/${DISTRIBUTION}:${RELEASE}-%a" + path_prefix + version_pp + rpm_version) ); ]) ~parallel:(Matrix matrix) ~tag:Dynamic @@ -136,7 +141,12 @@ let jobs ?(limit_dune_build_jobs = false) pipeline_type = [ ("DISTRIBUTION", distribution); ( "BASE_IMAGE", - Images.Base_images.path_prefix ^ "/${DISTRIBUTION}:${RELEASE}" ); + Images.Base_images.( + sf + "%s/${DISTRIBUTION}:${RELEASE}-%a" + path_prefix + version_pp + rpm_version) ); ]) ~parallel:(Matrix matrix) ~tag:Dynamic -- GitLab