[v8.3.x] Bug: Update upload-cdn command args (#44979)

* CI: Update `GCP_GRAFANA_UPLOAD_KEY` var name (#44303) * Update GCP_KEY var name * Rename GCP_GRAFANA_UPLOAD_KEY for upload-packages * Update grabpl (cherry picked from commit f96a6c10c5) * Update upload-cdn command args (#44966) (cherry picked from commit 67225d9cfc)
2022-02-15 12:07:07 +00:00
parent 027e345231
commit 2adf2a1584
2 changed files with 28 additions and 25 deletions
@@ -788,18 +788,18 @@ steps:
  - end-to-end-tests-smoke-tests-suite
  - end-to-end-tests-various-suite
  environment:
-    GCP_GRAFANA_UPLOAD_KEY:
+    GCP_KEY:
      from_secret: gcp_key
    PRERELEASE_BUCKET:
      from_secret: prerelease_bucket
  image: grafana/grafana-ci-deploy:1.3.1
  name: upload-packages
 - commands:
-  - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets"
+  - ./bin/grabpl upload-cdn --edition oss --src-bucket "grafana-static-assets"
  depends_on:
  - grafana-server
  environment:
-    GCP_GRAFANA_UPLOAD_KEY:
+    GCP_KEY:
      from_secret: gcp_key
    PRERELEASE_BUCKET:
      from_secret: prerelease_bucket
@@ -1248,11 +1248,12 @@ steps:
  image: grafana/build-container:1.4.9
  name: build-storybook
 - commands:
-  - ./bin/grabpl upload-cdn --edition oss --bucket "$${PRERELEASE_BUCKET}"
+  - ./bin/grabpl upload-cdn --edition oss --src-bucket "$${PRERELEASE_BUCKET}" --src-dir
+    artifacts/static-assets
  depends_on:
  - grafana-server
  environment:
-    GCP_GRAFANA_UPLOAD_KEY:
+    GCP_KEY:
      from_secret: gcp_key
    PRERELEASE_BUCKET:
      from_secret: prerelease_bucket
@@ -1266,7 +1267,7 @@ steps:
  - end-to-end-tests-smoke-tests-suite
  - end-to-end-tests-various-suite
  environment:
-    GCP_GRAFANA_UPLOAD_KEY:
+    GCP_KEY:
      from_secret: gcp_key
    PRERELEASE_BUCKET:
      from_secret: prerelease_bucket
@@ -1808,11 +1809,12 @@ steps:
  image: cypress/included:8.4.1
  name: end-to-end-tests-various-suite
 - commands:
-  - ./bin/grabpl upload-cdn --edition enterprise --bucket "$${PRERELEASE_BUCKET}"
+  - ./bin/grabpl upload-cdn --edition enterprise --src-bucket "$${PRERELEASE_BUCKET}"
+    --src-dir artifacts/static-assets
  depends_on:
  - package
  environment:
-    GCP_GRAFANA_UPLOAD_KEY:
+    GCP_KEY:
      from_secret: gcp_key
    PRERELEASE_BUCKET:
      from_secret: prerelease_bucket
@@ -1823,7 +1825,7 @@ steps:
  depends_on:
  - package
  environment:
-    GCP_GRAFANA_UPLOAD_KEY:
+    GCP_KEY:
      from_secret: gcp_key
    PRERELEASE_BUCKET:
      from_secret: prerelease_bucket
@@ -1851,11 +1853,12 @@ steps:
  image: grafana/build-container:1.4.9
  name: package-enterprise2
 - commands:
-  - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "$${PRERELEASE_BUCKET}"
+  - ./bin/grabpl upload-cdn --edition enterprise2 --src-bucket "$${PRERELEASE_BUCKET}"
+    --src-dir artifacts/static-assets
  depends_on:
  - package-enterprise2
  environment:
-    GCP_GRAFANA_UPLOAD_KEY:
+    GCP_KEY:
      from_secret: gcp_key
    PRERELEASE_BUCKET:
      from_secret: prerelease_bucket
@@ -1866,7 +1869,7 @@ steps:
  depends_on:
  - package-enterprise2
  environment:
-    GCP_GRAFANA_UPLOAD_KEY:
+    GCP_KEY:
      from_secret: gcp_key
    PRERELEASE_BUCKET:
      from_secret: prerelease_bucket
@@ -2936,11 +2939,11 @@ steps:
  image: grafana/build-container:1.4.9
  name: build-storybook
 - commands:
-  - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets"
+  - ./bin/grabpl upload-cdn --edition oss --src-bucket "grafana-static-assets"
  depends_on:
  - grafana-server
  environment:
-    GCP_GRAFANA_UPLOAD_KEY:
+    GCP_KEY:
      from_secret: gcp_key
    PRERELEASE_BUCKET:
      from_secret: prerelease_bucket
@@ -2954,7 +2957,7 @@ steps:
  - end-to-end-tests-smoke-tests-suite
  - end-to-end-tests-various-suite
  environment:
-    GCP_GRAFANA_UPLOAD_KEY:
+    GCP_KEY:
      from_secret: gcp_key
    PRERELEASE_BUCKET:
      from_secret: prerelease_bucket
@@ -3431,11 +3434,11 @@ steps:
  image: grafana/build-container:1.4.9
  name: build-storybook
 - commands:
-  - ./bin/grabpl upload-cdn --edition enterprise --bucket "grafana-static-assets"
+  - ./bin/grabpl upload-cdn --edition enterprise --src-bucket "grafana-static-assets"
  depends_on:
  - package
  environment:
-    GCP_GRAFANA_UPLOAD_KEY:
+    GCP_KEY:
      from_secret: gcp_key
    PRERELEASE_BUCKET:
      from_secret: prerelease_bucket
@@ -3446,7 +3449,7 @@ steps:
  depends_on:
  - package
  environment:
-    GCP_GRAFANA_UPLOAD_KEY:
+    GCP_KEY:
      from_secret: gcp_key
    PRERELEASE_BUCKET:
      from_secret: prerelease_bucket
@@ -3474,11 +3477,11 @@ steps:
  image: grafana/build-container:1.4.9
  name: package-enterprise2
 - commands:
-  - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "grafana-static-assets"
+  - ./bin/grabpl upload-cdn --edition enterprise2 --src-bucket "grafana-static-assets"
  depends_on:
  - package-enterprise2
  environment:
-    GCP_GRAFANA_UPLOAD_KEY:
+    GCP_KEY:
      from_secret: gcp_key
    PRERELEASE_BUCKET:
      from_secret: prerelease_bucket
@@ -3489,7 +3492,7 @@ steps:
  depends_on:
  - package-enterprise2
  environment:
-    GCP_GRAFANA_UPLOAD_KEY:
+    GCP_KEY:
      from_secret: gcp_key
    PRERELEASE_BUCKET:
      from_secret: prerelease_bucket
@@ -3918,6 +3921,6 @@ kind: secret
 name: prerelease_bucket
 ---
 kind: signature
-hmac: 0da106a38545ca721d8db7495f74dfedb04cd4535a43efb5dcbb8a76993f20da
+hmac: 03249969373db3fdb895c2eb3ffe3024c95d028ae182e016c41f9ab277b9e6a4

 ...
@@ -305,11 +305,11 @@ def upload_cdn_step(edition, ver_mode):
        'image': publish_image,
        'depends_on': deps,
        'environment': {
-            'GCP_GRAFANA_UPLOAD_KEY': from_secret('gcp_key'),
+            'GCP_KEY': from_secret('gcp_key'),
            'PRERELEASE_BUCKET': from_secret(prerelease_bucket)
        },
        'commands': [
-            './bin/grabpl upload-cdn --edition {} --bucket "{}"'.format(edition, bucket),
+            './bin/grabpl upload-cdn --edition {} --src-bucket "{}"{}'.format(edition, bucket, src_dir),
        ],
    }

@@ -897,7 +897,7 @@ def upload_packages_step(edition, ver_mode, is_downstream=False):
        'image': publish_image,
        'depends_on': deps,
        'environment': {
-            'GCP_GRAFANA_UPLOAD_KEY': from_secret('gcp_key'),
+            'GCP_KEY': from_secret('gcp_key'),
            'PRERELEASE_BUCKET': from_secret('prerelease_bucket'),
        },
        'commands': [cmd, ],