From db09c8aa4254c855a8c28e417f0eb4c588459de4 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Mon, 19 Dec 2022 06:58:56 -0800 Subject: [PATCH] rename sign_release.py to release.py (#2385) --- .gitlab-ci.yml | 8 ++++---- .../packaging/release/{sign_release.py => release.py} | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) rename internal/buildscripts/packaging/release/{sign_release.py => release.py} (90%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a24574ff8c3..a3bb3eb90e9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,7 +62,7 @@ fossa: except: - schedules -.sign-release: +.deploy-release: image: '${DOCKER_CICD_REPO}/ci-container:python-3.9' variables: PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" @@ -83,7 +83,7 @@ fossa: echo "$path not found!" exit 1 fi - python3 internal/buildscripts/packaging/release/sign_release.py --force --stage=${STAGE} --path=$path ${OPTIONS:-} + python3 internal/buildscripts/packaging/release/release.py --force --stage=${STAGE} --path=$path ${OPTIONS:-} done .go-cache: @@ -550,7 +550,7 @@ build-push-windows2022-image: release-debs: extends: - .trigger-filter - - .sign-release + - .deploy-release stage: release resource_group: artifactory-deb dependencies: @@ -565,7 +565,7 @@ release-debs: release-rpms: extends: - .trigger-filter - - .sign-release + - .deploy-release stage: release parallel: matrix: diff --git a/internal/buildscripts/packaging/release/sign_release.py b/internal/buildscripts/packaging/release/release.py similarity index 90% rename from internal/buildscripts/packaging/release/sign_release.py rename to internal/buildscripts/packaging/release/release.py index 2569e9e18c7..8c96943e707 100755 --- a/internal/buildscripts/packaging/release/sign_release.py +++ b/internal/buildscripts/packaging/release/release.py @@ -38,13 +38,11 @@ def main(): sys.exit(1) if asset.component == "deb": - # Release deb to artifactory and sign metadata + # Release deb to artifactory release_deb_to_artifactory(asset, args) elif asset.component == "rpm": - # Sign rpm, release to artifactory, and sign metadata release_rpm_to_artifactory(asset, args) elif asset.component == "msi": - # Sign MSI and release to S3 release_msi_to_s3(asset, args) # Release installer scripts to S3