[v10.1.x] Chore: Remove unused secret enterprise2-cdn-path - Nightlies: Push windows artifacts to GCS on main builds (#74793)
* Nightlies: Push windows artifacts to GCS on main builds (#74709) * Push windows artifacts to gcs * Lint starlark * Sign drone (cherry picked from commit02f617a20d) # Conflicts: # .drone.yml * Chore: Remove unused secret `enterprise2-cdn-path` (#74741) Remove unused secret # Conflicts: # .drone.yml (cherry picked from commit49165d35ad) # Conflicts: # .drone.yml
This commit is contained in:
+6
-8
@@ -2322,6 +2322,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:
|
||||
@@ -3127,7 +3131,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
|
||||
@@ -4662,12 +4666,6 @@ get:
|
||||
kind: secret
|
||||
name: static_asset_editions
|
||||
---
|
||||
get:
|
||||
name: cdn_path
|
||||
path: infra/data/ci/grafana-release-eng/enterprise2
|
||||
kind: secret
|
||||
name: enterprise2-cdn-path
|
||||
---
|
||||
get:
|
||||
name: gcp_service_account_prod_base64
|
||||
path: infra/data/ci/grafana-release-eng/rgm
|
||||
@@ -4711,6 +4709,6 @@ kind: secret
|
||||
name: gcr_credentials
|
||||
---
|
||||
kind: signature
|
||||
hmac: 5a1f875a8dc0bc6d3a520f724350c2f2d7ad30674b9c8175a2ad2e507ffcdc6d
|
||||
hmac: 4c8c617fab70525857216928a8b59fa1c43d4c831b2180fab0dd5885aac32af7
|
||||
|
||||
...
|
||||
|
||||
@@ -1317,42 +1317,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",
|
||||
|
||||
@@ -112,11 +112,6 @@ def secrets():
|
||||
"infra/data/ci/grafana-release-eng/artifact-publishing",
|
||||
"static_asset_editions",
|
||||
),
|
||||
vault_secret(
|
||||
"enterprise2-cdn-path",
|
||||
"infra/data/ci/grafana-release-eng/enterprise2",
|
||||
"cdn_path",
|
||||
),
|
||||
vault_secret(
|
||||
rgm_gcp_key_base64,
|
||||
"infra/data/ci/grafana-release-eng/rgm",
|
||||
|
||||
Reference in New Issue
Block a user