diff --git a/.gitlab/ci/pipelines/debian_repository_full.yml b/.gitlab/ci/pipelines/debian_repository_full.yml index 47d69c9395d753cc49d6948de31118b2b1cd226f..17deeff2c036efb70d8b0fa598afc40755220dcc 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 @@ -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,6 @@ apt_repo_debian: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next 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} @@ -398,7 +398,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: @@ -416,7 +416,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: @@ -444,7 +444,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: @@ -462,7 +462,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: @@ -490,17 +490,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 @@ -511,6 +511,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 +542,6 @@ apt_repo_ubuntu: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next 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} @@ -551,6 +551,25 @@ apt_repo_ubuntu: - stuck_or_timeout_failure - runner_system_failure +oc.install_bin_debian_bookworm_old: + image: debian:bookworm + stage: publishing_tests + tags: + - gcp + needs: + - apt_repo_debian_old + 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 @@ -569,24 +588,6 @@ oc.lintian_debian: script: - ./scripts/ci/lintian_debian_packages.sh debian bookworm -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: {} - retry: - max: 2 - when: - - stuck_or_timeout_failure - - runner_system_failure - oc.install_bin_debian_bookworm: image: debian:bookworm stage: publishing_tests @@ -599,7 +600,7 @@ oc.install_bin_debian_bookworm: script: - ./docs/introduction/install-bin-deb.sh debian bookworm variables: - PREFIX: next + PREFIX: "" retry: max: 2 when: @@ -612,7 +613,7 @@ oc.upgrade_bin_debian_bookworm: tags: - gcp needs: - - apt_repo_debian_current + - apt_repo_debian_old - apt_repo_debian dependencies: [] timeout: 60 minutes @@ -640,35 +641,17 @@ 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 -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: +oc.install_bin_ubuntu_noble_old: image: public.ecr.aws/lts/ubuntu:24.04_stable stage: publishing_tests tags: - gcp needs: - - apt_repo_ubuntu_current + - apt_repo_ubuntu_old dependencies: [] timeout: 60 minutes script: @@ -680,13 +663,13 @@ oc.install_bin_ubuntu_noble_current: - stuck_or_timeout_failure - runner_system_failure -oc.install_bin_ubuntu_jammy_current: +oc.install_bin_ubuntu_jammy_old: image: public.ecr.aws/lts/ubuntu:22.04_stable stage: publishing_tests tags: - gcp needs: - - apt_repo_ubuntu_current + - apt_repo_ubuntu_old dependencies: [] timeout: 60 minutes script: @@ -698,13 +681,31 @@ 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 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 8c05814f7dc6a8c444f3fa99e740d3f1b62bc84a..946a41392909009310fa345804d89a0e8ed5e51a 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 @@ -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,6 @@ apt_repo_debian: variables: ARCHITECTURES: amd64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next 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,6 +309,25 @@ apt_repo_debian: - stuck_or_timeout_failure - runner_system_failure +oc.install_bin_debian_bookworm_old: + image: debian:bookworm + stage: publishing_tests + tags: + - gcp + needs: + - apt_repo_debian_old + 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 @@ -327,24 +346,6 @@ oc.lintian_debian: script: - ./scripts/ci/lintian_debian_packages.sh debian bookworm -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: {} - retry: - max: 2 - when: - - stuck_or_timeout_failure - - runner_system_failure - oc.install_bin_debian_bookworm: image: debian:bookworm stage: publishing_tests @@ -357,7 +358,7 @@ oc.install_bin_debian_bookworm: script: - ./docs/introduction/install-bin-deb.sh debian bookworm variables: - PREFIX: next + PREFIX: "" retry: max: 2 when: @@ -370,7 +371,7 @@ oc.upgrade_bin_debian_bookworm: tags: - gcp needs: - - apt_repo_debian_current + - apt_repo_debian_old - apt_repo_debian dependencies: [] timeout: 60 minutes @@ -398,6 +399,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 172abc9831d9bb029a58398466c31315601fdd8a..49115cdd1d8d8655de4a25d2ce652b9d11f18796 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 @@ -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,6 @@ apt_repo_debian: variables: ARCHITECTURES: amd64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next 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,6 +309,25 @@ apt_repo_debian: - stuck_or_timeout_failure - runner_system_failure +oc.install_bin_debian_bookworm_old: + image: debian:bookworm + stage: publishing_tests + tags: + - gcp + needs: + - apt_repo_debian_old + 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 @@ -327,24 +346,6 @@ oc.lintian_debian: script: - ./scripts/ci/lintian_debian_packages.sh debian bookworm -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: {} - retry: - max: 2 - when: - - stuck_or_timeout_failure - - runner_system_failure - oc.install_bin_debian_bookworm: image: debian:bookworm stage: publishing_tests @@ -357,7 +358,7 @@ oc.install_bin_debian_bookworm: script: - ./docs/introduction/install-bin-deb.sh debian bookworm variables: - PREFIX: next + PREFIX: "" retry: max: 2 when: @@ -370,7 +371,7 @@ oc.upgrade_bin_debian_bookworm: tags: - gcp needs: - - apt_repo_debian_current + - apt_repo_debian_old - apt_repo_debian dependencies: [] timeout: 60 minutes @@ -398,6 +399,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 c2b47b2feb3593ee83a3482e3f6aa0b89f1678e8..c37062f7832c61378b8496b129f52015f0077986 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -303,19 +303,11 @@ gitlab:publish: - oc.build:static-arm64-linux-binaries - oc.install-release-homebrew - oc.build:rpm:amd64 - - 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:rpm:amd64 - - 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: @@ -410,7 +402,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: @@ -428,7 +420,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: @@ -456,7 +448,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: @@ -474,7 +466,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: @@ -525,17 +517,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 @@ -546,6 +538,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} @@ -576,7 +569,6 @@ apt_repo_debian: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next 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} @@ -665,7 +657,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: @@ -683,7 +675,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: @@ -711,7 +703,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: @@ -729,7 +721,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: @@ -757,17 +749,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 @@ -778,6 +770,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} @@ -808,7 +801,6 @@ apt_repo_ubuntu: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next 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 0c2a57af8fdaefd561ce97bfab00cc1cd78881b9..20c808e6702ca9cab7910cd0f93f64871a674a42 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -303,19 +303,11 @@ gitlab:publish: - oc.build:static-arm64-linux-binaries - oc.install-release-homebrew - oc.build:rpm:amd64 - - 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:rpm:amd64 - - 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: @@ -410,7 +402,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: @@ -428,7 +420,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: @@ -456,7 +448,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: @@ -474,7 +466,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: @@ -525,17 +517,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 @@ -546,6 +538,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} @@ -576,7 +569,6 @@ apt_repo_debian: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next 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} @@ -665,7 +657,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: @@ -683,7 +675,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: @@ -711,7 +703,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: @@ -729,7 +721,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: @@ -757,17 +749,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 @@ -778,6 +770,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} @@ -808,7 +801,6 @@ apt_repo_ubuntu: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next 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 6cad621c4c3a8c4c0ff67529321c3aa7f3fc88ad..df0f4c709c436ee8ab805eabc67d228ed875123c 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -303,19 +303,11 @@ gitlab:release: - oc.build:static-arm64-linux-binaries - oc.install-release-homebrew - oc.build:rpm:amd64 - - 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:rpm:amd64 - - 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: @@ -411,7 +403,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: @@ -429,7 +421,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: @@ -457,7 +449,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: @@ -475,7 +467,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: @@ -526,17 +518,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 @@ -547,6 +539,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} @@ -577,7 +570,6 @@ apt_repo_debian: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next 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} @@ -666,7 +658,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: @@ -684,7 +676,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: @@ -712,7 +704,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: @@ -730,7 +722,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: @@ -758,17 +750,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 @@ -779,6 +771,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} @@ -809,7 +802,6 @@ apt_repo_ubuntu: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next 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 196b36cc9f74489366304b13922d10828fc5b2e2..6a49e85a772a6a7b2b892022a683242aa0ddae68 100644 --- a/.gitlab/ci/pipelines/octez_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_release_tag.yml @@ -304,19 +304,11 @@ gitlab:release: - oc.build:static-arm64-linux-binaries - oc.install-release-homebrew - oc.build:rpm:amd64 - - 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:rpm:amd64 - - 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: @@ -412,7 +404,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: @@ -430,7 +422,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: @@ -458,7 +450,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: @@ -476,7 +468,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: @@ -527,17 +519,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 @@ -548,6 +540,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} @@ -578,7 +571,6 @@ apt_repo_debian: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next 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} @@ -667,7 +659,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: @@ -685,7 +677,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: @@ -713,7 +705,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: @@ -731,7 +723,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: @@ -759,17 +751,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 @@ -780,6 +772,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} @@ -810,7 +803,6 @@ apt_repo_ubuntu: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next 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 3ef4747f818d7c704c15bc41fee07f9f4d1d4c69..2a772e71a8d4f62390c1841d0b6703445c61ec97 100644 --- a/.gitlab/ci/pipelines/octez_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_release_tag_test.yml @@ -304,19 +304,11 @@ gitlab:release: - oc.build:static-arm64-linux-binaries - oc.install-release-homebrew - oc.build:rpm:amd64 - - 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:rpm:amd64 - - 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: @@ -412,7 +404,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: @@ -430,7 +422,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: @@ -458,7 +450,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: @@ -476,7 +468,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: @@ -527,17 +519,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 @@ -548,6 +540,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} @@ -578,7 +571,6 @@ apt_repo_debian: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next 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} @@ -667,7 +659,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: @@ -685,7 +677,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: @@ -713,7 +705,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: @@ -731,7 +723,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: @@ -759,17 +751,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 @@ -780,6 +772,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} @@ -810,7 +803,6 @@ apt_repo_ubuntu: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next 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 d71795fcdeefd9ad457517794cd9551dd9e8809f..c9726c78c1b4ea274573835bed80c4153985a737 100644 --- a/.gitlab/ci/pipelines/schedule_master_test_release.yml +++ b/.gitlab/ci/pipelines/schedule_master_test_release.yml @@ -303,19 +303,11 @@ gitlab:publish: - oc.build:static-arm64-linux-binaries - oc.install-release-homebrew - oc.build:rpm:amd64 - - 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:rpm:amd64 - - 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: @@ -414,7 +406,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: @@ -432,7 +424,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: @@ -460,7 +452,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: @@ -478,7 +470,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: @@ -529,17 +521,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 @@ -550,6 +542,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} @@ -580,7 +573,6 @@ apt_repo_debian: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next 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} @@ -669,7 +661,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: @@ -687,7 +679,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: @@ -715,7 +707,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: @@ -733,7 +725,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: @@ -761,17 +753,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 @@ -782,6 +774,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} @@ -812,7 +805,6 @@ apt_repo_ubuntu: variables: ARCHITECTURES: amd64 arm64 GNUPGHOME: $CI_PROJECT_DIR/.gnupg - PREFIX: next 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 79d9ca9ae9a9df47b9c9af01abc85e6ab4f11392..b3d23a3d9da2cee3f21a1d5d77bbf811bc609665 100644 --- a/ci/bin/debian_repository.ml +++ b/ci/bin/debian_repository.ml @@ -8,8 +8,7 @@ (* This module defines the jobs of the [debian_repository] child pipeline. - This pipeline builds the current and next Debian (and Ubuntu) - packages. *) + This pipeline builds the old and Debian (and Ubuntu) packages. *) open Gitlab_ci.Types open Gitlab_ci.Util @@ -61,7 +60,7 @@ let make_job_apt_repo ?rules ~__POS__ ~name ?(stage = Stages.publishing) let variables = variables @ [("GNUPGHOME", "$CI_PROJECT_DIR/.gnupg")] - @ if prefix then [("PREFIX", "next")] else [] + @ if prefix then [("PREFIX", "old")] else [] in job ?rules @@ -190,49 +189,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) () @@ -258,7 +257,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 @@ -281,41 +280,42 @@ 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:true ~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:true ~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 ~dependencies: (Dependent [ @@ -330,7 +330,6 @@ let jobs pipeline_type = make_job_apt_repo ~__POS__ ~name:"apt_repo_ubuntu" - ~prefix:true ~dependencies: (Dependent [ @@ -341,7 +340,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 @@ -387,7 +386,7 @@ let jobs pipeline_type = ]) script in - (* These test the upgrade of the current packages *) + (* These test the upgrade of the old packages *) let job_upgrade_bin ~__POS__ ~name ~dependencies ~image ?allow_failure script = job @@ -399,7 +398,7 @@ let jobs pipeline_type = ~stage:Stages.publishing_tests script in - let test_current_ubuntu_packages_jobs = + let test_ubuntu_packages_jobs = (* in merge pipelines we tests only debian. release pipelines test the entire matrix *) [ @@ -409,28 +408,34 @@ 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_upgrade_bin + ~__POS__ + ~name:"oc.upgrade_bin_ubuntu_jammy" + ~dependencies: + (Dependent [Job job_apt_repo_ubuntu_old; Job job_apt_repo_ubuntu]) + ~image:Images.ubuntu_jammy + ["./docs/introduction/upgrade-bin-deb.sh ubuntu jammy"]; + ] + in + let test_old_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]) + ~name:"oc.install_bin_ubuntu_noble_old" + ~dependencies:(Dependent [Job job_apt_repo_ubuntu_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]) + ~name:"oc.install_bin_ubuntu_jammy_old" + ~dependencies:(Dependent [Job job_apt_repo_ubuntu_old]) ~image:Images.ubuntu_jammy ["./docs/introduction/install-bin-deb.sh ubuntu jammy"]; - job_upgrade_bin - ~__POS__ - ~name:"oc.upgrade_bin_ubuntu_jammy" - ~dependencies: - (Dependent [Job job_apt_repo_ubuntu_current; Job job_apt_repo_ubuntu]) - ~image:Images.ubuntu_jammy - ["./docs/introduction/upgrade-bin-deb.sh ubuntu jammy"]; ] in - let test_current_debian_packages_jobs = + let test_debian_packages_jobs = [ job_lintian ~__POS__ @@ -438,24 +443,18 @@ let jobs pipeline_type = ~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"]; job_install_bin ~__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 ~__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 @@ -471,7 +470,7 @@ let jobs pipeline_type = (variables ~kind:"systemd-tests" [ - ("PREFIX", "next"); + ("PREFIX", ""); ("DISTRIBUTION", "debian"); ("RELEASE", "bookworm"); ]) @@ -482,14 +481,25 @@ let jobs pipeline_type = ]; ] in + let test_old_debian_packages_jobs = + [ + job_install_bin + ~__POS__ + ~name:"oc.install_bin_debian_bookworm_old" + ~dependencies:(Dependent [Job job_apt_repo_debian_old]) + ~image:Images.debian_bookworm + ~variables:[("PREFIX", "old")] + ["./docs/introduction/install-bin-deb.sh debian bookworm"]; + ] + in let debian_jobs = [ 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 @@ -497,34 +507,35 @@ 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 match pipeline_type with | Partial -> ( (job_docker_systemd_test_debian_dependencies :: debian_jobs) - @ test_current_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 ) + @ test_old_debian_packages_jobs @ test_debian_packages_jobs, + 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_current_debian_packages_jobs - @ test_current_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 ) + @ ubuntu_jobs @ test_old_debian_packages_jobs + @ test_debian_packages_jobs @ test_old_ubuntu_packages_jobs + @ test_ubuntu_packages_jobs, + 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/ci/bin/release_tag.ml b/ci/bin/release_tag.ml index bf1098739101876e30fffb6a996702eba2f58dd2..9a132a01fa0990b3de6692a0863d16b76f11192d 100644 --- a/ci/bin/release_tag.ml +++ b/ci/bin/release_tag.ml @@ -168,13 +168,7 @@ let octez_jobs ?(test = false) release_tag_pipeline_type = ] in let job_build_rpm_amd64 = job_build_rpm_amd64 () 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_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_arm64_release; Artifacts job_build_homebrew_release; Artifacts job_build_rpm_amd64; - 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 diff --git a/docs/introduction/howtoget.rst b/docs/introduction/howtoget.rst index cc1e8383bdff5b2b4090538825b5384390670c24..b94087a3f0c4f16c1029238605b9b15f2230b147 100644 --- a/docs/introduction/howtoget.rst +++ b/docs/introduction/howtoget.rst @@ -50,29 +50,12 @@ All our installation scenarios are tested daily, including by automated means, t These tests are performed by applying scenarios in several standard environments, from scratch. However, if you encounter problems when performing one of the installation scenarios in your own environment, you may want to take a look at :doc:`get_troubleshooting`. -.. _getting_static_binaries: - -Getting static binaries ------------------------ - -You can get static Linux binaries of the latest release from the -`Octez package registry `__. - -This repository provides static binaries for x86_64 and arm64 architectures. Since these binaries -are static, they can be used on any Linux distribution without any additional prerequisites. -However, note that, by embedding all dependencies, static binary executables are typically much larger than dynamically-linked executables. - -For upgrading to a newer release, you just have to download and run the new -versions of the binaries. - -.. _installing_packages: - Ubuntu and Debian Octez packages ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -If you're using Ubuntu or Debian, you can install the same packages as in the release page -using ``apt`` directly from our APT repository, instead of going to the Octez -release page as explained above. +If you're using Ubuntu or Debian, you can install the same packages as in the +release page using ``apt`` directly from our APT repository, instead of going +to the Octez release page as explained above. We support the following distribution/releases: - ``debian/bookworm`` @@ -99,51 +82,8 @@ We also maintain a separate repository for release candidates. To install the last release candidate simply prepend ``RC/`` to the distribution name as in ``export distribution=RC/debian`` -Then, to install the binaries, run the following commands: - -.. literalinclude:: install-bin-deb.sh - :language: shell - :start-after: [install tezos] - :end-before: [install octez additional packages] - -To remove the Octez packages you can simply run the following command. - -.. literalinclude:: install-bin-deb.sh - :language: shell - :start-after: [test autopurge] - :end-before: [check autopurge] - -Also there are some experimental packages: - -- ``octez-experimental`` - binaries that are considered experimental including - the Alpha baker -- ``octez-evm-node`` - the EVM endpoint node for Etherlink - -The packages are set up to run under a dedicated user. The ``octez-node``, -``octez-baker`` and ``octez-smartrollup`` packages use a user and group called -tezos. The ``octez-signer`` package uses a user and group called tzsigner. It’s -possible to configure the software to use a different user (even root). - -The documentation for these packages, originally developed by Chris Pinnock, -can be found here: https://chrispinnock.com/tezos/packages/ - -.. _new_packages: - -New set of Debian packages -"""""""""""""""""""""""""" - - -We are developing a new set of Octez Debian packages. They are distributed with latest Octez releases for testing purposes only, and should be considered experimental. - -You can use them to test new packaging features, compatibility and integration with other software and :doc:`share your feedback with us <../developer/contributing>`. - -These will eventually replace the Debian packages mentioned above. - The new set of packages can be installed by adding the following apt repository:: - export distribution=next/debian - export release=bookworm - .. literalinclude:: install-bin-deb.sh :language: shell :start-after: [add repository] @@ -174,6 +114,24 @@ For example using ``yum``:: .. _using_docker_images: + +.. _getting_static_binaries: + +Getting static binaries +----------------------- + +You can get static Linux binaries of the latest release from the +`Octez package registry `__. + +This repository provides static binaries for x86_64 and arm64 architectures. Since these binaries +are static, they can be used on any Linux distribution without any additional prerequisites. +However, note that, by embedding all dependencies, static binary executables are typically much larger than dynamically-linked executables. + +For upgrading to a newer release, you just have to download and run the new +versions of the binaries. + +.. _installing_packages: + Using Docker images ------------------- diff --git a/docs/introduction/install-bin-deb.sh b/docs/introduction/install-bin-deb.sh index c18072dc896985d8c614c5ffe2cec9ed44271314..906a82598f0e7eca39047f74821513335c86c04d 100755 --- a/docs/introduction/install-bin-deb.sh +++ b/docs/introduction/install-bin-deb.sh @@ -178,11 +178,11 @@ apt-get install -y octez-baker apt-get install -y octez-dal-node # [install octez additional packages] -if [ -n "$PREFIX" ]; then - # [install octez NEXT packages] +if [ -z "$PREFIX" ]; then + # [install octez packages] apt-get install -y octez-smart-rollup-node else - # [install octez current packages] + # [install octez old packages] apt-get install -y octez-smartrollup fi @@ -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 75b0c755a0353944cc8bc74214ea09cad9e31733..3100453531a6332fbde81d3428ecc1a8b3706621 100755 --- a/docs/introduction/upgrade-bin-deb.sh +++ b/docs/introduction/upgrade-bin-deb.sh @@ -66,11 +66,11 @@ apt-get install -y sudo gpg curl apt-utils debconf-utils # [preseed debconf] 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 +# [add old repository] +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" -echo "$REPO" | sudo tee /etc/apt/sources.list.d/octez-current.list +REPO="deb https://$bucket.storage.googleapis.com/old/$distribution $release main" +echo "$REPO" | sudo tee /etc/apt/sources.list.d/octez-old.list sudo apt-get update # [install tezos] @@ -91,9 +91,9 @@ BAKER_KEY=$(sudo su tezos -c "octez-client -p $PROTOCOL show address baker" | he 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" -echo "$REPO" | sudo tee /etc/apt/sources.list.d/octez-next.list +# [add repository] +REPO="deb https://$bucket.storage.googleapis.com/$distribution $release main" +echo "$REPO" | sudo tee /etc/apt/sources.list.d/octez.list sudo apt-get update # [upgrade octez] 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 diff --git a/scripts/ci/create_debian_repo.sh b/scripts/ci/create_debian_repo.sh index 9a70362a33c71a203c31da37647d908c6022156e..d51b056a51e43e57116f85376ca9a24c1c10a14f 100755 --- a/scripts/ci/create_debian_repo.sh +++ b/scripts/ci/create_debian_repo.sh @@ -87,7 +87,7 @@ mkdir -p "$TARGETDIR/dists" # Copying files for release in $RELEASES; do # unstable, jammy, noble ... for architecture in $ARCHITECTURES; do # amd64, arm64 ... - echo "Setting up APT repository for $DISTRIBUTION / $release / $architecture" + echo "Setting up APT repository for $PREFIX / $DISTRIBUTION / $release / $architecture" echo "targetdir: $TARGETDIR" # create the apt repository root directory and copy the public key @@ -103,8 +103,9 @@ for release in $RELEASES; do # unstable, jammy, noble ... done # we also add the data packages that we built for - # bookworm, that are distribution independent. Only for next packages - if [ -n "$PREFIX" ]; then + # bookworm, that are distribution independent. We don't need this for + # old packages + 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 2942f01566c300335e6b858c4b8ca47a7c94a7a3..42380114f0d701cb3563b362a83d6b086e20a338 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}