From 89c44687da4e05152c89b2b581036ca62530642e Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Fri, 7 Feb 2025 10:37:26 +0100 Subject: [PATCH 1/7] packages: remove current debian packages from release page --- .gitlab/ci/pipelines/non_release_tag.yml | 8 -------- .gitlab/ci/pipelines/non_release_tag_test.yml | 8 -------- .gitlab/ci/pipelines/octez_beta_release_tag.yml | 8 -------- .gitlab/ci/pipelines/octez_release_tag.yml | 8 -------- .gitlab/ci/pipelines/octez_release_tag_test.yml | 8 -------- .../ci/pipelines/schedule_master_test_release.yml | 8 -------- ci/bin/release_tag.ml | 12 +----------- 7 files changed, 1 insertion(+), 59 deletions(-) diff --git a/.gitlab/ci/pipelines/non_release_tag.yml b/.gitlab/ci/pipelines/non_release_tag.yml index 4a60e4548c87..820cded1236d 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -250,18 +250,10 @@ gitlab:publish: - oc.build:static-x86_64-linux-binaries - oc.build:static-arm64-linux-binaries - oc.install-release-homebrew - - oc.build-ubuntu-current_a - - oc.build-debian-current_a - - oc.build-ubuntu-current_b - - oc.build-debian-current_b dependencies: - oc.build:static-x86_64-linux-binaries - oc.build:static-arm64-linux-binaries - oc.install-release-homebrew - - oc.build-ubuntu-current_a - - oc.build-debian-current_a - - oc.build-ubuntu-current_b - - oc.build-debian-current_b timeout: 60 minutes interruptible: false script: diff --git a/.gitlab/ci/pipelines/non_release_tag_test.yml b/.gitlab/ci/pipelines/non_release_tag_test.yml index 1aa3fe102400..36d5d6ba3861 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -250,18 +250,10 @@ gitlab:publish: - oc.build:static-x86_64-linux-binaries - oc.build:static-arm64-linux-binaries - oc.install-release-homebrew - - oc.build-ubuntu-current_a - - oc.build-debian-current_a - - oc.build-ubuntu-current_b - - oc.build-debian-current_b dependencies: - oc.build:static-x86_64-linux-binaries - oc.build:static-arm64-linux-binaries - oc.install-release-homebrew - - oc.build-ubuntu-current_a - - oc.build-debian-current_a - - oc.build-ubuntu-current_b - - oc.build-debian-current_b timeout: 60 minutes interruptible: false script: diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml index 93f24f35a091..ccfd5a20432c 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -250,18 +250,10 @@ gitlab:release: - oc.build:static-x86_64-linux-binaries - oc.build:static-arm64-linux-binaries - oc.install-release-homebrew - - oc.build-ubuntu-current_a - - oc.build-debian-current_a - - oc.build-ubuntu-current_b - - oc.build-debian-current_b dependencies: - oc.build:static-x86_64-linux-binaries - oc.build:static-arm64-linux-binaries - oc.install-release-homebrew - - oc.build-ubuntu-current_a - - oc.build-debian-current_a - - oc.build-ubuntu-current_b - - oc.build-debian-current_b timeout: 60 minutes interruptible: false script: diff --git a/.gitlab/ci/pipelines/octez_release_tag.yml b/.gitlab/ci/pipelines/octez_release_tag.yml index c9a3f77be710..ef51c4b396b5 100644 --- a/.gitlab/ci/pipelines/octez_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_release_tag.yml @@ -251,18 +251,10 @@ gitlab:release: - oc.build:static-x86_64-linux-binaries - oc.build:static-arm64-linux-binaries - oc.install-release-homebrew - - oc.build-ubuntu-current_a - - oc.build-debian-current_a - - oc.build-ubuntu-current_b - - oc.build-debian-current_b dependencies: - oc.build:static-x86_64-linux-binaries - oc.build:static-arm64-linux-binaries - oc.install-release-homebrew - - oc.build-ubuntu-current_a - - oc.build-debian-current_a - - oc.build-ubuntu-current_b - - oc.build-debian-current_b timeout: 60 minutes interruptible: false script: diff --git a/.gitlab/ci/pipelines/octez_release_tag_test.yml b/.gitlab/ci/pipelines/octez_release_tag_test.yml index 34cc88853e89..5ca76d4f10c6 100644 --- a/.gitlab/ci/pipelines/octez_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_release_tag_test.yml @@ -251,18 +251,10 @@ gitlab:release: - oc.build:static-x86_64-linux-binaries - oc.build:static-arm64-linux-binaries - oc.install-release-homebrew - - oc.build-ubuntu-current_a - - oc.build-debian-current_a - - oc.build-ubuntu-current_b - - oc.build-debian-current_b dependencies: - oc.build:static-x86_64-linux-binaries - oc.build:static-arm64-linux-binaries - oc.install-release-homebrew - - oc.build-ubuntu-current_a - - oc.build-debian-current_a - - oc.build-ubuntu-current_b - - oc.build-debian-current_b timeout: 60 minutes interruptible: false script: diff --git a/.gitlab/ci/pipelines/schedule_master_test_release.yml b/.gitlab/ci/pipelines/schedule_master_test_release.yml index 53f4b0e4d4c5..b63f1a84e276 100644 --- a/.gitlab/ci/pipelines/schedule_master_test_release.yml +++ b/.gitlab/ci/pipelines/schedule_master_test_release.yml @@ -250,18 +250,10 @@ gitlab:publish: - oc.build:static-x86_64-linux-binaries - oc.build:static-arm64-linux-binaries - oc.install-release-homebrew - - oc.build-ubuntu-current_a - - oc.build-debian-current_a - - oc.build-ubuntu-current_b - - oc.build-debian-current_b dependencies: - oc.build:static-x86_64-linux-binaries - oc.build:static-arm64-linux-binaries - oc.install-release-homebrew - - oc.build-ubuntu-current_a - - oc.build-debian-current_a - - oc.build-ubuntu-current_b - - oc.build-debian-current_b timeout: 60 minutes interruptible: false before_script: diff --git a/ci/bin/release_tag.ml b/ci/bin/release_tag.ml index 45927682d95b..79c56bfc80f7 100644 --- a/ci/bin/release_tag.ml +++ b/ci/bin/release_tag.ml @@ -168,14 +168,8 @@ let octez_jobs ?(test = false) release_tag_pipeline_type = | _ -> ""); ] in - let ( jobs_debian_repository, - job_build_ubuntu_package_current_a, - job_build_debian_package_current_a, - job_build_ubuntu_package_current_b, - job_build_debian_package_current_b ) = - Debian_repository.jobs Release - in let jobs_dnf_repository = Rpm_repository.jobs Release in + let jobs_debian_repository, _, _, _, _ = Debian_repository.jobs Release in let job_gitlab_release_or_publish = let dependencies = Dependent @@ -183,10 +177,6 @@ let octez_jobs ?(test = false) release_tag_pipeline_type = Artifacts job_static_x86_64_release; Artifacts job_static_arm64_release; Artifacts job_build_homebrew_release; - Artifacts job_build_ubuntu_package_current_a; - Artifacts job_build_debian_package_current_a; - Artifacts job_build_ubuntu_package_current_b; - Artifacts job_build_debian_package_current_b; ] in match release_tag_pipeline_type with -- GitLab From 53cf796105e5707cb4d778ca9d3bbeb82cccf62c Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Tue, 11 Feb 2025 15:36:18 +0100 Subject: [PATCH 2/7] packages: refactor deb tests --- .../ci/pipelines/debian_repository_full.yml | 72 +++++++++---------- .../pipelines/debian_repository_partial.yml | 36 +++++----- .../debian_repository_partial_auto.yml | 36 +++++----- ci/bin/debian_repository.ml | 39 ++++++---- 4 files changed, 97 insertions(+), 86 deletions(-) diff --git a/.gitlab/ci/pipelines/debian_repository_full.yml b/.gitlab/ci/pipelines/debian_repository_full.yml index 47d69c9395d7..c6095701682a 100644 --- a/.gitlab/ci/pipelines/debian_repository_full.yml +++ b/.gitlab/ci/pipelines/debian_repository_full.yml @@ -551,24 +551,6 @@ apt_repo_ubuntu: - stuck_or_timeout_failure - runner_system_failure -oc.lintian_debian: - image: debian:bookworm - stage: publishing_tests - tags: - - gcp - needs: - - oc.build-debian - dependencies: - - oc.build-debian - timeout: 60 minutes - before_script: - - . ./scripts/version.sh - - export DEBIAN_FRONTEND=noninteractive - - apt-get update - - apt-get install lintian -y - script: - - ./scripts/ci/lintian_debian_packages.sh debian bookworm - oc.install_bin_debian_bookworm_current: image: debian:bookworm stage: publishing_tests @@ -587,6 +569,24 @@ oc.install_bin_debian_bookworm_current: - stuck_or_timeout_failure - runner_system_failure +oc.lintian_debian: + image: debian:bookworm + stage: publishing_tests + tags: + - gcp + needs: + - oc.build-debian + dependencies: + - oc.build-debian + timeout: 60 minutes + before_script: + - . ./scripts/version.sh + - export DEBIAN_FRONTEND=noninteractive + - apt-get update + - apt-get install lintian -y + script: + - ./scripts/ci/lintian_debian_packages.sh debian bookworm + oc.install_bin_debian_bookworm: image: debian:bookworm stage: publishing_tests @@ -644,24 +644,6 @@ oc.install_bin_debian_bookworm-systemd: DISTRIBUTION: debian RELEASE: bookworm -oc.lintian_ubuntu: - image: public.ecr.aws/lts/ubuntu:24.04_stable - stage: publishing_tests - tags: - - gcp - needs: - - oc.build-ubuntu - dependencies: - - oc.build-ubuntu - timeout: 60 minutes - before_script: - - . ./scripts/version.sh - - export DEBIAN_FRONTEND=noninteractive - - apt-get update - - apt-get install lintian -y - script: - - ./scripts/ci/lintian_debian_packages.sh ubuntu jammy noble - oc.install_bin_ubuntu_noble_current: image: public.ecr.aws/lts/ubuntu:24.04_stable stage: publishing_tests @@ -698,6 +680,24 @@ oc.install_bin_ubuntu_jammy_current: - stuck_or_timeout_failure - runner_system_failure +oc.lintian_ubuntu: + image: public.ecr.aws/lts/ubuntu:24.04_stable + stage: publishing_tests + tags: + - gcp + needs: + - oc.build-ubuntu + dependencies: + - oc.build-ubuntu + timeout: 60 minutes + before_script: + - . ./scripts/version.sh + - export DEBIAN_FRONTEND=noninteractive + - apt-get update + - apt-get install lintian -y + script: + - ./scripts/ci/lintian_debian_packages.sh ubuntu jammy noble + oc.upgrade_bin_ubuntu_jammy: image: public.ecr.aws/lts/ubuntu:22.04_stable stage: publishing_tests diff --git a/.gitlab/ci/pipelines/debian_repository_partial.yml b/.gitlab/ci/pipelines/debian_repository_partial.yml index 8c05814f7dc6..b4a724615611 100644 --- a/.gitlab/ci/pipelines/debian_repository_partial.yml +++ b/.gitlab/ci/pipelines/debian_repository_partial.yml @@ -309,24 +309,6 @@ apt_repo_debian: - stuck_or_timeout_failure - runner_system_failure -oc.lintian_debian: - image: debian:bookworm - stage: publishing_tests - tags: - - gcp - needs: - - oc.build-debian - dependencies: - - oc.build-debian - timeout: 60 minutes - before_script: - - . ./scripts/version.sh - - export DEBIAN_FRONTEND=noninteractive - - apt-get update - - apt-get install lintian -y - script: - - ./scripts/ci/lintian_debian_packages.sh debian bookworm - oc.install_bin_debian_bookworm_current: image: debian:bookworm stage: publishing_tests @@ -345,6 +327,24 @@ oc.install_bin_debian_bookworm_current: - stuck_or_timeout_failure - runner_system_failure +oc.lintian_debian: + image: debian:bookworm + stage: publishing_tests + tags: + - gcp + needs: + - oc.build-debian + dependencies: + - oc.build-debian + timeout: 60 minutes + before_script: + - . ./scripts/version.sh + - export DEBIAN_FRONTEND=noninteractive + - apt-get update + - apt-get install lintian -y + script: + - ./scripts/ci/lintian_debian_packages.sh debian bookworm + oc.install_bin_debian_bookworm: image: debian:bookworm stage: publishing_tests diff --git a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml index 172abc9831d9..abaaf5027028 100644 --- a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml +++ b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml @@ -309,24 +309,6 @@ apt_repo_debian: - stuck_or_timeout_failure - runner_system_failure -oc.lintian_debian: - image: debian:bookworm - stage: publishing_tests - tags: - - gcp - needs: - - oc.build-debian - dependencies: - - oc.build-debian - timeout: 60 minutes - before_script: - - . ./scripts/version.sh - - export DEBIAN_FRONTEND=noninteractive - - apt-get update - - apt-get install lintian -y - script: - - ./scripts/ci/lintian_debian_packages.sh debian bookworm - oc.install_bin_debian_bookworm_current: image: debian:bookworm stage: publishing_tests @@ -345,6 +327,24 @@ oc.install_bin_debian_bookworm_current: - stuck_or_timeout_failure - runner_system_failure +oc.lintian_debian: + image: debian:bookworm + stage: publishing_tests + tags: + - gcp + needs: + - oc.build-debian + dependencies: + - oc.build-debian + timeout: 60 minutes + before_script: + - . ./scripts/version.sh + - export DEBIAN_FRONTEND=noninteractive + - apt-get update + - apt-get install lintian -y + script: + - ./scripts/ci/lintian_debian_packages.sh debian bookworm + oc.install_bin_debian_bookworm: image: debian:bookworm stage: publishing_tests diff --git a/ci/bin/debian_repository.ml b/ci/bin/debian_repository.ml index 79d9ca9ae9a9..63de090fce2a 100644 --- a/ci/bin/debian_repository.ml +++ b/ci/bin/debian_repository.ml @@ -403,12 +403,6 @@ let jobs pipeline_type = (* in merge pipelines we tests only debian. release pipelines test the entire matrix *) [ - job_lintian - ~__POS__ - ~name:"oc.lintian_ubuntu" - ~dependencies:(Dependent [Artifacts job_build_ubuntu_package]) - ~image:Images.ubuntu_noble - ["./scripts/ci/lintian_debian_packages.sh ubuntu jammy noble"]; job_install_bin ~__POS__ ~name:"oc.install_bin_ubuntu_noble_current" @@ -421,6 +415,18 @@ let jobs pipeline_type = ~dependencies:(Dependent [Job job_apt_repo_ubuntu_current]) ~image:Images.ubuntu_jammy ["./docs/introduction/install-bin-deb.sh ubuntu jammy"]; + ] + in + let test_ubuntu_packages_jobs = + (* in merge pipelines we tests only debian. release pipelines + test the entire matrix *) + [ + job_lintian + ~__POS__ + ~name:"oc.lintian_ubuntu" + ~dependencies:(Dependent [Artifacts job_build_ubuntu_package]) + ~image:Images.ubuntu_noble + ["./scripts/ci/lintian_debian_packages.sh ubuntu jammy noble"]; job_upgrade_bin ~__POS__ ~name:"oc.upgrade_bin_ubuntu_jammy" @@ -432,18 +438,22 @@ let jobs pipeline_type = in let test_current_debian_packages_jobs = [ - job_lintian - ~__POS__ - ~name:"oc.lintian_debian" - ~dependencies:(Dependent [Artifacts job_build_debian_package]) - ~image:Images.debian_bookworm - ["./scripts/ci/lintian_debian_packages.sh debian bookworm"]; job_install_bin ~__POS__ ~name:"oc.install_bin_debian_bookworm_current" ~dependencies:(Dependent [Job job_apt_repo_debian_current]) ~image:Images.debian_bookworm ["./docs/introduction/install-bin-deb.sh debian bookworm"]; + ] + in + let test_debian_packages_jobs = + [ + job_lintian + ~__POS__ + ~name:"oc.lintian_debian" + ~dependencies:(Dependent [Artifacts job_build_debian_package]) + ~image:Images.debian_bookworm + ["./scripts/ci/lintian_debian_packages.sh debian bookworm"]; job_install_bin ~__POS__ ~name:"oc.install_bin_debian_bookworm" @@ -506,7 +516,7 @@ let jobs pipeline_type = match pipeline_type with | Partial -> ( (job_docker_systemd_test_debian_dependencies :: debian_jobs) - @ test_current_debian_packages_jobs, + @ test_current_debian_packages_jobs @ test_debian_packages_jobs, job_build_ubuntu_package_current_a, job_build_debian_package_current_a, job_build_ubuntu_package_current_b, @@ -514,7 +524,8 @@ let jobs pipeline_type = | Full -> ( (job_docker_systemd_test_debian_dependencies :: debian_jobs) @ ubuntu_jobs @ test_current_debian_packages_jobs - @ test_current_ubuntu_packages_jobs, + @ test_debian_packages_jobs @ test_current_ubuntu_packages_jobs + @ test_ubuntu_packages_jobs, job_build_ubuntu_package_current_a, job_build_debian_package_current_a, job_build_ubuntu_package_current_b, -- GitLab From 247871fe058b2e513c8fffccbcbee5c93a8184c0 Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Tue, 11 Feb 2025 15:55:23 +0100 Subject: [PATCH 3/7] packages: move current to old and next to released --- .../ci/pipelines/debian_repository_full.yml | 21 ++++++++----- .../pipelines/debian_repository_partial.yml | 11 ++++--- .../debian_repository_partial_auto.yml | 11 ++++--- .gitlab/ci/pipelines/non_release_tag.yml | 6 ++-- .gitlab/ci/pipelines/non_release_tag_test.yml | 6 ++-- .../ci/pipelines/octez_beta_release_tag.yml | 6 ++-- .gitlab/ci/pipelines/octez_release_tag.yml | 6 ++-- .../ci/pipelines/octez_release_tag_test.yml | 6 ++-- .../schedule_master_test_release.yml | 6 ++-- ci/bin/debian_repository.ml | 31 +++++++++++-------- docs/introduction/install-bin-deb.sh | 6 ++-- docs/introduction/upgrade-bin-deb.sh | 6 ++-- scripts/ci/create_debian_repo.sh | 2 +- .../packaging/tests/systemd-docker-test.sh | 2 +- 14 files changed, 78 insertions(+), 48 deletions(-) diff --git a/.gitlab/ci/pipelines/debian_repository_full.yml b/.gitlab/ci/pipelines/debian_repository_full.yml index c6095701682a..8ed1175f64b5 100644 --- a/.gitlab/ci/pipelines/debian_repository_full.yml +++ b/.gitlab/ci/pipelines/debian_repository_full.yml @@ -279,6 +279,7 @@ apt_repo_debian_current: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg + PREFIX: old id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -309,7 +310,7 @@ apt_repo_debian: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next + PREFIX: "" id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -511,6 +512,7 @@ apt_repo_ubuntu_current: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg + PREFIX: old id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -541,7 +543,7 @@ apt_repo_ubuntu: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next + PREFIX: "" id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -562,7 +564,8 @@ oc.install_bin_debian_bookworm_current: timeout: 60 minutes script: - ./docs/introduction/install-bin-deb.sh debian bookworm - variables: {} + variables: + PREFIX: old retry: max: 2 when: @@ -586,6 +589,7 @@ oc.lintian_debian: - apt-get install lintian -y script: - ./scripts/ci/lintian_debian_packages.sh debian bookworm + variables: {} oc.install_bin_debian_bookworm: image: debian:bookworm @@ -599,7 +603,7 @@ oc.install_bin_debian_bookworm: script: - ./docs/introduction/install-bin-deb.sh debian bookworm variables: - PREFIX: next + PREFIX: "" retry: max: 2 when: @@ -640,7 +644,7 @@ oc.install_bin_debian_bookworm-systemd: FLAVOUR: systemd-tests DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE - PREFIX: next + PREFIX: "" DISTRIBUTION: debian RELEASE: bookworm @@ -655,7 +659,8 @@ oc.install_bin_ubuntu_noble_current: timeout: 60 minutes script: - ./docs/introduction/install-bin-deb.sh ubuntu noble - variables: {} + variables: + PREFIX: old retry: max: 2 when: @@ -673,7 +678,8 @@ oc.install_bin_ubuntu_jammy_current: timeout: 60 minutes script: - ./docs/introduction/install-bin-deb.sh ubuntu jammy - variables: {} + variables: + PREFIX: old retry: max: 2 when: @@ -697,6 +703,7 @@ oc.lintian_ubuntu: - apt-get install lintian -y script: - ./scripts/ci/lintian_debian_packages.sh ubuntu jammy noble + variables: {} oc.upgrade_bin_ubuntu_jammy: image: public.ecr.aws/lts/ubuntu:22.04_stable diff --git a/.gitlab/ci/pipelines/debian_repository_partial.yml b/.gitlab/ci/pipelines/debian_repository_partial.yml index b4a724615611..25fb68b164b4 100644 --- a/.gitlab/ci/pipelines/debian_repository_partial.yml +++ b/.gitlab/ci/pipelines/debian_repository_partial.yml @@ -269,6 +269,7 @@ apt_repo_debian_current: variables: ARCHITECTURES: amd64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg + PREFIX: old id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -299,7 +300,7 @@ apt_repo_debian: variables: ARCHITECTURES: amd64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next + PREFIX: "" id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -320,7 +321,8 @@ oc.install_bin_debian_bookworm_current: timeout: 60 minutes script: - ./docs/introduction/install-bin-deb.sh debian bookworm - variables: {} + variables: + PREFIX: old retry: max: 2 when: @@ -344,6 +346,7 @@ oc.lintian_debian: - apt-get install lintian -y script: - ./scripts/ci/lintian_debian_packages.sh debian bookworm + variables: {} oc.install_bin_debian_bookworm: image: debian:bookworm @@ -357,7 +360,7 @@ oc.install_bin_debian_bookworm: script: - ./docs/introduction/install-bin-deb.sh debian bookworm variables: - PREFIX: next + PREFIX: "" retry: max: 2 when: @@ -398,6 +401,6 @@ oc.install_bin_debian_bookworm-systemd: FLAVOUR: systemd-tests DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE - PREFIX: next + PREFIX: "" DISTRIBUTION: debian RELEASE: bookworm diff --git a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml index abaaf5027028..b3428d5427ba 100644 --- a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml +++ b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml @@ -269,6 +269,7 @@ apt_repo_debian_current: variables: ARCHITECTURES: amd64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg + PREFIX: old id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -299,7 +300,7 @@ apt_repo_debian: variables: ARCHITECTURES: amd64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next + PREFIX: "" id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -320,7 +321,8 @@ oc.install_bin_debian_bookworm_current: timeout: 60 minutes script: - ./docs/introduction/install-bin-deb.sh debian bookworm - variables: {} + variables: + PREFIX: old retry: max: 2 when: @@ -344,6 +346,7 @@ oc.lintian_debian: - apt-get install lintian -y script: - ./scripts/ci/lintian_debian_packages.sh debian bookworm + variables: {} oc.install_bin_debian_bookworm: image: debian:bookworm @@ -357,7 +360,7 @@ oc.install_bin_debian_bookworm: script: - ./docs/introduction/install-bin-deb.sh debian bookworm variables: - PREFIX: next + PREFIX: "" retry: max: 2 when: @@ -398,6 +401,6 @@ oc.install_bin_debian_bookworm-systemd: FLAVOUR: systemd-tests DEP_IMAGE: ${GCP_REGISTRY}/$CI_PROJECT_NAMESPACE/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE DEP_IMAGE_PROTECTED: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/$FLAVOUR-$DISTRIBUTION-$RELEASE - PREFIX: next + PREFIX: "" DISTRIBUTION: debian RELEASE: bookworm diff --git a/.gitlab/ci/pipelines/non_release_tag.yml b/.gitlab/ci/pipelines/non_release_tag.yml index 820cded1236d..f0a86b15fe6f 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -484,6 +484,7 @@ apt_repo_debian_current: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg + PREFIX: old id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -514,7 +515,7 @@ apt_repo_debian: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next + PREFIX: "" id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -716,6 +717,7 @@ apt_repo_ubuntu_current: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg + PREFIX: old id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -746,7 +748,7 @@ apt_repo_ubuntu: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next + PREFIX: "" id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} diff --git a/.gitlab/ci/pipelines/non_release_tag_test.yml b/.gitlab/ci/pipelines/non_release_tag_test.yml index 36d5d6ba3861..cc5334bae4f6 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -484,6 +484,7 @@ apt_repo_debian_current: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg + PREFIX: old id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -514,7 +515,7 @@ apt_repo_debian: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next + PREFIX: "" id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -716,6 +717,7 @@ apt_repo_ubuntu_current: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg + PREFIX: old id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -746,7 +748,7 @@ apt_repo_ubuntu: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next + PREFIX: "" id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml index ccfd5a20432c..b6902872a0fc 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -485,6 +485,7 @@ apt_repo_debian_current: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg + PREFIX: old id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -515,7 +516,7 @@ apt_repo_debian: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next + PREFIX: "" id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -717,6 +718,7 @@ apt_repo_ubuntu_current: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg + PREFIX: old id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -747,7 +749,7 @@ apt_repo_ubuntu: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next + PREFIX: "" id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} diff --git a/.gitlab/ci/pipelines/octez_release_tag.yml b/.gitlab/ci/pipelines/octez_release_tag.yml index ef51c4b396b5..3322a4a1fd28 100644 --- a/.gitlab/ci/pipelines/octez_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_release_tag.yml @@ -486,6 +486,7 @@ apt_repo_debian_current: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg + PREFIX: old id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -516,7 +517,7 @@ apt_repo_debian: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next + PREFIX: "" id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -718,6 +719,7 @@ apt_repo_ubuntu_current: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg + PREFIX: old id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -748,7 +750,7 @@ apt_repo_ubuntu: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next + PREFIX: "" id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} diff --git a/.gitlab/ci/pipelines/octez_release_tag_test.yml b/.gitlab/ci/pipelines/octez_release_tag_test.yml index 5ca76d4f10c6..e21440a2d115 100644 --- a/.gitlab/ci/pipelines/octez_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_release_tag_test.yml @@ -486,6 +486,7 @@ apt_repo_debian_current: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg + PREFIX: old id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -516,7 +517,7 @@ apt_repo_debian: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next + PREFIX: "" id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -718,6 +719,7 @@ apt_repo_ubuntu_current: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg + PREFIX: old id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -748,7 +750,7 @@ apt_repo_ubuntu: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next + PREFIX: "" id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} diff --git a/.gitlab/ci/pipelines/schedule_master_test_release.yml b/.gitlab/ci/pipelines/schedule_master_test_release.yml index b63f1a84e276..6c9d02c07986 100644 --- a/.gitlab/ci/pipelines/schedule_master_test_release.yml +++ b/.gitlab/ci/pipelines/schedule_master_test_release.yml @@ -488,6 +488,7 @@ apt_repo_debian_current: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg + PREFIX: old id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -518,7 +519,7 @@ apt_repo_debian: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next + PREFIX: "" id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -720,6 +721,7 @@ apt_repo_ubuntu_current: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg + PREFIX: old id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} @@ -750,7 +752,7 @@ apt_repo_ubuntu: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next + PREFIX: "" id_tokens: GCP_ID_TOKEN: aud: https://iam.googleapis.com/projects/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROJECT_ID}/locations/global/workloadIdentityPools/${GCP_WORKLOAD_IDENTITY_FEDERATION_POOL_ID}/providers/${GCP_WORKLOAD_IDENTITY_FEDERATION_PROVIDER_ID} diff --git a/ci/bin/debian_repository.ml b/ci/bin/debian_repository.ml index 63de090fce2a..9f8b44e03efa 100644 --- a/ci/bin/debian_repository.ml +++ b/ci/bin/debian_repository.ml @@ -8,7 +8,7 @@ (* This module defines the jobs of the [debian_repository] child pipeline. - This pipeline builds the current and next Debian (and Ubuntu) + This pipeline builds the current and old Debian (and Ubuntu) packages. *) open Gitlab_ci.Types @@ -57,11 +57,9 @@ let archs_variables pipeline = (* Push .deb artifacts to storagecloud apt repository. *) let make_job_apt_repo ?rules ~__POS__ ~name ?(stage = Stages.publishing) - ?(prefix = false) ?dependencies ~variables ~image script : tezos_job = + ?dependencies ~prefix ~variables ~image script : tezos_job = let variables = - variables - @ [("GNUPGHOME", "$CI_PROJECT_DIR/.gnupg")] - @ if prefix then [("PREFIX", "next")] else [] + variables @ [("GNUPGHOME", "$CI_PROJECT_DIR/.gnupg")] @ [("PREFIX", prefix)] in job ?rules @@ -258,7 +256,7 @@ let jobs pipeline_type = "./scripts/ci/build-debian-packages.sh zcash"; ] in - (* These jobs build the next packages in a matrix using the + (* These jobs build the packages in a matrix using the build dependencies images *) let job_build_debian_package : tezos_job = make_job_build_debian_packages @@ -292,6 +290,7 @@ let jobs pipeline_type = Artifacts job_build_debian_package_current_a; Artifacts job_build_debian_package_current_b; ]) + ~prefix:"old" ~variables:(archs_variables pipeline_type) ~image:Images.debian_bookworm ["./scripts/ci/create_debian_repo.sh debian bookworm"] @@ -306,16 +305,17 @@ let jobs pipeline_type = Artifacts job_build_ubuntu_package_current_a; Artifacts job_build_ubuntu_package_current_b; ]) + ~prefix:"old" ~variables:(archs_variables pipeline_type) ~image:Images.ubuntu_noble ["./scripts/ci/create_debian_repo.sh ubuntu noble jammy"] in - (* These jobs create the apt repository for the next packages *) + (* These jobs create the apt repository for the packages *) let job_apt_repo_debian = make_job_apt_repo ~__POS__ ~name:"apt_repo_debian" - ~prefix:true + ~prefix:"" ~dependencies: (Dependent [ @@ -330,7 +330,7 @@ let jobs pipeline_type = make_job_apt_repo ~__POS__ ~name:"apt_repo_ubuntu" - ~prefix:true + ~prefix:"" ~dependencies: (Dependent [ @@ -369,7 +369,8 @@ let jobs pipeline_type = script in - let job_lintian ~__POS__ ~name ~dependencies ~image ?allow_failure script = + let job_lintian ~__POS__ ~name ~dependencies ?(variables = []) ~image + ?allow_failure script = job ?allow_failure ~__POS__ @@ -377,6 +378,7 @@ let jobs pipeline_type = ~image ~dependencies ~stage:Stages.publishing_tests + ~variables ~before_script: (before_script ~source_version:true @@ -387,7 +389,7 @@ let jobs pipeline_type = ]) script in - (* These test the upgrade of the current packages *) + (* These test the upgrade from the old packages *) let job_upgrade_bin ~__POS__ ~name ~dependencies ~image ?allow_failure script = job @@ -407,12 +409,14 @@ let jobs pipeline_type = ~__POS__ ~name:"oc.install_bin_ubuntu_noble_current" ~dependencies:(Dependent [Job job_apt_repo_ubuntu_current]) + ~variables:[("PREFIX", "old")] ~image:Images.ubuntu_noble ["./docs/introduction/install-bin-deb.sh ubuntu noble"]; job_install_bin ~__POS__ ~name:"oc.install_bin_ubuntu_jammy_current" ~dependencies:(Dependent [Job job_apt_repo_ubuntu_current]) + ~variables:[("PREFIX", "old")] ~image:Images.ubuntu_jammy ["./docs/introduction/install-bin-deb.sh ubuntu jammy"]; ] @@ -442,6 +446,7 @@ let jobs pipeline_type = ~__POS__ ~name:"oc.install_bin_debian_bookworm_current" ~dependencies:(Dependent [Job job_apt_repo_debian_current]) + ~variables:[("PREFIX", "old")] ~image:Images.debian_bookworm ["./docs/introduction/install-bin-deb.sh debian bookworm"]; ] @@ -458,7 +463,7 @@ let jobs pipeline_type = ~__POS__ ~name:"oc.install_bin_debian_bookworm" ~dependencies:(Dependent [Job job_apt_repo_debian]) - ~variables:[("PREFIX", "next")] + ~variables:[("PREFIX", "")] ~image:Images.debian_bookworm ["./docs/introduction/install-bin-deb.sh debian bookworm"]; job_upgrade_bin @@ -481,7 +486,7 @@ let jobs pipeline_type = (variables ~kind:"systemd-tests" [ - ("PREFIX", "next"); + ("PREFIX", ""); ("DISTRIBUTION", "debian"); ("RELEASE", "bookworm"); ]) diff --git a/docs/introduction/install-bin-deb.sh b/docs/introduction/install-bin-deb.sh index c18072dc8969..04a0f532fdb8 100755 --- a/docs/introduction/install-bin-deb.sh +++ b/docs/introduction/install-bin-deb.sh @@ -138,7 +138,7 @@ else fi # [ preeseed octez ] -if [ -n "$PREFIX" ]; then +if [ -z "$PREFIX" ]; then # preseed octez-node for debconf. Notice we set purge_warning to yes, # to make the `autopurge` pass and remove all the node data at the end of this # script. @@ -178,7 +178,7 @@ apt-get install -y octez-baker apt-get install -y octez-dal-node # [install octez additional packages] -if [ -n "$PREFIX" ]; then +if [ -z "$PREFIX" ]; then # [install octez NEXT packages] apt-get install -y octez-smart-rollup-node else @@ -203,7 +203,7 @@ apt-get autopurge -y octez-node octez-client octez-baker octez-dal-node # [check autopurge] set +x -if [ -n "$PREFIX" ]; then +if [ -z "$PREFIX" ]; then # check the package configuration sudo debconf-get-selections | if grep -q octez; then echo "Leftovers in debconf db" diff --git a/docs/introduction/upgrade-bin-deb.sh b/docs/introduction/upgrade-bin-deb.sh index 75b0c755a035..1b97834836df 100755 --- a/docs/introduction/upgrade-bin-deb.sh +++ b/docs/introduction/upgrade-bin-deb.sh @@ -67,9 +67,9 @@ apt-get install -y sudo gpg curl apt-utils debconf-utils echo "debconf debconf/frontend select Noninteractive" | sudo debconf-set-selections # [add current repository] -sudo curl "https://$bucket.storage.googleapis.com/$distribution/octez.asc" | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/octez.gpg +sudo curl "https://$bucket.storage.googleapis.com/old/$distribution/octez.asc" | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/octez.gpg -REPO="deb https://$bucket.storage.googleapis.com/$distribution $release main" +REPO="deb https://$bucket.storage.googleapis.com/old/$distribution $release main" echo "$REPO" | sudo tee /etc/apt/sources.list.d/octez-current.list sudo apt-get update @@ -92,7 +92,7 @@ echo "baking_key=$BAKER_KEY" >> /etc/octez/baker.conf echo "lq_vote=yes" >> /etc/octez/baker.conf # [add next repository] -REPO="deb https://$bucket.storage.googleapis.com/next/$distribution $release main" +REPO="deb https://$bucket.storage.googleapis.com/$distribution $release main" echo "$REPO" | sudo tee /etc/apt/sources.list.d/octez-next.list sudo apt-get update diff --git a/scripts/ci/create_debian_repo.sh b/scripts/ci/create_debian_repo.sh index 9a70362a33c7..9b486915c270 100755 --- a/scripts/ci/create_debian_repo.sh +++ b/scripts/ci/create_debian_repo.sh @@ -104,7 +104,7 @@ for release in $RELEASES; do # unstable, jammy, noble ... # we also add the data packages that we built for # bookworm, that are distribution independent. Only for next packages - if [ -n "$PREFIX" ]; then + if [ -z "$PREFIX" ]; then for file in packages/debian/bookworm/*_all.deb; do cp "$file" "$TARGETDIR/${target}/" echo "Adding data package $file to $TARGETDIR/${target}/" diff --git a/scripts/packaging/tests/systemd-docker-test.sh b/scripts/packaging/tests/systemd-docker-test.sh index 2942f01566c3..f964a77c36fb 100755 --- a/scripts/packaging/tests/systemd-docker-test.sh +++ b/scripts/packaging/tests/systemd-docker-test.sh @@ -14,7 +14,7 @@ CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME:-$(git symbolic-ref --short HEAD)} CI_COMMIT_TAG=${CI_COMMIT_TAG:-} CI_COMMIT_REF_PROTECTED=${CI_COMMIT_REF_PROTECTED:-"false"} -PREFIX=${PREFIX:-next} +PREFIX=${PREFIX:-""} CI_PROJECT_NAMESPACE=${CI_PROJECT_NAMESPACE:-tezos} GCP_LINUX_PACKAGES_BUCKET=${GCP_LINUX_PACKAGES_BUCKET:-tezos-linux-repo} -- GitLab From a04b7dce365f965654c6b6a91dc5f173d84600b9 Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Tue, 11 Feb 2025 16:00:40 +0100 Subject: [PATCH 4/7] packages: remove installation tests for old packages --- .../ci/pipelines/debian_repository_full.yml | 57 ------------------- .../pipelines/debian_repository_partial.yml | 19 ------- .../debian_repository_partial_auto.yml | 19 ------- ci/bin/debian_repository.ml | 37 +----------- 4 files changed, 2 insertions(+), 130 deletions(-) diff --git a/.gitlab/ci/pipelines/debian_repository_full.yml b/.gitlab/ci/pipelines/debian_repository_full.yml index 8ed1175f64b5..74c45dbea2d9 100644 --- a/.gitlab/ci/pipelines/debian_repository_full.yml +++ b/.gitlab/ci/pipelines/debian_repository_full.yml @@ -553,25 +553,6 @@ apt_repo_ubuntu: - stuck_or_timeout_failure - runner_system_failure -oc.install_bin_debian_bookworm_current: - image: debian:bookworm - stage: publishing_tests - tags: - - gcp - needs: - - apt_repo_debian_current - dependencies: [] - timeout: 60 minutes - script: - - ./docs/introduction/install-bin-deb.sh debian bookworm - variables: - PREFIX: old - retry: - max: 2 - when: - - stuck_or_timeout_failure - - runner_system_failure - oc.lintian_debian: image: debian:bookworm stage: publishing_tests @@ -648,44 +629,6 @@ oc.install_bin_debian_bookworm-systemd: DISTRIBUTION: debian RELEASE: bookworm -oc.install_bin_ubuntu_noble_current: - image: public.ecr.aws/lts/ubuntu:24.04_stable - stage: publishing_tests - tags: - - gcp - needs: - - apt_repo_ubuntu_current - dependencies: [] - timeout: 60 minutes - script: - - ./docs/introduction/install-bin-deb.sh ubuntu noble - variables: - PREFIX: old - retry: - max: 2 - when: - - stuck_or_timeout_failure - - runner_system_failure - -oc.install_bin_ubuntu_jammy_current: - image: public.ecr.aws/lts/ubuntu:22.04_stable - stage: publishing_tests - tags: - - gcp - needs: - - apt_repo_ubuntu_current - dependencies: [] - timeout: 60 minutes - script: - - ./docs/introduction/install-bin-deb.sh ubuntu jammy - variables: - PREFIX: old - retry: - max: 2 - when: - - stuck_or_timeout_failure - - runner_system_failure - oc.lintian_ubuntu: image: public.ecr.aws/lts/ubuntu:24.04_stable stage: publishing_tests diff --git a/.gitlab/ci/pipelines/debian_repository_partial.yml b/.gitlab/ci/pipelines/debian_repository_partial.yml index 25fb68b164b4..045c254317f4 100644 --- a/.gitlab/ci/pipelines/debian_repository_partial.yml +++ b/.gitlab/ci/pipelines/debian_repository_partial.yml @@ -310,25 +310,6 @@ apt_repo_debian: - stuck_or_timeout_failure - runner_system_failure -oc.install_bin_debian_bookworm_current: - image: debian:bookworm - stage: publishing_tests - tags: - - gcp - needs: - - apt_repo_debian_current - dependencies: [] - timeout: 60 minutes - script: - - ./docs/introduction/install-bin-deb.sh debian bookworm - variables: - PREFIX: old - retry: - max: 2 - when: - - stuck_or_timeout_failure - - runner_system_failure - oc.lintian_debian: image: debian:bookworm stage: publishing_tests diff --git a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml index b3428d5427ba..e8d26d9ca054 100644 --- a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml +++ b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml @@ -310,25 +310,6 @@ apt_repo_debian: - stuck_or_timeout_failure - runner_system_failure -oc.install_bin_debian_bookworm_current: - image: debian:bookworm - stage: publishing_tests - tags: - - gcp - needs: - - apt_repo_debian_current - dependencies: [] - timeout: 60 minutes - script: - - ./docs/introduction/install-bin-deb.sh debian bookworm - variables: - PREFIX: old - retry: - max: 2 - when: - - stuck_or_timeout_failure - - runner_system_failure - oc.lintian_debian: image: debian:bookworm stage: publishing_tests diff --git a/ci/bin/debian_repository.ml b/ci/bin/debian_repository.ml index 9f8b44e03efa..75536be78790 100644 --- a/ci/bin/debian_repository.ml +++ b/ci/bin/debian_repository.ml @@ -401,26 +401,6 @@ let jobs pipeline_type = ~stage:Stages.publishing_tests script in - let test_current_ubuntu_packages_jobs = - (* in merge pipelines we tests only debian. release pipelines - test the entire matrix *) - [ - job_install_bin - ~__POS__ - ~name:"oc.install_bin_ubuntu_noble_current" - ~dependencies:(Dependent [Job job_apt_repo_ubuntu_current]) - ~variables:[("PREFIX", "old")] - ~image:Images.ubuntu_noble - ["./docs/introduction/install-bin-deb.sh ubuntu noble"]; - job_install_bin - ~__POS__ - ~name:"oc.install_bin_ubuntu_jammy_current" - ~dependencies:(Dependent [Job job_apt_repo_ubuntu_current]) - ~variables:[("PREFIX", "old")] - ~image:Images.ubuntu_jammy - ["./docs/introduction/install-bin-deb.sh ubuntu jammy"]; - ] - in let test_ubuntu_packages_jobs = (* in merge pipelines we tests only debian. release pipelines test the entire matrix *) @@ -440,17 +420,6 @@ let jobs pipeline_type = ["./docs/introduction/upgrade-bin-deb.sh ubuntu jammy"]; ] in - let test_current_debian_packages_jobs = - [ - job_install_bin - ~__POS__ - ~name:"oc.install_bin_debian_bookworm_current" - ~dependencies:(Dependent [Job job_apt_repo_debian_current]) - ~variables:[("PREFIX", "old")] - ~image:Images.debian_bookworm - ["./docs/introduction/install-bin-deb.sh debian bookworm"]; - ] - in let test_debian_packages_jobs = [ job_lintian @@ -521,16 +490,14 @@ let jobs pipeline_type = match pipeline_type with | Partial -> ( (job_docker_systemd_test_debian_dependencies :: debian_jobs) - @ test_current_debian_packages_jobs @ test_debian_packages_jobs, + @ test_debian_packages_jobs, job_build_ubuntu_package_current_a, job_build_debian_package_current_a, job_build_ubuntu_package_current_b, job_build_debian_package_current_b ) | Full -> ( (job_docker_systemd_test_debian_dependencies :: debian_jobs) - @ ubuntu_jobs @ test_current_debian_packages_jobs - @ test_debian_packages_jobs @ test_current_ubuntu_packages_jobs - @ test_ubuntu_packages_jobs, + @ ubuntu_jobs @ test_debian_packages_jobs @ test_ubuntu_packages_jobs, job_build_ubuntu_package_current_a, job_build_debian_package_current_a, job_build_ubuntu_package_current_b, -- GitLab From 8c70673311949cd1d3bb0a877b06697c73f21b73 Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Tue, 11 Feb 2025 16:05:11 +0100 Subject: [PATCH 5/7] packages: add missing install tests for ubuntu --- .../ci/pipelines/debian_repository_full.yml | 38 +++++++++++++++++++ ci/bin/debian_repository.ml | 18 ++++++++- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/pipelines/debian_repository_full.yml b/.gitlab/ci/pipelines/debian_repository_full.yml index 74c45dbea2d9..49aa85c1aefc 100644 --- a/.gitlab/ci/pipelines/debian_repository_full.yml +++ b/.gitlab/ci/pipelines/debian_repository_full.yml @@ -648,6 +648,44 @@ oc.lintian_ubuntu: - ./scripts/ci/lintian_debian_packages.sh ubuntu jammy noble variables: {} +oc.install_bin_ubunty_jammy: + image: debian:bookworm + stage: publishing_tests + tags: + - gcp + needs: + - apt_repo_ubuntu + dependencies: [] + timeout: 60 minutes + script: + - ./docs/introduction/install-bin-deb.sh ubuntu jammy + variables: + PREFIX: "" + retry: + max: 2 + when: + - stuck_or_timeout_failure + - runner_system_failure + +oc.install_bin_ubunty_noble: + image: debian:bookworm + stage: publishing_tests + tags: + - gcp + needs: + - apt_repo_ubuntu + dependencies: [] + timeout: 60 minutes + script: + - ./docs/introduction/install-bin-deb.sh ubuntu noble + variables: + PREFIX: "" + retry: + max: 2 + when: + - stuck_or_timeout_failure + - runner_system_failure + oc.upgrade_bin_ubuntu_jammy: image: public.ecr.aws/lts/ubuntu:22.04_stable stage: publishing_tests diff --git a/ci/bin/debian_repository.ml b/ci/bin/debian_repository.ml index 75536be78790..212175606dcc 100644 --- a/ci/bin/debian_repository.ml +++ b/ci/bin/debian_repository.ml @@ -402,8 +402,8 @@ let jobs pipeline_type = script in let test_ubuntu_packages_jobs = - (* in merge pipelines we tests only debian. release pipelines - test the entire matrix *) + (* in merge pipelines we tests only debian. ubuntu packages + are built and tested in the sheduled pipelines*) [ job_lintian ~__POS__ @@ -411,6 +411,20 @@ let jobs pipeline_type = ~dependencies:(Dependent [Artifacts job_build_ubuntu_package]) ~image:Images.ubuntu_noble ["./scripts/ci/lintian_debian_packages.sh ubuntu jammy noble"]; + job_install_bin + ~__POS__ + ~name:"oc.install_bin_ubunty_jammy" + ~dependencies:(Dependent [Job job_apt_repo_ubuntu]) + ~variables:[("PREFIX", "")] + ~image:Images.debian_bookworm + ["./docs/introduction/install-bin-deb.sh ubuntu jammy"]; + job_install_bin + ~__POS__ + ~name:"oc.install_bin_ubunty_noble" + ~dependencies:(Dependent [Job job_apt_repo_ubuntu]) + ~variables:[("PREFIX", "")] + ~image:Images.debian_bookworm + ["./docs/introduction/install-bin-deb.sh ubuntu noble"]; job_upgrade_bin ~__POS__ ~name:"oc.upgrade_bin_ubuntu_jammy" -- GitLab From c3aa39397b362c3982ea3d0a951e7313c96b9e1c Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Tue, 11 Feb 2025 16:06:51 +0100 Subject: [PATCH 6/7] packages: rename current to old --- .../ci/pipelines/debian_repository_full.yml | 40 ++++----- .../pipelines/debian_repository_partial.yml | 20 ++--- .../debian_repository_partial_auto.yml | 20 ++--- .gitlab/ci/pipelines/non_release_tag.yml | 36 ++++---- .gitlab/ci/pipelines/non_release_tag_test.yml | 36 ++++---- .../ci/pipelines/octez_beta_release_tag.yml | 36 ++++---- .gitlab/ci/pipelines/octez_release_tag.yml | 36 ++++---- .../ci/pipelines/octez_release_tag_test.yml | 36 ++++---- .../schedule_master_test_release.yml | 36 ++++---- ci/bin/debian_repository.ml | 88 +++++++++---------- ...urrent.sh => build-debian-packages_old.sh} | 0 11 files changed, 192 insertions(+), 192 deletions(-) rename scripts/ci/{build-debian-packages_current.sh => build-debian-packages_old.sh} (100%) diff --git a/.gitlab/ci/pipelines/debian_repository_full.yml b/.gitlab/ci/pipelines/debian_repository_full.yml index 49aa85c1aefc..450ced3e09cc 100644 --- a/.gitlab/ci/pipelines/debian_repository_full.yml +++ b/.gitlab/ci/pipelines/debian_repository_full.yml @@ -143,7 +143,7 @@ oc.build-debian: - gcp - gcp_arm64 -oc.build-debian-current_a: +oc.build-debian-old_a: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -161,7 +161,7 @@ oc.build-debian-current_a: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh A + - ./scripts/ci/build-debian-packages_old.sh A after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -189,7 +189,7 @@ oc.build-debian-current_a: - gcp - gcp_arm64 -oc.build-debian-current_b: +oc.build-debian-old_b: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -207,7 +207,7 @@ oc.build-debian-current_b: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh B + - ./scripts/ci/build-debian-packages_old.sh B after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -258,17 +258,17 @@ oc.build-data_packages: paths: - packages/$DISTRIBUTION/$RELEASE -apt_repo_debian_current: +apt_repo_debian_old: image: debian:bookworm stage: publishing tags: - gcp needs: - - oc.build-debian-current_a - - oc.build-debian-current_b + - oc.build-debian-old_a + - oc.build-debian-old_b dependencies: - - oc.build-debian-current_a - - oc.build-debian-current_b + - oc.build-debian-old_a + - oc.build-debian-old_b timeout: 60 minutes before_script: - . ./scripts/version.sh @@ -399,7 +399,7 @@ oc.build-ubuntu: - gcp - gcp_arm64 -oc.build-ubuntu-current_a: +oc.build-ubuntu-old_a: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -417,7 +417,7 @@ oc.build-ubuntu-current_a: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh A + - ./scripts/ci/build-debian-packages_old.sh A after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -445,7 +445,7 @@ oc.build-ubuntu-current_a: - gcp - gcp_arm64 -oc.build-ubuntu-current_b: +oc.build-ubuntu-old_b: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -463,7 +463,7 @@ oc.build-ubuntu-current_b: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh B + - ./scripts/ci/build-debian-packages_old.sh B after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -491,17 +491,17 @@ oc.build-ubuntu-current_b: - gcp - gcp_arm64 -apt_repo_ubuntu_current: +apt_repo_ubuntu_old: image: public.ecr.aws/lts/ubuntu:24.04_stable stage: publishing tags: - gcp needs: - - oc.build-ubuntu-current_a - - oc.build-ubuntu-current_b + - oc.build-ubuntu-old_a + - oc.build-ubuntu-old_b dependencies: - - oc.build-ubuntu-current_a - - oc.build-ubuntu-current_b + - oc.build-ubuntu-old_a + - oc.build-ubuntu-old_b timeout: 60 minutes before_script: - . ./scripts/version.sh @@ -597,7 +597,7 @@ oc.upgrade_bin_debian_bookworm: tags: - gcp needs: - - apt_repo_debian_current + - apt_repo_debian_old - apt_repo_debian dependencies: [] timeout: 60 minutes @@ -692,7 +692,7 @@ oc.upgrade_bin_ubuntu_jammy: tags: - gcp needs: - - apt_repo_ubuntu_current + - apt_repo_ubuntu_old - apt_repo_ubuntu dependencies: [] timeout: 60 minutes diff --git a/.gitlab/ci/pipelines/debian_repository_partial.yml b/.gitlab/ci/pipelines/debian_repository_partial.yml index 045c254317f4..26d2d77b078e 100644 --- a/.gitlab/ci/pipelines/debian_repository_partial.yml +++ b/.gitlab/ci/pipelines/debian_repository_partial.yml @@ -137,7 +137,7 @@ oc.build-debian: TAGS: - gcp -oc.build-debian-current_a: +oc.build-debian-old_a: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -155,7 +155,7 @@ oc.build-debian-current_a: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh A + - ./scripts/ci/build-debian-packages_old.sh A after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -181,7 +181,7 @@ oc.build-debian-current_a: TAGS: - gcp -oc.build-debian-current_b: +oc.build-debian-old_b: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -199,7 +199,7 @@ oc.build-debian-current_b: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh B + - ./scripts/ci/build-debian-packages_old.sh B after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -248,17 +248,17 @@ oc.build-data_packages: paths: - packages/$DISTRIBUTION/$RELEASE -apt_repo_debian_current: +apt_repo_debian_old: image: debian:bookworm stage: publishing tags: - gcp needs: - - oc.build-debian-current_a - - oc.build-debian-current_b + - oc.build-debian-old_a + - oc.build-debian-old_b dependencies: - - oc.build-debian-current_a - - oc.build-debian-current_b + - oc.build-debian-old_a + - oc.build-debian-old_b timeout: 60 minutes before_script: - . ./scripts/version.sh @@ -354,7 +354,7 @@ oc.upgrade_bin_debian_bookworm: tags: - gcp needs: - - apt_repo_debian_current + - apt_repo_debian_old - apt_repo_debian dependencies: [] timeout: 60 minutes diff --git a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml index e8d26d9ca054..0a4ded6597ea 100644 --- a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml +++ b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml @@ -137,7 +137,7 @@ oc.build-debian: TAGS: - gcp -oc.build-debian-current_a: +oc.build-debian-old_a: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -155,7 +155,7 @@ oc.build-debian-current_a: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh A + - ./scripts/ci/build-debian-packages_old.sh A after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -181,7 +181,7 @@ oc.build-debian-current_a: TAGS: - gcp -oc.build-debian-current_b: +oc.build-debian-old_b: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -199,7 +199,7 @@ oc.build-debian-current_b: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh B + - ./scripts/ci/build-debian-packages_old.sh B after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -248,17 +248,17 @@ oc.build-data_packages: paths: - packages/$DISTRIBUTION/$RELEASE -apt_repo_debian_current: +apt_repo_debian_old: image: debian:bookworm stage: publishing tags: - gcp needs: - - oc.build-debian-current_a - - oc.build-debian-current_b + - oc.build-debian-old_a + - oc.build-debian-old_b dependencies: - - oc.build-debian-current_a - - oc.build-debian-current_b + - oc.build-debian-old_a + - oc.build-debian-old_b timeout: 60 minutes before_script: - . ./scripts/version.sh @@ -354,7 +354,7 @@ oc.upgrade_bin_debian_bookworm: tags: - gcp needs: - - apt_repo_debian_current + - apt_repo_debian_old - apt_repo_debian dependencies: [] timeout: 60 minutes diff --git a/.gitlab/ci/pipelines/non_release_tag.yml b/.gitlab/ci/pipelines/non_release_tag.yml index f0a86b15fe6f..5d4af672d995 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -348,7 +348,7 @@ oc.build-debian: - gcp - gcp_arm64 -oc.build-debian-current_a: +oc.build-debian-old_a: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -366,7 +366,7 @@ oc.build-debian-current_a: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh A + - ./scripts/ci/build-debian-packages_old.sh A after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -394,7 +394,7 @@ oc.build-debian-current_a: - gcp - gcp_arm64 -oc.build-debian-current_b: +oc.build-debian-old_b: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -412,7 +412,7 @@ oc.build-debian-current_b: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh B + - ./scripts/ci/build-debian-packages_old.sh B after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -463,17 +463,17 @@ oc.build-data_packages: paths: - packages/$DISTRIBUTION/$RELEASE -apt_repo_debian_current: +apt_repo_debian_old: image: debian:bookworm stage: publishing tags: - gcp needs: - - oc.build-debian-current_a - - oc.build-debian-current_b + - oc.build-debian-old_a + - oc.build-debian-old_b dependencies: - - oc.build-debian-current_a - - oc.build-debian-current_b + - oc.build-debian-old_a + - oc.build-debian-old_b timeout: 60 minutes before_script: - . ./scripts/version.sh @@ -604,7 +604,7 @@ oc.build-ubuntu: - gcp - gcp_arm64 -oc.build-ubuntu-current_a: +oc.build-ubuntu-old_a: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -622,7 +622,7 @@ oc.build-ubuntu-current_a: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh A + - ./scripts/ci/build-debian-packages_old.sh A after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -650,7 +650,7 @@ oc.build-ubuntu-current_a: - gcp - gcp_arm64 -oc.build-ubuntu-current_b: +oc.build-ubuntu-old_b: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -668,7 +668,7 @@ oc.build-ubuntu-current_b: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh B + - ./scripts/ci/build-debian-packages_old.sh B after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -696,17 +696,17 @@ oc.build-ubuntu-current_b: - gcp - gcp_arm64 -apt_repo_ubuntu_current: +apt_repo_ubuntu_old: image: public.ecr.aws/lts/ubuntu:24.04_stable stage: publishing tags: - gcp needs: - - oc.build-ubuntu-current_a - - oc.build-ubuntu-current_b + - oc.build-ubuntu-old_a + - oc.build-ubuntu-old_b dependencies: - - oc.build-ubuntu-current_a - - oc.build-ubuntu-current_b + - oc.build-ubuntu-old_a + - oc.build-ubuntu-old_b timeout: 60 minutes before_script: - . ./scripts/version.sh diff --git a/.gitlab/ci/pipelines/non_release_tag_test.yml b/.gitlab/ci/pipelines/non_release_tag_test.yml index cc5334bae4f6..8493e3ccfda5 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -348,7 +348,7 @@ oc.build-debian: - gcp - gcp_arm64 -oc.build-debian-current_a: +oc.build-debian-old_a: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -366,7 +366,7 @@ oc.build-debian-current_a: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh A + - ./scripts/ci/build-debian-packages_old.sh A after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -394,7 +394,7 @@ oc.build-debian-current_a: - gcp - gcp_arm64 -oc.build-debian-current_b: +oc.build-debian-old_b: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -412,7 +412,7 @@ oc.build-debian-current_b: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh B + - ./scripts/ci/build-debian-packages_old.sh B after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -463,17 +463,17 @@ oc.build-data_packages: paths: - packages/$DISTRIBUTION/$RELEASE -apt_repo_debian_current: +apt_repo_debian_old: image: debian:bookworm stage: publishing tags: - gcp needs: - - oc.build-debian-current_a - - oc.build-debian-current_b + - oc.build-debian-old_a + - oc.build-debian-old_b dependencies: - - oc.build-debian-current_a - - oc.build-debian-current_b + - oc.build-debian-old_a + - oc.build-debian-old_b timeout: 60 minutes before_script: - . ./scripts/version.sh @@ -604,7 +604,7 @@ oc.build-ubuntu: - gcp - gcp_arm64 -oc.build-ubuntu-current_a: +oc.build-ubuntu-old_a: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -622,7 +622,7 @@ oc.build-ubuntu-current_a: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh A + - ./scripts/ci/build-debian-packages_old.sh A after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -650,7 +650,7 @@ oc.build-ubuntu-current_a: - gcp - gcp_arm64 -oc.build-ubuntu-current_b: +oc.build-ubuntu-old_b: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -668,7 +668,7 @@ oc.build-ubuntu-current_b: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh B + - ./scripts/ci/build-debian-packages_old.sh B after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -696,17 +696,17 @@ oc.build-ubuntu-current_b: - gcp - gcp_arm64 -apt_repo_ubuntu_current: +apt_repo_ubuntu_old: image: public.ecr.aws/lts/ubuntu:24.04_stable stage: publishing tags: - gcp needs: - - oc.build-ubuntu-current_a - - oc.build-ubuntu-current_b + - oc.build-ubuntu-old_a + - oc.build-ubuntu-old_b dependencies: - - oc.build-ubuntu-current_a - - oc.build-ubuntu-current_b + - oc.build-ubuntu-old_a + - oc.build-ubuntu-old_b timeout: 60 minutes before_script: - . ./scripts/version.sh diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml index b6902872a0fc..4256925c90ce 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -349,7 +349,7 @@ oc.build-debian: - gcp - gcp_arm64 -oc.build-debian-current_a: +oc.build-debian-old_a: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -367,7 +367,7 @@ oc.build-debian-current_a: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh A + - ./scripts/ci/build-debian-packages_old.sh A after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -395,7 +395,7 @@ oc.build-debian-current_a: - gcp - gcp_arm64 -oc.build-debian-current_b: +oc.build-debian-old_b: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -413,7 +413,7 @@ oc.build-debian-current_b: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh B + - ./scripts/ci/build-debian-packages_old.sh B after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -464,17 +464,17 @@ oc.build-data_packages: paths: - packages/$DISTRIBUTION/$RELEASE -apt_repo_debian_current: +apt_repo_debian_old: image: debian:bookworm stage: publishing tags: - gcp needs: - - oc.build-debian-current_a - - oc.build-debian-current_b + - oc.build-debian-old_a + - oc.build-debian-old_b dependencies: - - oc.build-debian-current_a - - oc.build-debian-current_b + - oc.build-debian-old_a + - oc.build-debian-old_b timeout: 60 minutes before_script: - . ./scripts/version.sh @@ -605,7 +605,7 @@ oc.build-ubuntu: - gcp - gcp_arm64 -oc.build-ubuntu-current_a: +oc.build-ubuntu-old_a: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -623,7 +623,7 @@ oc.build-ubuntu-current_a: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh A + - ./scripts/ci/build-debian-packages_old.sh A after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -651,7 +651,7 @@ oc.build-ubuntu-current_a: - gcp - gcp_arm64 -oc.build-ubuntu-current_b: +oc.build-ubuntu-old_b: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -669,7 +669,7 @@ oc.build-ubuntu-current_b: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh B + - ./scripts/ci/build-debian-packages_old.sh B after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -697,17 +697,17 @@ oc.build-ubuntu-current_b: - gcp - gcp_arm64 -apt_repo_ubuntu_current: +apt_repo_ubuntu_old: image: public.ecr.aws/lts/ubuntu:24.04_stable stage: publishing tags: - gcp needs: - - oc.build-ubuntu-current_a - - oc.build-ubuntu-current_b + - oc.build-ubuntu-old_a + - oc.build-ubuntu-old_b dependencies: - - oc.build-ubuntu-current_a - - oc.build-ubuntu-current_b + - oc.build-ubuntu-old_a + - oc.build-ubuntu-old_b timeout: 60 minutes before_script: - . ./scripts/version.sh diff --git a/.gitlab/ci/pipelines/octez_release_tag.yml b/.gitlab/ci/pipelines/octez_release_tag.yml index 3322a4a1fd28..6dc62ab03f3e 100644 --- a/.gitlab/ci/pipelines/octez_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_release_tag.yml @@ -350,7 +350,7 @@ oc.build-debian: - gcp - gcp_arm64 -oc.build-debian-current_a: +oc.build-debian-old_a: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -368,7 +368,7 @@ oc.build-debian-current_a: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh A + - ./scripts/ci/build-debian-packages_old.sh A after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -396,7 +396,7 @@ oc.build-debian-current_a: - gcp - gcp_arm64 -oc.build-debian-current_b: +oc.build-debian-old_b: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -414,7 +414,7 @@ oc.build-debian-current_b: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh B + - ./scripts/ci/build-debian-packages_old.sh B after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -465,17 +465,17 @@ oc.build-data_packages: paths: - packages/$DISTRIBUTION/$RELEASE -apt_repo_debian_current: +apt_repo_debian_old: image: debian:bookworm stage: publishing tags: - gcp needs: - - oc.build-debian-current_a - - oc.build-debian-current_b + - oc.build-debian-old_a + - oc.build-debian-old_b dependencies: - - oc.build-debian-current_a - - oc.build-debian-current_b + - oc.build-debian-old_a + - oc.build-debian-old_b timeout: 60 minutes before_script: - . ./scripts/version.sh @@ -606,7 +606,7 @@ oc.build-ubuntu: - gcp - gcp_arm64 -oc.build-ubuntu-current_a: +oc.build-ubuntu-old_a: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -624,7 +624,7 @@ oc.build-ubuntu-current_a: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh A + - ./scripts/ci/build-debian-packages_old.sh A after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -652,7 +652,7 @@ oc.build-ubuntu-current_a: - gcp - gcp_arm64 -oc.build-ubuntu-current_b: +oc.build-ubuntu-old_b: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -670,7 +670,7 @@ oc.build-ubuntu-current_b: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh B + - ./scripts/ci/build-debian-packages_old.sh B after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -698,17 +698,17 @@ oc.build-ubuntu-current_b: - gcp - gcp_arm64 -apt_repo_ubuntu_current: +apt_repo_ubuntu_old: image: public.ecr.aws/lts/ubuntu:24.04_stable stage: publishing tags: - gcp needs: - - oc.build-ubuntu-current_a - - oc.build-ubuntu-current_b + - oc.build-ubuntu-old_a + - oc.build-ubuntu-old_b dependencies: - - oc.build-ubuntu-current_a - - oc.build-ubuntu-current_b + - oc.build-ubuntu-old_a + - oc.build-ubuntu-old_b timeout: 60 minutes before_script: - . ./scripts/version.sh diff --git a/.gitlab/ci/pipelines/octez_release_tag_test.yml b/.gitlab/ci/pipelines/octez_release_tag_test.yml index e21440a2d115..622d826311a3 100644 --- a/.gitlab/ci/pipelines/octez_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_release_tag_test.yml @@ -350,7 +350,7 @@ oc.build-debian: - gcp - gcp_arm64 -oc.build-debian-current_a: +oc.build-debian-old_a: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -368,7 +368,7 @@ oc.build-debian-current_a: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh A + - ./scripts/ci/build-debian-packages_old.sh A after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -396,7 +396,7 @@ oc.build-debian-current_a: - gcp - gcp_arm64 -oc.build-debian-current_b: +oc.build-debian-old_b: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -414,7 +414,7 @@ oc.build-debian-current_b: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh B + - ./scripts/ci/build-debian-packages_old.sh B after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -465,17 +465,17 @@ oc.build-data_packages: paths: - packages/$DISTRIBUTION/$RELEASE -apt_repo_debian_current: +apt_repo_debian_old: image: debian:bookworm stage: publishing tags: - gcp needs: - - oc.build-debian-current_a - - oc.build-debian-current_b + - oc.build-debian-old_a + - oc.build-debian-old_b dependencies: - - oc.build-debian-current_a - - oc.build-debian-current_b + - oc.build-debian-old_a + - oc.build-debian-old_b timeout: 60 minutes before_script: - . ./scripts/version.sh @@ -606,7 +606,7 @@ oc.build-ubuntu: - gcp - gcp_arm64 -oc.build-ubuntu-current_a: +oc.build-ubuntu-old_a: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -624,7 +624,7 @@ oc.build-ubuntu-current_a: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh A + - ./scripts/ci/build-debian-packages_old.sh A after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -652,7 +652,7 @@ oc.build-ubuntu-current_a: - gcp - gcp_arm64 -oc.build-ubuntu-current_b: +oc.build-ubuntu-old_b: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -670,7 +670,7 @@ oc.build-ubuntu-current_b: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh B + - ./scripts/ci/build-debian-packages_old.sh B after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -698,17 +698,17 @@ oc.build-ubuntu-current_b: - gcp - gcp_arm64 -apt_repo_ubuntu_current: +apt_repo_ubuntu_old: image: public.ecr.aws/lts/ubuntu:24.04_stable stage: publishing tags: - gcp needs: - - oc.build-ubuntu-current_a - - oc.build-ubuntu-current_b + - oc.build-ubuntu-old_a + - oc.build-ubuntu-old_b dependencies: - - oc.build-ubuntu-current_a - - oc.build-ubuntu-current_b + - oc.build-ubuntu-old_a + - oc.build-ubuntu-old_b timeout: 60 minutes before_script: - . ./scripts/version.sh diff --git a/.gitlab/ci/pipelines/schedule_master_test_release.yml b/.gitlab/ci/pipelines/schedule_master_test_release.yml index 6c9d02c07986..8550c16e62eb 100644 --- a/.gitlab/ci/pipelines/schedule_master_test_release.yml +++ b/.gitlab/ci/pipelines/schedule_master_test_release.yml @@ -352,7 +352,7 @@ oc.build-debian: - gcp - gcp_arm64 -oc.build-debian-current_a: +oc.build-debian-old_a: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -370,7 +370,7 @@ oc.build-debian-current_a: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh A + - ./scripts/ci/build-debian-packages_old.sh A after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -398,7 +398,7 @@ oc.build-debian-current_a: - gcp - gcp_arm64 -oc.build-debian-current_b: +oc.build-debian-old_b: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -416,7 +416,7 @@ oc.build-debian-current_b: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh B + - ./scripts/ci/build-debian-packages_old.sh B after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -467,17 +467,17 @@ oc.build-data_packages: paths: - packages/$DISTRIBUTION/$RELEASE -apt_repo_debian_current: +apt_repo_debian_old: image: debian:bookworm stage: publishing tags: - gcp needs: - - oc.build-debian-current_a - - oc.build-debian-current_b + - oc.build-debian-old_a + - oc.build-debian-old_b dependencies: - - oc.build-debian-current_a - - oc.build-debian-current_b + - oc.build-debian-old_a + - oc.build-debian-old_b timeout: 60 minutes before_script: - . ./scripts/version.sh @@ -608,7 +608,7 @@ oc.build-ubuntu: - gcp - gcp_arm64 -oc.build-ubuntu-current_a: +oc.build-ubuntu-old_a: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -626,7 +626,7 @@ oc.build-ubuntu-current_a: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh A + - ./scripts/ci/build-debian-packages_old.sh A after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -654,7 +654,7 @@ oc.build-ubuntu-current_a: - gcp - gcp_arm64 -oc.build-ubuntu-current_b: +oc.build-ubuntu-old_b: image: $DEP_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} stage: build tags: @@ -672,7 +672,7 @@ oc.build-ubuntu-current_b: - . ./scripts/ci/sccache-start.sh script: - export CARGO_NET_OFFLINE=false - - ./scripts/ci/build-debian-packages_current.sh B + - ./scripts/ci/build-debian-packages_old.sh B after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -700,17 +700,17 @@ oc.build-ubuntu-current_b: - gcp - gcp_arm64 -apt_repo_ubuntu_current: +apt_repo_ubuntu_old: image: public.ecr.aws/lts/ubuntu:24.04_stable stage: publishing tags: - gcp needs: - - oc.build-ubuntu-current_a - - oc.build-ubuntu-current_b + - oc.build-ubuntu-old_a + - oc.build-ubuntu-old_b dependencies: - - oc.build-ubuntu-current_a - - oc.build-ubuntu-current_b + - oc.build-ubuntu-old_a + - oc.build-ubuntu-old_b timeout: 60 minutes before_script: - . ./scripts/version.sh diff --git a/ci/bin/debian_repository.ml b/ci/bin/debian_repository.ml index 212175606dcc..d85b7fbcf23b 100644 --- a/ci/bin/debian_repository.ml +++ b/ci/bin/debian_repository.ml @@ -8,7 +8,7 @@ (* This module defines the jobs of the [debian_repository] child pipeline. - This pipeline builds the current and old Debian (and Ubuntu) + This pipeline builds the old and old Debian (and Ubuntu) packages. *) open Gitlab_ci.Types @@ -188,49 +188,49 @@ let jobs pipeline_type = |> enable_sccache ~idle_timeout:"0" in - (* These jobs build the current packages in a matrix using the + (* These jobs build the old packages in a matrix using the build dependencies images *) - let job_build_debian_package_current_a : tezos_job = + let job_build_debian_package_old_a : tezos_job = make_job_build_debian_packages ~__POS__ - ~name:"oc.build-debian-current_a" + ~name:"oc.build-debian-old_a" ~distribution:"debian" ~dependencies:(Dependent [Job job_docker_build_debian_dependencies]) - ~script:"./scripts/ci/build-debian-packages_current.sh A" + ~script:"./scripts/ci/build-debian-packages_old.sh A" ~matrix:(debian_package_release_matrix pipeline_type) ~timeout:(Minutes 90) () in - let job_build_ubuntu_package_current_a : tezos_job = + let job_build_ubuntu_package_old_a : tezos_job = make_job_build_debian_packages ~__POS__ - ~name:"oc.build-ubuntu-current_a" + ~name:"oc.build-ubuntu-old_a" ~distribution:"ubuntu" ~dependencies:(Dependent [Job job_docker_build_ubuntu_dependencies]) - ~script:"./scripts/ci/build-debian-packages_current.sh A" + ~script:"./scripts/ci/build-debian-packages_old.sh A" ~matrix:(ubuntu_package_release_matrix pipeline_type) ~timeout:(Minutes 90) () in - let job_build_debian_package_current_b : tezos_job = + let job_build_debian_package_old_b : tezos_job = make_job_build_debian_packages ~__POS__ - ~name:"oc.build-debian-current_b" + ~name:"oc.build-debian-old_b" ~distribution:"debian" ~dependencies:(Dependent [Job job_docker_build_debian_dependencies]) - ~script:"./scripts/ci/build-debian-packages_current.sh B" + ~script:"./scripts/ci/build-debian-packages_old.sh B" ~matrix:(debian_package_release_matrix pipeline_type) ~timeout:(Minutes 90) () in - let job_build_ubuntu_package_current_b : tezos_job = + let job_build_ubuntu_package_old_b : tezos_job = make_job_build_debian_packages ~__POS__ - ~name:"oc.build-ubuntu-current_b" + ~name:"oc.build-ubuntu-old_b" ~distribution:"ubuntu" ~dependencies:(Dependent [Job job_docker_build_ubuntu_dependencies]) - ~script:"./scripts/ci/build-debian-packages_current.sh B" + ~script:"./scripts/ci/build-debian-packages_old.sh B" ~matrix:(ubuntu_package_release_matrix pipeline_type) ~timeout:(Minutes 90) () @@ -279,31 +279,31 @@ let jobs pipeline_type = () in - (* These jobs create the apt repository for the current packages *) - let job_apt_repo_debian_current = + (* These jobs create the apt repository for the old packages *) + let job_apt_repo_debian_old = make_job_apt_repo ~__POS__ - ~name:"apt_repo_debian_current" + ~name:"apt_repo_debian_old" ~dependencies: (Dependent [ - Artifacts job_build_debian_package_current_a; - Artifacts job_build_debian_package_current_b; + Artifacts job_build_debian_package_old_a; + Artifacts job_build_debian_package_old_b; ]) ~prefix:"old" ~variables:(archs_variables pipeline_type) ~image:Images.debian_bookworm ["./scripts/ci/create_debian_repo.sh debian bookworm"] in - let job_apt_repo_ubuntu_current = + let job_apt_repo_ubuntu_old = make_job_apt_repo ~__POS__ - ~name:"apt_repo_ubuntu_current" + ~name:"apt_repo_ubuntu_old" ~dependencies: (Dependent [ - Artifacts job_build_ubuntu_package_current_a; - Artifacts job_build_ubuntu_package_current_b; + Artifacts job_build_ubuntu_package_old_a; + Artifacts job_build_ubuntu_package_old_b; ]) ~prefix:"old" ~variables:(archs_variables pipeline_type) @@ -341,7 +341,7 @@ let jobs pipeline_type = ~image:Images.ubuntu_noble ["./scripts/ci/create_debian_repo.sh ubuntu noble jammy"] in - (* These test the installability of the current packages *) + (* These test the installability of the old packages *) let job_install_bin ~__POS__ ~name ~dependencies ~image ?(variables = []) ?allow_failure ?before_script script = job @@ -429,7 +429,7 @@ let jobs pipeline_type = ~__POS__ ~name:"oc.upgrade_bin_ubuntu_jammy" ~dependencies: - (Dependent [Job job_apt_repo_ubuntu_current; Job job_apt_repo_ubuntu]) + (Dependent [Job job_apt_repo_ubuntu_old; Job job_apt_repo_ubuntu]) ~image:Images.ubuntu_jammy ["./docs/introduction/upgrade-bin-deb.sh ubuntu jammy"]; ] @@ -453,7 +453,7 @@ let jobs pipeline_type = ~__POS__ ~name:"oc.upgrade_bin_debian_bookworm" ~dependencies: - (Dependent [Job job_apt_repo_debian_current; Job job_apt_repo_debian]) + (Dependent [Job job_apt_repo_debian_old; Job job_apt_repo_debian]) ~image:Images.debian_bookworm ["./docs/introduction/upgrade-bin-deb.sh debian bookworm"]; job_install_systemd_bin @@ -484,10 +484,10 @@ let jobs pipeline_type = [ job_docker_build_debian_dependencies; job_build_debian_package; - job_build_debian_package_current_a; - job_build_debian_package_current_b; + job_build_debian_package_old_a; + job_build_debian_package_old_b; job_build_data_packages; - job_apt_repo_debian_current; + job_apt_repo_debian_old; job_apt_repo_debian; ] in @@ -495,9 +495,9 @@ let jobs pipeline_type = [ job_docker_build_ubuntu_dependencies; job_build_ubuntu_package; - job_build_ubuntu_package_current_a; - job_build_ubuntu_package_current_b; - job_apt_repo_ubuntu_current; + job_build_ubuntu_package_old_a; + job_build_ubuntu_package_old_b; + job_apt_repo_ubuntu_old; job_apt_repo_ubuntu; ] in @@ -505,23 +505,23 @@ let jobs pipeline_type = | Partial -> ( (job_docker_systemd_test_debian_dependencies :: debian_jobs) @ test_debian_packages_jobs, - job_build_ubuntu_package_current_a, - job_build_debian_package_current_a, - job_build_ubuntu_package_current_b, - job_build_debian_package_current_b ) + job_build_ubuntu_package_old_a, + job_build_debian_package_old_a, + job_build_ubuntu_package_old_b, + job_build_debian_package_old_b ) | Full -> ( (job_docker_systemd_test_debian_dependencies :: debian_jobs) @ ubuntu_jobs @ test_debian_packages_jobs @ test_ubuntu_packages_jobs, - job_build_ubuntu_package_current_a, - job_build_debian_package_current_a, - job_build_ubuntu_package_current_b, - job_build_debian_package_current_b ) + job_build_ubuntu_package_old_a, + job_build_debian_package_old_a, + job_build_ubuntu_package_old_b, + job_build_debian_package_old_b ) | Release -> ( debian_jobs @ ubuntu_jobs, - job_build_ubuntu_package_current_a, - job_build_debian_package_current_a, - job_build_ubuntu_package_current_b, - job_build_debian_package_current_b ) + job_build_ubuntu_package_old_a, + job_build_debian_package_old_a, + job_build_ubuntu_package_old_b, + job_build_debian_package_old_b ) let register ~auto ~description pipeline_type = let pipeline_name = diff --git a/scripts/ci/build-debian-packages_current.sh b/scripts/ci/build-debian-packages_old.sh similarity index 100% rename from scripts/ci/build-debian-packages_current.sh rename to scripts/ci/build-debian-packages_old.sh -- GitLab From 3272affcb0019c96652bb1f70bede59cf1123081 Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Fri, 14 Feb 2025 16:13:21 +0100 Subject: [PATCH 7/7] packages: remove links to deb packages in release page --- scripts/ci/create_gitlab_package.sh | 27 --------------------------- scripts/ci/create_gitlab_release.sh | 8 +------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/scripts/ci/create_gitlab_package.sh b/scripts/ci/create_gitlab_package.sh index d07ad9f0e221..f849dfcdd512 100755 --- a/scripts/ci/create_gitlab_package.sh +++ b/scripts/ci/create_gitlab_package.sh @@ -21,19 +21,10 @@ for arg in "$@"; do esac done -debian_bookworm_packages="$(find packages/debian/bookworm/ -maxdepth 1 -name octez-\*.deb 2> /dev/null || printf '')" -ubuntu_noble_packages="$(find packages/ubuntu/noble/ -maxdepth 1 -name octez-\*.deb 2> /dev/null || printf '')" -ubuntu_jammy_packages="$(find packages/ubuntu/jammy/ -maxdepth 1 -name octez-\*.deb 2> /dev/null || printf '')" - # https://docs.gitlab.com/ee/user/packages/generic_packages/index.html#download-package-file # :gitlab_api_url/projects/:id/packages/generic/:package_name/:package_version/:file_name gitlab_octez_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_binaries_package_name}/${gitlab_package_version}" -gitlab_octez_debian_bookworm_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_debian_bookworm_package_name}/${gitlab_package_version}" - -gitlab_octez_ubuntu_noble_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_ubuntu_noble_package_name}/${gitlab_package_version}" -gitlab_octez_ubuntu_jammy_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_ubuntu_jammy_package_name}/${gitlab_package_version}" - gitlab_octez_source_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_source_package_name}/${gitlab_package_version}" gitlab_upload() { @@ -95,24 +86,6 @@ for architecture in ${architectures}; do cd .. done -echo "Upload debian bookworm packages" -for package in ${debian_bookworm_packages}; do - package_name="$(basename "${package}")" - gitlab_upload "./${package}" "${package_name}" "${gitlab_octez_debian_bookworm_package_url}" -done - -echo "Upload Ubuntu noble packages" -for package in ${ubuntu_noble_packages}; do - package_name="$(basename "${package}")" - gitlab_upload "./${package}" "${package_name}" "${gitlab_octez_ubuntu_noble_package_url}" -done - -echo "Upload Ubuntu jammy packages" -for package in ${ubuntu_jammy_packages}; do - package_name="$(basename "${package}")" - gitlab_upload "./${package}" "${package_name}" "${gitlab_octez_ubuntu_jammy_package_url}" -done - # Source code archives automatically published in a GitLab release do not have a static checksum, # which is mandatory for the opam repository, because they are dynamically generated # => create and upload manually diff --git a/scripts/ci/create_gitlab_release.sh b/scripts/ci/create_gitlab_release.sh index 0def9848d71b..715176441c6e 100755 --- a/scripts/ci/create_gitlab_release.sh +++ b/scripts/ci/create_gitlab_release.sh @@ -31,9 +31,6 @@ package_web_path() { gitlab_binaries_url=$(package_web_path "${gitlab_octez_binaries_package_name}") gitlab_octez_source_url=$(package_web_path "${gitlab_octez_source_package_name}") -gitlab_debian_bookworm_packages_url=$(package_web_path "${gitlab_octez_debian_bookworm_package_name}") -gitlab_ubuntu_noble_packages_url=$(package_web_path "${gitlab_octez_ubuntu_noble_package_name}") -gitlab_ubuntu_jammy_packages_url=$(package_web_path "${gitlab_octez_ubuntu_jammy_package_name}") if [ "${CI_PROJECT_NAMESPACE}" = "tezos" ]; then ## Production => Docker Hub @@ -72,7 +69,4 @@ release-cli create \ --assets-link="{\"name\":\"Announcement\",\"url\":\"https://tezos.gitlab.io/releases/version-${gitlab_release_major_version}.html\",\"link_type\":\"other\"}" \ --assets-link="{\"name\":\"Docker image\",\"url\":\"${docker_image_url}\",\"link_type\":\"image\"}" \ --assets-link="{\"name\":\"Static binaries\",\"url\":\"${gitlab_binaries_url}\",\"link_type\":\"package\"}" \ - --assets-link="{\"name\":\"Octez source\",\"url\":\"${gitlab_octez_source_url}\",\"link_type\":\"other\"}" \ - --assets-link="{\"name\":\"Debian Bookworm packages\",\"url\":\"${gitlab_debian_bookworm_packages_url}\",\"link_type\":\"package\"}" \ - --assets-link="{\"name\":\"Ubuntu Noble packages\",\"url\":\"${gitlab_ubuntu_noble_packages_url}\",\"link_type\":\"package\"}" \ - --assets-link="{\"name\":\"Ubuntu Jammy packages\",\"url\":\"${gitlab_ubuntu_jammy_packages_url}\",\"link_type\":\"package\"}" + --assets-link="{\"name\":\"Octez source\",\"url\":\"${gitlab_octez_source_url}\",\"link_type\":\"other\"}" -- GitLab