From ddbc7b372fa314b9c144452055d401dd45675e67 Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Fri, 7 Feb 2025 10:28:16 +0100 Subject: [PATCH 1/2] packages: Remove current rpm packages from the release page --- .gitlab/ci/pipelines/non_release_tag.yml | 54 ------------------ .gitlab/ci/pipelines/non_release_tag_test.yml | 54 ------------------ .../ci/pipelines/octez_beta_release_tag.yml | 54 ------------------ .gitlab/ci/pipelines/octez_release_tag.yml | 54 ------------------ .../ci/pipelines/octez_release_tag_test.yml | 56 ------------------- .../schedule_master_test_release.yml | 54 ------------------ ci/bin/release_tag.ml | 4 -- 7 files changed, 330 deletions(-) diff --git a/.gitlab/ci/pipelines/non_release_tag.yml b/.gitlab/ci/pipelines/non_release_tag.yml index 6d0ee8c770b9..70778c91b2b0 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -200,58 +200,6 @@ oc.docker:arm64: IMAGE_ARCH_PREFIX: arm64_ EXECUTABLE_FILES: script-inputs/released-executables -oc.build:rpm:amd64: - image: $DISTRIBUTION - stage: build - tags: - - gcp - needs: [] - dependencies: [] - timeout: 90 minutes - before_script: - - . ./scripts/version.sh - - ./scripts/ci/bin_packages_rpm_dependencies.sh - script: - - wget https://sh.rustup.rs/rustup-init.sh - - chmod +x rustup-init.sh - - ./rustup-init.sh --profile minimal --default-toolchain $recommended_rust_version - -y - - . $HOME/.cargo/env - - export OPAMYES="true" - - opam init --bare --disable-sandboxing - - make build-deps - - eval $(opam env) - - make all - - export TIMESTAMP=$(date -d "$CI_PIPELINE_CREATED_AT" '+%Y%m%d%H%M') - - ./scripts/rpm/make_rpm.sh - - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1) - - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2) - - mkdir -p packages/$DISTRO/$RELEASE - - mv octez-*.* packages/$DISTRO/$RELEASE/ - variables: - TARGET: rpm - GROUP: A - OCTEZ_PKGMAINTAINER: nomadic-labs - BLST_PORTABLE: "yes" - ARCH: amd64 - CARGO_HOME: /root/.cargo - CARGO_NET_OFFLINE: "false" - artifacts: - name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG - expire_in: 1 day - paths: - - packages/ - when: on_success - retry: - max: 1 - when: - - stuck_or_timeout_failure - parallel: - matrix: - - DISTRIBUTION: - - fedora:39 - - rockylinux:9.3 - oc.install-release-homebrew: image: debian:bookworm stage: build @@ -302,7 +250,6 @@ gitlab:publish: - 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 @@ -311,7 +258,6 @@ gitlab:publish: - 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 diff --git a/.gitlab/ci/pipelines/non_release_tag_test.yml b/.gitlab/ci/pipelines/non_release_tag_test.yml index 1eea2af87a95..a90178f34725 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -200,58 +200,6 @@ oc.docker:arm64: IMAGE_ARCH_PREFIX: arm64_ EXECUTABLE_FILES: script-inputs/released-executables script-inputs/experimental-executables -oc.build:rpm:amd64: - image: $DISTRIBUTION - stage: build - tags: - - gcp - needs: [] - dependencies: [] - timeout: 90 minutes - before_script: - - . ./scripts/version.sh - - ./scripts/ci/bin_packages_rpm_dependencies.sh - script: - - wget https://sh.rustup.rs/rustup-init.sh - - chmod +x rustup-init.sh - - ./rustup-init.sh --profile minimal --default-toolchain $recommended_rust_version - -y - - . $HOME/.cargo/env - - export OPAMYES="true" - - opam init --bare --disable-sandboxing - - make build-deps - - eval $(opam env) - - make all - - export TIMESTAMP=$(date -d "$CI_PIPELINE_CREATED_AT" '+%Y%m%d%H%M') - - ./scripts/rpm/make_rpm.sh - - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1) - - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2) - - mkdir -p packages/$DISTRO/$RELEASE - - mv octez-*.* packages/$DISTRO/$RELEASE/ - variables: - TARGET: rpm - GROUP: A - OCTEZ_PKGMAINTAINER: nomadic-labs - BLST_PORTABLE: "yes" - ARCH: amd64 - CARGO_HOME: /root/.cargo - CARGO_NET_OFFLINE: "false" - artifacts: - name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG - expire_in: 1 day - paths: - - packages/ - when: on_success - retry: - max: 1 - when: - - stuck_or_timeout_failure - parallel: - matrix: - - DISTRIBUTION: - - fedora:39 - - rockylinux:9.3 - oc.install-release-homebrew: image: debian:bookworm stage: build @@ -302,7 +250,6 @@ gitlab:publish: - 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 @@ -311,7 +258,6 @@ gitlab:publish: - 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 diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml index 3a3770159b17..be1a4d7dbca8 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -200,58 +200,6 @@ oc.docker:arm64: IMAGE_ARCH_PREFIX: arm64_ EXECUTABLE_FILES: script-inputs/released-executables -oc.build:rpm:amd64: - image: $DISTRIBUTION - stage: build - tags: - - gcp - needs: [] - dependencies: [] - timeout: 90 minutes - before_script: - - . ./scripts/version.sh - - ./scripts/ci/bin_packages_rpm_dependencies.sh - script: - - wget https://sh.rustup.rs/rustup-init.sh - - chmod +x rustup-init.sh - - ./rustup-init.sh --profile minimal --default-toolchain $recommended_rust_version - -y - - . $HOME/.cargo/env - - export OPAMYES="true" - - opam init --bare --disable-sandboxing - - make build-deps - - eval $(opam env) - - make all - - export TIMESTAMP=$(date -d "$CI_PIPELINE_CREATED_AT" '+%Y%m%d%H%M') - - ./scripts/rpm/make_rpm.sh - - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1) - - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2) - - mkdir -p packages/$DISTRO/$RELEASE - - mv octez-*.* packages/$DISTRO/$RELEASE/ - variables: - TARGET: rpm - GROUP: A - OCTEZ_PKGMAINTAINER: nomadic-labs - BLST_PORTABLE: "yes" - ARCH: amd64 - CARGO_HOME: /root/.cargo - CARGO_NET_OFFLINE: "false" - artifacts: - name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG - expire_in: 1 day - paths: - - packages/ - when: on_success - retry: - max: 1 - when: - - stuck_or_timeout_failure - parallel: - matrix: - - DISTRIBUTION: - - fedora:39 - - rockylinux:9.3 - oc.install-release-homebrew: image: debian:bookworm stage: build @@ -302,7 +250,6 @@ gitlab:release: - 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 @@ -311,7 +258,6 @@ gitlab:release: - 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 diff --git a/.gitlab/ci/pipelines/octez_release_tag.yml b/.gitlab/ci/pipelines/octez_release_tag.yml index 766e69998aad..5a1f79504e85 100644 --- a/.gitlab/ci/pipelines/octez_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_release_tag.yml @@ -201,58 +201,6 @@ oc.docker:arm64: IMAGE_ARCH_PREFIX: arm64_ EXECUTABLE_FILES: script-inputs/released-executables -oc.build:rpm:amd64: - image: $DISTRIBUTION - stage: build - tags: - - gcp - needs: [] - dependencies: [] - timeout: 90 minutes - before_script: - - . ./scripts/version.sh - - ./scripts/ci/bin_packages_rpm_dependencies.sh - script: - - wget https://sh.rustup.rs/rustup-init.sh - - chmod +x rustup-init.sh - - ./rustup-init.sh --profile minimal --default-toolchain $recommended_rust_version - -y - - . $HOME/.cargo/env - - export OPAMYES="true" - - opam init --bare --disable-sandboxing - - make build-deps - - eval $(opam env) - - make all - - export TIMESTAMP=$(date -d "$CI_PIPELINE_CREATED_AT" '+%Y%m%d%H%M') - - ./scripts/rpm/make_rpm.sh - - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1) - - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2) - - mkdir -p packages/$DISTRO/$RELEASE - - mv octez-*.* packages/$DISTRO/$RELEASE/ - variables: - TARGET: rpm - GROUP: A - OCTEZ_PKGMAINTAINER: nomadic-labs - BLST_PORTABLE: "yes" - ARCH: amd64 - CARGO_HOME: /root/.cargo - CARGO_NET_OFFLINE: "false" - artifacts: - name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG - expire_in: 1 day - paths: - - packages/ - when: on_success - retry: - max: 1 - when: - - stuck_or_timeout_failure - parallel: - matrix: - - DISTRIBUTION: - - fedora:39 - - rockylinux:9.3 - oc.install-release-homebrew: image: debian:bookworm stage: build @@ -303,7 +251,6 @@ gitlab:release: - 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 @@ -312,7 +259,6 @@ gitlab:release: - 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 diff --git a/.gitlab/ci/pipelines/octez_release_tag_test.yml b/.gitlab/ci/pipelines/octez_release_tag_test.yml index 25550108ac8e..05652acda3bf 100644 --- a/.gitlab/ci/pipelines/octez_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_release_tag_test.yml @@ -201,58 +201,6 @@ oc.docker:arm64: IMAGE_ARCH_PREFIX: arm64_ EXECUTABLE_FILES: script-inputs/released-executables script-inputs/experimental-executables -oc.build:rpm:amd64: - image: $DISTRIBUTION - stage: build - tags: - - gcp - needs: [] - dependencies: [] - timeout: 90 minutes - before_script: - - . ./scripts/version.sh - - ./scripts/ci/bin_packages_rpm_dependencies.sh - script: - - wget https://sh.rustup.rs/rustup-init.sh - - chmod +x rustup-init.sh - - ./rustup-init.sh --profile minimal --default-toolchain $recommended_rust_version - -y - - . $HOME/.cargo/env - - export OPAMYES="true" - - opam init --bare --disable-sandboxing - - make build-deps - - eval $(opam env) - - make all - - export TIMESTAMP=$(date -d "$CI_PIPELINE_CREATED_AT" '+%Y%m%d%H%M') - - ./scripts/rpm/make_rpm.sh - - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1) - - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2) - - mkdir -p packages/$DISTRO/$RELEASE - - mv octez-*.* packages/$DISTRO/$RELEASE/ - variables: - TARGET: rpm - GROUP: A - OCTEZ_PKGMAINTAINER: nomadic-labs - BLST_PORTABLE: "yes" - ARCH: amd64 - CARGO_HOME: /root/.cargo - CARGO_NET_OFFLINE: "false" - artifacts: - name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG - expire_in: 1 day - paths: - - packages/ - when: on_success - retry: - max: 1 - when: - - stuck_or_timeout_failure - parallel: - matrix: - - DISTRIBUTION: - - fedora:39 - - rockylinux:9.3 - oc.install-release-homebrew: image: debian:bookworm stage: build @@ -303,7 +251,6 @@ gitlab:release: - 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 @@ -312,7 +259,6 @@ gitlab:release: - 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 @@ -1193,12 +1139,10 @@ publish:release-page: - oc.docker:ci:amd64 - oc.build:static-x86_64-linux-binaries - oc.build:static-arm64-linux-binaries - - oc.build:rpm:amd64 dependencies: - oc.docker:ci:amd64 - oc.build:static-x86_64-linux-binaries - oc.build:static-arm64-linux-binaries - - oc.build:rpm:amd64 allow_failure: true timeout: 60 minutes script: diff --git a/.gitlab/ci/pipelines/schedule_master_test_release.yml b/.gitlab/ci/pipelines/schedule_master_test_release.yml index 7f027549d5ce..25148f76c145 100644 --- a/.gitlab/ci/pipelines/schedule_master_test_release.yml +++ b/.gitlab/ci/pipelines/schedule_master_test_release.yml @@ -200,58 +200,6 @@ oc.docker:arm64: IMAGE_ARCH_PREFIX: arm64_ EXECUTABLE_FILES: script-inputs/released-executables script-inputs/experimental-executables -oc.build:rpm:amd64: - image: $DISTRIBUTION - stage: build - tags: - - gcp - needs: [] - dependencies: [] - timeout: 90 minutes - before_script: - - . ./scripts/version.sh - - ./scripts/ci/bin_packages_rpm_dependencies.sh - script: - - wget https://sh.rustup.rs/rustup-init.sh - - chmod +x rustup-init.sh - - ./rustup-init.sh --profile minimal --default-toolchain $recommended_rust_version - -y - - . $HOME/.cargo/env - - export OPAMYES="true" - - opam init --bare --disable-sandboxing - - make build-deps - - eval $(opam env) - - make all - - export TIMESTAMP=$(date -d "$CI_PIPELINE_CREATED_AT" '+%Y%m%d%H%M') - - ./scripts/rpm/make_rpm.sh - - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1) - - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2) - - mkdir -p packages/$DISTRO/$RELEASE - - mv octez-*.* packages/$DISTRO/$RELEASE/ - variables: - TARGET: rpm - GROUP: A - OCTEZ_PKGMAINTAINER: nomadic-labs - BLST_PORTABLE: "yes" - ARCH: amd64 - CARGO_HOME: /root/.cargo - CARGO_NET_OFFLINE: "false" - artifacts: - name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG - expire_in: 1 day - paths: - - packages/ - when: on_success - retry: - max: 1 - when: - - stuck_or_timeout_failure - parallel: - matrix: - - DISTRIBUTION: - - fedora:39 - - rockylinux:9.3 - oc.install-release-homebrew: image: debian:bookworm stage: build @@ -302,7 +250,6 @@ gitlab:publish: - 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 @@ -311,7 +258,6 @@ gitlab:publish: - 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 diff --git a/ci/bin/release_tag.ml b/ci/bin/release_tag.ml index ccc26ba61ea7..62b39b7b0278 100644 --- a/ci/bin/release_tag.ml +++ b/ci/bin/release_tag.ml @@ -167,7 +167,6 @@ 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, @@ -183,7 +182,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_rpm_amd64; Artifacts job_build_ubuntu_package_current_a; Artifacts job_build_debian_package_current_a; Artifacts job_build_ubuntu_package_current_b; @@ -212,7 +210,6 @@ let octez_jobs ?(test = false) release_tag_pipeline_type = [ Artifacts job_static_x86_64_release; Artifacts job_static_arm64_release; - Artifacts job_build_rpm_amd64; ]) ~variables:[("S3_BUCKET", "release-page-test.nomadic-labs.com")] ["./scripts/releases/publish_release_page.sh"] @@ -255,7 +252,6 @@ let octez_jobs ?(test = false) release_tag_pipeline_type = job_static_arm64_release; job_docker_amd64; job_docker_arm64; - job_build_rpm_amd64; job_build_homebrew_release; job_docker_merge; job_gitlab_release_or_publish; -- GitLab From c5a1ae8e0e7fe0729efd9d49d4686632aac3679e Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Fri, 7 Feb 2025 11:21:56 +0100 Subject: [PATCH 2/2] packages: remove current rpm packages from scheduled and merge pipelines --- .gitlab/ci/pipelines/before_merging.yml | 55 ------------- .gitlab/ci/pipelines/merge_train.yml | 55 ------------- .../ci/pipelines/schedule_extended_test.yml | 53 ------------- ci/bin/code_verification.ml | 23 +----- ci/bin/common.ml | 77 ------------------- 5 files changed, 2 insertions(+), 261 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 8ab6290e6166..04889475f0bf 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -5263,61 +5263,6 @@ oc.docker:arm64: IMAGE_ARCH_PREFIX: arm64_ EXECUTABLE_FILES: script-inputs/released-executables script-inputs/experimental-executables -oc.build:rpm:amd64: - image: $DISTRIBUTION - stage: manual - tags: - - gcp - rules: - - when: manual - allow_failure: true - needs: [] - dependencies: [] - timeout: 90 minutes - before_script: - - . ./scripts/version.sh - - ./scripts/ci/bin_packages_rpm_dependencies.sh - script: - - wget https://sh.rustup.rs/rustup-init.sh - - chmod +x rustup-init.sh - - ./rustup-init.sh --profile minimal --default-toolchain $recommended_rust_version - -y - - . $HOME/.cargo/env - - export OPAMYES="true" - - opam init --bare --disable-sandboxing - - make build-deps - - eval $(opam env) - - make all - - export TIMESTAMP=$(date -d "$CI_PIPELINE_CREATED_AT" '+%Y%m%d%H%M') - - ./scripts/rpm/make_rpm.sh - - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1) - - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2) - - mkdir -p packages/$DISTRO/$RELEASE - - mv octez-*.* packages/$DISTRO/$RELEASE/ - variables: - TARGET: rpm - GROUP: A - OCTEZ_PKGMAINTAINER: nomadic-labs - BLST_PORTABLE: "yes" - ARCH: amd64 - CARGO_HOME: /root/.cargo - CARGO_NET_OFFLINE: "false" - artifacts: - name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG - expire_in: 1 day - paths: - - packages/ - when: on_success - retry: - max: 1 - when: - - stuck_or_timeout_failure - parallel: - matrix: - - DISTRIBUTION: - - fedora:39 - - rockylinux:9.3 - oc.script.docker_verify_image_arm64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 stage: manual diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index 4bffeb2e7d09..4ad26d6c89ff 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -5226,61 +5226,6 @@ oc.docker:arm64: IMAGE_ARCH_PREFIX: arm64_ EXECUTABLE_FILES: script-inputs/released-executables script-inputs/experimental-executables -oc.build:rpm:amd64: - image: $DISTRIBUTION - stage: manual - tags: - - gcp - rules: - - when: manual - allow_failure: true - needs: [] - dependencies: [] - timeout: 90 minutes - before_script: - - . ./scripts/version.sh - - ./scripts/ci/bin_packages_rpm_dependencies.sh - script: - - wget https://sh.rustup.rs/rustup-init.sh - - chmod +x rustup-init.sh - - ./rustup-init.sh --profile minimal --default-toolchain $recommended_rust_version - -y - - . $HOME/.cargo/env - - export OPAMYES="true" - - opam init --bare --disable-sandboxing - - make build-deps - - eval $(opam env) - - make all - - export TIMESTAMP=$(date -d "$CI_PIPELINE_CREATED_AT" '+%Y%m%d%H%M') - - ./scripts/rpm/make_rpm.sh - - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1) - - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2) - - mkdir -p packages/$DISTRO/$RELEASE - - mv octez-*.* packages/$DISTRO/$RELEASE/ - variables: - TARGET: rpm - GROUP: A - OCTEZ_PKGMAINTAINER: nomadic-labs - BLST_PORTABLE: "yes" - ARCH: amd64 - CARGO_HOME: /root/.cargo - CARGO_NET_OFFLINE: "false" - artifacts: - name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG - expire_in: 1 day - paths: - - packages/ - when: on_success - retry: - max: 1 - when: - - stuck_or_timeout_failure - parallel: - matrix: - - DISTRIBUTION: - - fedora:39 - - rockylinux:9.3 - oc.script.docker_verify_image_arm64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 stage: manual diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index 4ac1a337004c..ad9682e1162c 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -902,59 +902,6 @@ build-layer1-profiling: paths: - ./octez-binaries/x86_64/octez-node -oc.build:rpm:amd64: - image: $DISTRIBUTION - stage: build - tags: - - gcp - needs: [] - dependencies: [] - timeout: 90 minutes - interruptible: false - before_script: - - . ./scripts/version.sh - - ./scripts/ci/bin_packages_rpm_dependencies.sh - script: - - wget https://sh.rustup.rs/rustup-init.sh - - chmod +x rustup-init.sh - - ./rustup-init.sh --profile minimal --default-toolchain $recommended_rust_version - -y - - . $HOME/.cargo/env - - export OPAMYES="true" - - opam init --bare --disable-sandboxing - - make build-deps - - eval $(opam env) - - make all - - export TIMESTAMP=$(date -d "$CI_PIPELINE_CREATED_AT" '+%Y%m%d%H%M') - - ./scripts/rpm/make_rpm.sh - - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1) - - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2) - - mkdir -p packages/$DISTRO/$RELEASE - - mv octez-*.* packages/$DISTRO/$RELEASE/ - variables: - TARGET: rpm - GROUP: A - OCTEZ_PKGMAINTAINER: nomadic-labs - BLST_PORTABLE: "yes" - ARCH: amd64 - CARGO_HOME: /root/.cargo - CARGO_NET_OFFLINE: "false" - artifacts: - name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG - expire_in: 1 day - paths: - - packages/ - when: on_success - retry: - max: 1 - when: - - stuck_or_timeout_failure - parallel: - matrix: - - DISTRIBUTION: - - fedora:39 - - rockylinux:9.3 - opam:prepare: image: ${ci_image_name}/prebuild:${ci_image_tag} stage: packaging diff --git a/ci/bin/code_verification.ml b/ci/bin/code_verification.ml index 2fda31ebc7d7..ecb17e6476fa 100644 --- a/ci/bin/code_verification.ml +++ b/ci/bin/code_verification.ml @@ -670,10 +670,7 @@ let jobs pipeline_type = [allow_failure: true]. *) let bin_packages_jobs = match pipeline_type with - | Schedule_extended_test -> - let job_build_rpm_amd64 = job_build_rpm_amd64 () in - [job_build_rpm_amd64] - | Before_merging | Merge_train -> [] + | Schedule_extended_test | Before_merging | Merge_train -> [] in let wasm_runtime_check : tezos_job = job @@ -1960,18 +1957,6 @@ let jobs pipeline_type = ~rules:(make_rules ~changes:changeset_docker_files ~manual:Yes ()) Test_manual in - let job_build_rpm_amd64_manual = - job_build_bin_package - ~__POS__ - ~name:"oc.build:rpm:amd64" - ~target:Rpm - ~group:A - ~arch:Tezos_ci.Amd64 - ~rules:(make_rules ~manual:Yes ()) - ~dependencies:(Dependent []) - ~stage:Stages.manual - () - in let job_docker_verify_test_amd64 : tezos_job = job_docker_authenticated ~__POS__ @@ -1993,11 +1978,7 @@ let jobs pipeline_type = ["./scripts/ci/docker_verify_signature.sh"] in let jobs = - [ - job_docker_amd64_test_manual; - job_docker_arm64_test_manual; - job_build_rpm_amd64_manual; - ] + [job_docker_amd64_test_manual; job_docker_arm64_test_manual] @ [job_docker_verify_test_arm64; job_docker_verify_test_amd64] in if pipeline_type = Merge_train then jobs diff --git a/ci/bin/common.ml b/ci/bin/common.ml index a1a641029e23..b852e3e3d93c 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -793,83 +793,6 @@ type bin_package_group = A | B let bin_package_image = Image.mk_external ~image_path:"$DISTRIBUTION" -let job_build_bin_package ?dependencies ?rules ~__POS__ ~name - ?(stage = Stages.build) ~arch ~target ~group () : tezos_job = - let arch_string = arch_to_string_alt arch in - let target_string = match target with Rpm -> "rpm" in - let image = bin_package_image in - let parallel = - let distributions = - match target with Rpm -> ["fedora:39"; "rockylinux:9.3"] - in - Matrix [[("DISTRIBUTION", distributions)]] - in - let timeout = match target with Rpm -> Some (Minutes 90) in - let group_string = match group with A -> "A" | B -> "B" in - let artifacts = - artifacts - ~expire_in:(Duration (Days 1)) - ~when_:On_success - ~name:"${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG" - ["packages/"] - in - let before_script = - before_script - ~source_version:true - (match target with - | Rpm -> ["./scripts/ci/bin_packages_rpm_dependencies.sh"]) - in - job - ?timeout - ?rules - ?dependencies - ~__POS__ - ~name - ~arch - ~image - ~stage - ~retry:Gitlab_ci.Types.{max = 1; when_ = [Stuck_or_timeout_failure]} - ~variables: - [ - ("TARGET", target_string); - ("GROUP", group_string); - ("OCTEZ_PKGMAINTAINER", "nomadic-labs"); - ("BLST_PORTABLE", "yes"); - ("ARCH", arch_string); - ("CARGO_HOME", "/root/.cargo"); - ] - ~artifacts - ~parallel - ~before_script - [ - "wget https://sh.rustup.rs/rustup-init.sh"; - "chmod +x rustup-init.sh"; - "./rustup-init.sh --profile minimal --default-toolchain \ - $recommended_rust_version -y"; - ". $HOME/.cargo/env"; - "export OPAMYES=\"true\""; - "opam init --bare --disable-sandboxing"; - "make build-deps"; - "eval $(opam env)"; - "make all"; - "export TIMESTAMP=$(date -d \"$CI_PIPELINE_CREATED_AT\" '+%Y%m%d%H%M')"; - "./scripts/rpm/make_rpm.sh"; - "DISTRO=$(echo \"$DISTRIBUTION\" | cut -d':' -f1)"; - "RELEASE=$(echo \"$DISTRIBUTION\" | cut -d':' -f2)"; - "mkdir -p packages/$DISTRO/$RELEASE"; - "mv octez-*.* packages/$DISTRO/$RELEASE/"; - ] - |> enable_networked_cargo - -let job_build_rpm_amd64 : unit -> tezos_job = - job_build_bin_package - ~__POS__ - ~name:"oc.build:rpm:amd64" - ~target:Rpm - ~group:A - ~arch:Amd64 - ~dependencies:(Dependent []) - let job_build_dynamic_binaries ?rules ~__POS__ ~arch ?retry ?high_cpu ?(release = false) ?dependencies () = let arch_string = arch_to_string arch in -- GitLab