From d4428f65c83266d4d1f559d08804d8f02a6266a4 Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Wed, 13 Sep 2023 11:24:47 +0300 Subject: [PATCH] [v10.0.x] Chore: Remove unused secret enterprise2-cdn-path - Nightlies: Push windows artifacts to GCS on main builds (#74792) * Chore: Remove unused secret `enterprise2-cdn-path` (#74741) Remove unused secret # Conflicts: # .drone.yml (cherry picked from commit 49165d35ad09b4368dc2b3f85b681a3f0bd17de5) # Conflicts: # .drone.yml # scripts/drone/vault.star * Nightlies: Push windows artifacts to GCS on main builds (#74709) * Push windows artifacts to gcs * Lint starlark * Sign drone (cherry picked from commit 02f617a20d87e4344a6a6d251f77992241fbfa7e) # Conflicts: # .drone.yml --- .drone.yml | 26 +++++--------------- scripts/drone/steps/lib.star | 46 +++++++++++++----------------------- scripts/drone/vault.star | 15 ------------ 3 files changed, 22 insertions(+), 65 deletions(-) diff --git a/.drone.yml b/.drone.yml index a49bf619fbe..d095a605e26 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2021,6 +2021,10 @@ steps: - gcloud auth activate-service-account --key-file=gcpkey.json - rm gcpkey.json - cp C:\App\nssm-2.24.zip . + - .\grabpl.exe windows-installer --edition oss --build-id $$env:DRONE_BUILD_NUMBER + - $$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0] + - gsutil cp "$$fname" gs://grafana-downloads/oss/main/ + - gsutil cp "$$fname.sha256" gs://grafana-downloads/oss/main/ depends_on: - windows-init environment: @@ -2824,7 +2828,7 @@ steps: - .\grabpl.exe windows-installer --target gs://grafana-prerelease/artifacts/downloads/${DRONE_TAG}/oss/release/grafana-${DRONE_TAG:1}.windows-amd64.zip --edition oss ${DRONE_TAG} - $$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0] - - gsutil cp $$fname gs://grafana-prerelease/artifacts/downloads/${DRONE_TAG}/oss/release/ + - gsutil cp "$$fname" gs://grafana-prerelease/artifacts/downloads/${DRONE_TAG}/oss/release/ - gsutil cp "$$fname.sha256" gs://grafana-prerelease/artifacts/downloads/${DRONE_TAG}/oss/release/ depends_on: - windows-init @@ -4294,24 +4298,6 @@ get: kind: secret name: static_asset_editions --- -get: - name: security_prefix - path: infra/data/ci/grafana-release-eng/enterprise2 -kind: secret -name: enterprise2_security_prefix ---- -get: - name: cdn_path - path: infra/data/ci/grafana-release-eng/enterprise2 -kind: secret -name: enterprise2-cdn-path ---- -get: - name: security_prefix - path: infra/data/ci/grafana-release-eng/enterprise2 -kind: secret -name: enterprise2_security_prefix ---- get: name: gcp_service_account_prod_base64 path: infra/data/ci/grafana-release-eng/rgm @@ -4355,6 +4341,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: bcbe7170dd04ca1254d651b454f451c5da4082de9a90c4f474478b3e685b361d +hmac: 356704a2a281f3e71fd9ceda9ea7d726c60defadf5f66fb67df6376c37532d1b ... diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index b8038a96be7..b5ee71ddec7 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -1255,42 +1255,28 @@ def get_windows_steps(ver_mode, bucket = "%PRERELEASE_BUCKET%"): "cp C:\\App\\nssm-2.24.zip .", ] - if ver_mode in ("release",): + if ver_mode == "release": version = "${DRONE_TAG:1}" installer_commands.extend( [ - ".\\grabpl.exe windows-installer --target {} --edition oss {}".format( - "gs://{}/{}/oss/{}/grafana-{}.windows-amd64.zip".format(gcp_bucket, ver_part, ver_mode, version), - ver_part, - ), + ".\\grabpl.exe windows-installer --target {} --edition oss {}".format("gs://{}/{}/oss/{}/grafana-{}.windows-amd64.zip".format(gcp_bucket, ver_part, ver_mode, version), ver_part), '$$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0]', + 'gsutil cp "$$fname" gs://{}/{}/oss/{}/'.format(gcp_bucket, ver_part, dir), + 'gsutil cp "$$fname.sha256" gs://{}/{}/oss/{}/'.format(gcp_bucket, ver_part, dir), + ], + ) + if ver_mode in ("main"): + installer_commands.extend( + [ + ".\\grabpl.exe windows-installer --edition oss --build-id $$env:DRONE_BUILD_NUMBER", + '$$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0]', + 'gsutil cp "$$fname" gs://{}/oss/{}/'.format(gcp_bucket, dir), + 'gsutil cp "$$fname.sha256" gs://{}/oss/{}/'.format( + gcp_bucket, + dir, + ), ], ) - if ver_mode == "main": - installer_commands.extend( - [ - "gsutil cp $$fname gs://{}/oss/{}/".format(gcp_bucket, dir), - 'gsutil cp "$$fname.sha256" gs://{}/oss/{}/'.format( - gcp_bucket, - dir, - ), - ], - ) - else: - installer_commands.extend( - [ - "gsutil cp $$fname gs://{}/{}/oss/{}/".format( - gcp_bucket, - ver_part, - dir, - ), - 'gsutil cp "$$fname.sha256" gs://{}/{}/oss/{}/'.format( - gcp_bucket, - ver_part, - dir, - ), - ], - ) steps.append( { "name": "build-windows-installer", diff --git a/scripts/drone/vault.star b/scripts/drone/vault.star index 0a2df7b4b41..236ed39e9b7 100644 --- a/scripts/drone/vault.star +++ b/scripts/drone/vault.star @@ -117,21 +117,6 @@ def secrets(): "infra/data/ci/grafana-release-eng/artifact-publishing", "static_asset_editions", ), - vault_secret( - "enterprise2_security_prefix", - "infra/data/ci/grafana-release-eng/enterprise2", - "security_prefix", - ), - vault_secret( - "enterprise2-cdn-path", - "infra/data/ci/grafana-release-eng/enterprise2", - "cdn_path", - ), - vault_secret( - "enterprise2_security_prefix", - "infra/data/ci/grafana-release-eng/enterprise2", - "security_prefix", - ), vault_secret( rgm_gcp_key_base64, "infra/data/ci/grafana-release-eng/rgm",