From 0b4b7abce108e12c145f2c08eb7dd5f083c59ae7 Mon Sep 17 00:00:00 2001 From: Philippe Wang Date: Fri, 27 Oct 2023 17:12:48 +0000 Subject: [PATCH] CI: Clean up: rm .gitlab/ci/jobs/publish/common.yml etc Reason: common.yml should be updated or deleted. Currently, it's dead-code that was waiting for protocol Lima. --- .../docker_merge_manifests_release.yml | 2 - .../docker_merge_manifests_test.yml | 2 - .gitlab/ci/jobs/publish/common.yml | 62 ------------------- .../publish/deb_packages_stable_amd64.yml | 13 ---- .../publish/deb_packages_unstable_amd64.yml | 12 ---- .../docker_promote_to_latest_release.yml | 2 - .../publish/docker_promote_to_latest_test.yml | 2 - .gitlab/ci/jobs/publish/gitlab:release.yml | 2 - .gitlab/ci/jobs/publish/opam.yml | 2 - .../publish/rpm_packages_stable_amd64.yml | 13 ---- .../publish/rpm_packages_unstable_amd64.yml | 12 ---- .gitlab/ci/pipelines/beta_release_tag.yml | 4 -- .gitlab/ci/pipelines/master_branch.yml | 4 -- .gitlab/ci/pipelines/release_tag.yml | 2 - .gitlab/ci/pipelines/release_tag_test.yml | 7 --- 15 files changed, 141 deletions(-) delete mode 100644 .gitlab/ci/jobs/publish/common.yml delete mode 100644 .gitlab/ci/jobs/publish/deb_packages_stable_amd64.yml delete mode 100644 .gitlab/ci/jobs/publish/deb_packages_unstable_amd64.yml delete mode 100644 .gitlab/ci/jobs/publish/rpm_packages_stable_amd64.yml delete mode 100644 .gitlab/ci/jobs/publish/rpm_packages_unstable_amd64.yml diff --git a/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_release.yml b/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_release.yml index 35a4d0583d65..c5596a9a272f 100644 --- a/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_release.yml +++ b/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_release.yml @@ -1,5 +1,3 @@ -include: .gitlab/ci/jobs/publish/common.yml - # Note: here we rely on $IMAGE_ARCH_PREFIX to be empty. # Otherwise, $DOCKER_IMAGE_TAG would contain $IMAGE_ARCH_PREFIX too. # $IMAGE_ARCH_PREFIX is only used when building Docker images, diff --git a/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_test.yml b/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_test.yml index 4b65b9fc511e..4e8e6280f614 100644 --- a/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_test.yml +++ b/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_test.yml @@ -1,5 +1,3 @@ -include: .gitlab/ci/jobs/publish/common.yml - # Note: here we rely on $IMAGE_ARCH_PREFIX to be empty. # Otherwise, $DOCKER_IMAGE_TAG would contain $IMAGE_ARCH_PREFIX too. # $IMAGE_ARCH_PREFIX is only used when building Docker images, diff --git a/.gitlab/ci/jobs/publish/common.yml b/.gitlab/ci/jobs/publish/common.yml deleted file mode 100644 index ce09ea8c220a..000000000000 --- a/.gitlab/ci/jobs/publish/common.yml +++ /dev/null @@ -1,62 +0,0 @@ -# -# Templates for building deb & rpm packages. -# -# The AWS resources used for the packaging are managed on https://gitlab.com/nomadic-labs/iac/terraform/octez-packaging -# -# Specifically we use 2 S3 buckets to host the deb and rpm packages and one IAM role which has the ability to -# push changes. The jobs use the OpenID protocol to connect to AWS, receive temporary credentials and assume -# the IAM role. -# -# Details can be found on the following links: -# - https://docs.gitlab.com/ee/ci/cloud_services/index.html#configure-a-conditional-role-with-oidc-claims -# - https://docs.gitlab.com/ee/ci/cloud_services/aws/index.html - -.build_deb_packages: - stage: publish_release - image: ${CI_REGISTRY}/tezos/docker-images/ci-package:latest-ubuntu@sha256:76c894f509b84e106c9d056882c63cb497a2778f7c7dbbd1c73abe2568ee446e - extends: - - .tags_template__no_gcp - needs: - - "build:static-x86_64-linux-binaries" - rules: - # NOTE: These jobs are disabled until the upstream scripts (https://github.com/serokell/tezos-packaging) - # provide support for the lima protocol and drop support for jakarta. - - when: never - variables: - TEZOS_PACKAGING_VERSION: "872ac62526c49bd59b8621ee06c066141e940dbd" - TEZOS_PACKAGING_REPO: "https://github.com/serokell/tezos-packaging" - TEZOS_LICENSE_VERSION: "master" - ROLE_ARN: "arn:aws:iam::623103086665:role/octez-packaging-bucket-writer" - OCTEZ_DEB_BUCKET: "octez-deb-pkgs" - AWS_BUCKET_REGION: "eu-west-1" - PACKAGE_FORMAT: "deb" - ARCH: "amd64" - TEZOS_BINARIES: "octez-binaries/x86_64" - script: - - ./scripts/ci/create_linux_package.sh - - ./scripts/ci/upload_linux_package.sh - -.build_rpm_packages: - stage: publish_release - image: ${CI_REGISTRY}/tezos/docker-images/ci-package:latest-fedora@sha256:35bfacc001e4c5247679e2f79c36ab1c83bd893a1e909c5c1afd1beff44c6895 - extends: - - .tags_template__no_gcp - needs: - - "build:static-x86_64-linux-binaries" - variables: - TEZOS_PACKAGING_VERSION: "872ac62526c49bd59b8621ee06c066141e940dbd" - TEZOS_PACKAGING_REPO: "https://github.com/serokell/tezos-packaging" - TEZOS_LICENSE_VERSION: "master" - ROLE_ARN: "arn:aws:iam::623103086665:role/octez-packaging-bucket-writer" - OCTEZ_RPM_BUCKET: "octez-rpm-pkgs" - AWS_BUCKET_REGION: "eu-west-1" - PACKAGE_FORMAT: "rpm" - ARCH: "amd64" - TEZOS_BINARIES: "octez-binaries/x86_64" - script: - - ./scripts/ci/create_linux_package.sh - - ./scripts/ci/upload_linux_package.sh - rules: - # NOTE: These jobs are disabled until the upstream scripts (https://github.com/serokell/tezos-packaging) - # provide support for the lima protocol and drop support for jakarta. - - when: never diff --git a/.gitlab/ci/jobs/publish/deb_packages_stable_amd64.yml b/.gitlab/ci/jobs/publish/deb_packages_stable_amd64.yml deleted file mode 100644 index 65e480760a2d..000000000000 --- a/.gitlab/ci/jobs/publish/deb_packages_stable_amd64.yml +++ /dev/null @@ -1,13 +0,0 @@ -# -# Deb packages -# - -include: .gitlab/ci/jobs/publish/common.yml - -deb-packages-stable-amd64: - extends: - - .build_deb_packages - variables: - CODENAME: "stable" - before_script: - - export TEZOS_VERSION=$(git tag --points-at HEAD | grep -oE '^v[0-9]{1,3}\.[0-9]{1,3}$' ||:) diff --git a/.gitlab/ci/jobs/publish/deb_packages_unstable_amd64.yml b/.gitlab/ci/jobs/publish/deb_packages_unstable_amd64.yml deleted file mode 100644 index 660a297a3a72..000000000000 --- a/.gitlab/ci/jobs/publish/deb_packages_unstable_amd64.yml +++ /dev/null @@ -1,12 +0,0 @@ -# -# Deb packages -# - -include: .gitlab/ci/jobs/publish/common.yml - -deb-packages-unstable-amd64: - extends: - - .build_deb_packages - variables: - CODENAME: "unstable" - TEZOS_VERSION: v0.0+$CI_COMMIT_SHORT_SHA diff --git a/.gitlab/ci/jobs/publish/docker_promote_to_latest_release.yml b/.gitlab/ci/jobs/publish/docker_promote_to_latest_release.yml index a2402ec01a19..f89939c10ddb 100644 --- a/.gitlab/ci/jobs/publish/docker_promote_to_latest_release.yml +++ b/.gitlab/ci/jobs/publish/docker_promote_to_latest_release.yml @@ -1,5 +1,3 @@ -include: .gitlab/ci/jobs/publish/common.yml - docker:promote_to_latest: extends: - .docker_auth_template diff --git a/.gitlab/ci/jobs/publish/docker_promote_to_latest_test.yml b/.gitlab/ci/jobs/publish/docker_promote_to_latest_test.yml index 2391e1f4d889..bc9b55848b63 100644 --- a/.gitlab/ci/jobs/publish/docker_promote_to_latest_test.yml +++ b/.gitlab/ci/jobs/publish/docker_promote_to_latest_test.yml @@ -1,5 +1,3 @@ -include: .gitlab/ci/jobs/publish/common.yml - docker:promote_to_latest: extends: - .docker_auth_template diff --git a/.gitlab/ci/jobs/publish/gitlab:release.yml b/.gitlab/ci/jobs/publish/gitlab:release.yml index 80b3685f3e4a..4e7e5c4cc493 100644 --- a/.gitlab/ci/jobs/publish/gitlab:release.yml +++ b/.gitlab/ci/jobs/publish/gitlab:release.yml @@ -1,5 +1,3 @@ -include: .gitlab/ci/jobs/publish/common.yml - gitlab:release: # https://gitlab.com/tezos/docker-images/ci-release image: "${CI_REGISTRY}/tezos/docker-images/ci-release:v1.1.0" diff --git a/.gitlab/ci/jobs/publish/opam.yml b/.gitlab/ci/jobs/publish/opam.yml index 26c54b77b47f..6708a7ee424f 100644 --- a/.gitlab/ci/jobs/publish/opam.yml +++ b/.gitlab/ci/jobs/publish/opam.yml @@ -1,5 +1,3 @@ -include: .gitlab/ci/jobs/publish/common.yml - opam:release: extends: - .default_settings_template diff --git a/.gitlab/ci/jobs/publish/rpm_packages_stable_amd64.yml b/.gitlab/ci/jobs/publish/rpm_packages_stable_amd64.yml deleted file mode 100644 index 81085657f7a7..000000000000 --- a/.gitlab/ci/jobs/publish/rpm_packages_stable_amd64.yml +++ /dev/null @@ -1,13 +0,0 @@ -# -# RPM packages -# - -include: .gitlab/ci/jobs/publish/common.yml - -rpm-packages-stable-amd64: - extends: - - .build_rpm_packages - variables: - CODENAME: "stable" - before_script: - - export TEZOS_VERSION=$(git tag --points-at HEAD | grep -oE '^v[0-9]{1,3}\.[0-9]{1,3}$' ||:) diff --git a/.gitlab/ci/jobs/publish/rpm_packages_unstable_amd64.yml b/.gitlab/ci/jobs/publish/rpm_packages_unstable_amd64.yml deleted file mode 100644 index 160ab6cfbfa5..000000000000 --- a/.gitlab/ci/jobs/publish/rpm_packages_unstable_amd64.yml +++ /dev/null @@ -1,12 +0,0 @@ -# -# RPM packages -# - -include: .gitlab/ci/jobs/publish/common.yml - -rpm-packages-unstable-amd64: - extends: - - .build_rpm_packages - variables: - CODENAME: "unstable" - TEZOS_VERSION: v0.0+$CI_COMMIT_SHORT_SHA diff --git a/.gitlab/ci/pipelines/beta_release_tag.yml b/.gitlab/ci/pipelines/beta_release_tag.yml index c2cd70f0813b..0a2b1e4adc7a 100644 --- a/.gitlab/ci/pipelines/beta_release_tag.yml +++ b/.gitlab/ci/pipelines/beta_release_tag.yml @@ -10,7 +10,3 @@ include: # Stage: publish_release_gitlab - .gitlab/ci/jobs/publish/gitlab:release.yml - - # Stage: publish_release - - .gitlab/ci/jobs/publish/deb_packages_stable_amd64.yml - - .gitlab/ci/jobs/publish/rpm_packages_stable_amd64.yml diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index 0233e6e1b485..b814d566d0e3 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -15,9 +15,5 @@ include: # Stage: prepare_release - .gitlab/ci/jobs/prepare_release/docker_merge_manifests_release.yml - # Stage: publish_release - - .gitlab/ci/jobs/publish/deb_packages_unstable_amd64.yml - - .gitlab/ci/jobs/publish/rpm_packages_unstable_amd64.yml - # Stage: manual - .gitlab/ci/jobs/publish/kernel_sdk.yml diff --git a/.gitlab/ci/pipelines/release_tag.yml b/.gitlab/ci/pipelines/release_tag.yml index d097b67f87f0..7622b5601b49 100644 --- a/.gitlab/ci/pipelines/release_tag.yml +++ b/.gitlab/ci/pipelines/release_tag.yml @@ -14,5 +14,3 @@ include: # Stage: publish_release - .gitlab/ci/jobs/publish/opam.yml - - .gitlab/ci/jobs/publish/deb_packages_stable_amd64.yml - - .gitlab/ci/jobs/publish/rpm_packages_stable_amd64.yml diff --git a/.gitlab/ci/pipelines/release_tag_test.yml b/.gitlab/ci/pipelines/release_tag_test.yml index 56d82116a627..4e5f9a5420ea 100644 --- a/.gitlab/ci/pipelines/release_tag_test.yml +++ b/.gitlab/ci/pipelines/release_tag_test.yml @@ -11,10 +11,3 @@ include: # Stage: publish_release_gitlab - .gitlab/ci/jobs/publish/gitlab:release.yml - - # Stage: publish_release - # We cannot test this job because it requires CI variables - # that are not set up outside of the tezos namespace. - # - .gitlab/ci/jobs/publish/opam.yml - - .gitlab/ci/jobs/publish/deb_packages_stable_amd64.yml - - .gitlab/ci/jobs/publish/rpm_packages_stable_amd64.yml -- GitLab