diff --git a/.gitlab/ci/pipelines/debian_repository_full.yml b/.gitlab/ci/pipelines/debian_repository_full.yml index 47d69c9395d753cc49d6948de31118b2b1cd226f..450ced3e09cc8318cda6cf8eeb0693bb5850ec04 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,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} @@ -398,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: @@ -416,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: @@ -444,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: @@ -462,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: @@ -490,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 @@ -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} @@ -568,24 +570,7 @@ oc.lintian_debian: - 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 - 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 @@ -599,7 +584,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 +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 @@ -640,7 +625,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 @@ -661,37 +646,40 @@ oc.lintian_ubuntu: - apt-get install lintian -y script: - ./scripts/ci/lintian_debian_packages.sh ubuntu jammy noble + variables: {} -oc.install_bin_ubuntu_noble_current: - image: public.ecr.aws/lts/ubuntu:24.04_stable +oc.install_bin_ubunty_jammy: + image: debian:bookworm stage: publishing_tests tags: - gcp needs: - - apt_repo_ubuntu_current + - apt_repo_ubuntu dependencies: [] timeout: 60 minutes script: - - ./docs/introduction/install-bin-deb.sh ubuntu noble - variables: {} + - ./docs/introduction/install-bin-deb.sh ubuntu jammy + variables: + PREFIX: "" 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 +oc.install_bin_ubunty_noble: + image: debian:bookworm stage: publishing_tests tags: - gcp needs: - - apt_repo_ubuntu_current + - apt_repo_ubuntu dependencies: [] timeout: 60 minutes script: - - ./docs/introduction/install-bin-deb.sh ubuntu jammy - variables: {} + - ./docs/introduction/install-bin-deb.sh ubuntu noble + variables: + PREFIX: "" retry: max: 2 when: @@ -704,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 8c05814f7dc6a8c444f3fa99e740d3f1b62bc84a..26d2d77b078e6a4bbfa7a55e1ff249adc9554214 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,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} @@ -326,24 +327,7 @@ oc.lintian_debian: - 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 - 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 @@ -357,7 +341,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 +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 @@ -398,6 +382,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..0a4ded6597eabd57a7a936d22a5f6747061564c0 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,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} @@ -326,24 +327,7 @@ oc.lintian_debian: - 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 - 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 @@ -357,7 +341,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 +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 @@ -398,6 +382,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 4a60e4548c8788a08875bc57f763068325152e56..5d4af672d9954790ae9f7302a725901c4370e0ca 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: @@ -356,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: @@ -374,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: @@ -402,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: @@ -420,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: @@ -471,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 @@ -492,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} @@ -522,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} @@ -611,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: @@ -629,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: @@ -657,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: @@ -675,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: @@ -703,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 @@ -724,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} @@ -754,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 1aa3fe102400e3afc3693d0c872fad18db835823..8493e3ccfda55d9c4554d44a2d2edf15668ec422 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: @@ -356,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: @@ -374,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: @@ -402,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: @@ -420,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: @@ -471,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 @@ -492,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} @@ -522,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} @@ -611,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: @@ -629,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: @@ -657,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: @@ -675,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: @@ -703,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 @@ -724,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} @@ -754,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 93f24f35a09147c8d49d198ec09b1d8cf128cf20..4256925c90cebb2a6d9898561b46cdc068f512ae 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: @@ -357,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: @@ -375,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: @@ -403,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: @@ -421,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: @@ -472,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 @@ -493,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} @@ -523,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} @@ -612,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: @@ -630,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: @@ -658,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: @@ -676,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: @@ -704,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 @@ -725,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} @@ -755,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 c9a3f77be710abd15ded425ad4822a71f7e76de5..6dc62ab03f3eb01d69f6123610d3daea828b5171 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: @@ -358,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: @@ -376,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: @@ -404,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: @@ -422,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: @@ -473,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 @@ -494,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} @@ -524,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} @@ -613,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: @@ -631,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: @@ -659,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: @@ -677,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: @@ -705,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 @@ -726,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} @@ -756,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 34cc88853e895d7b25ad14c60e3c5b8e855a2c46..622d826311a318baa8f242ed061f4ae10ab97973 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: @@ -358,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: @@ -376,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: @@ -404,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: @@ -422,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: @@ -473,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 @@ -494,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} @@ -524,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} @@ -613,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: @@ -631,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: @@ -659,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: @@ -677,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: @@ -705,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 @@ -726,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} @@ -756,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 53f4b0e4d4c5be5ff19751409e9530e84e356289..8550c16e62eb2180be05cf2334db2ea404cffd71 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: @@ -360,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: @@ -378,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: @@ -406,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: @@ -424,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: @@ -475,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 @@ -496,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} @@ -526,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} @@ -615,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: @@ -633,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: @@ -661,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: @@ -679,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: @@ -707,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 @@ -728,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} @@ -758,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 79d9ca9ae9a9df47b9c9af01abc85e6ab4f11392..d85b7fbcf23bae76619d64d63113372e0f62ccf0 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 old 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 @@ -190,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) () @@ -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 @@ -281,41 +279,43 @@ 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) ~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 [ @@ -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 @@ -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 @@ -399,9 +401,9 @@ 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 *) + let test_ubuntu_packages_jobs = + (* in merge pipelines we tests only debian. ubuntu packages + are built and tested in the sheduled pipelines*) [ job_lintian ~__POS__ @@ -411,26 +413,28 @@ let jobs pipeline_type = ["./scripts/ci/lintian_debian_packages.sh ubuntu jammy noble"]; job_install_bin ~__POS__ - ~name:"oc.install_bin_ubuntu_noble_current" - ~dependencies:(Dependent [Job job_apt_repo_ubuntu_current]) - ~image:Images.ubuntu_noble - ["./docs/introduction/install-bin-deb.sh ubuntu noble"]; + ~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_ubuntu_jammy_current" - ~dependencies:(Dependent [Job job_apt_repo_ubuntu_current]) - ~image:Images.ubuntu_jammy - ["./docs/introduction/install-bin-deb.sh ubuntu jammy"]; + ~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" ~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"]; ] in - let test_current_debian_packages_jobs = + let test_debian_packages_jobs = [ job_lintian ~__POS__ @@ -438,24 +442,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 +469,7 @@ let jobs pipeline_type = (variables ~kind:"systemd-tests" [ - ("PREFIX", "next"); + ("PREFIX", ""); ("DISTRIBUTION", "debian"); ("RELEASE", "bookworm"); ]) @@ -486,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 @@ -497,34 +495,33 @@ 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_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_debian_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 45927682d95b3c9dbff44dba80d022a10d518b50..79c56bfc80f704e42cf0ec3d5a3ee0270958b080 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 diff --git a/docs/introduction/install-bin-deb.sh b/docs/introduction/install-bin-deb.sh index c18072dc896985d8c614c5ffe2cec9ed44271314..04a0f532fdb88ee0245b0f87f7b30de1c5aadb56 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 75b0c755a0353944cc8bc74214ea09cad9e31733..1b97834836dfc5fcf50399a4f3c437a8147f0368 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/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..9b486915c270f492f6b7cf3766d5fae95c1f60e6 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/ci/create_gitlab_package.sh b/scripts/ci/create_gitlab_package.sh index d07ad9f0e221b80c16727aea19b03d723b87dbe3..f849dfcdd51217cd5438196ba07484fdd942a8c9 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 0def9848d71b2092e984e62fa27d1315f6f6ef94..715176441c6eb422214dd0c12c28d3619bbae5c9 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\"}" diff --git a/scripts/packaging/tests/systemd-docker-test.sh b/scripts/packaging/tests/systemd-docker-test.sh index 2942f01566c300335e6b858c4b8ca47a7c94a7a3..f964a77c36fb25455ca963af997a6abea4845888 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}