CDN: Adds uppload to CDN step to drone CI (#30879)

* CDN: Adds uppload to CDN step to drone CI * Bump grabpl * updated sh files * crying * add init dependency * Removed last test to get this to work
2025-02-25 18:55:37 -06:00 · 2021-02-09 14:55:11 +01:00 · 2021-02-09 14:55:11 +01:00 · 99e72e65ab
commit 99e72e65ab
parent 9a11648567
6 changed files with 52 additions and 22 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -17,7 +17,7 @@ steps:
  image: grafana/build-container:1.3.2
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/grabpl
  - chmod +x bin/grabpl
  - ./bin/grabpl verify-drone
  - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
@ -259,7 +259,7 @@ steps:
  image: grafana/build-container:1.3.2
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/grabpl
  - chmod +x bin/grabpl
  - ./bin/grabpl verify-drone
  - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
@ -539,6 +539,16 @@ steps:
  - mysql-integration-tests
  - postgres-integration-tests

+- name: upload-cdn-assets
+  image: grafana/grafana-ci-deploy:1.3.1
+  commands:
+  - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets"
+  environment:
+    GCP_KEY:
+      from_secret: gcp_key
+  depends_on:
+  - package
+
 services:
 - name: postgres
  image: postgres:12.3-alpine
@ -581,7 +591,7 @@ steps:
  image: grafana/ci-wix:0.1.1
  commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/windows/grabpl.exe -OutFile grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/windows/grabpl.exe -OutFile grabpl.exe
  - .\grabpl.exe verify-drone

 - name: build-windows-installer
@ -631,7 +641,7 @@ steps:
  image: grafana/build-container:1.3.2
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/grabpl
  - chmod +x bin/grabpl
  - ./bin/grabpl verify-drone
  environment:
@ -716,7 +726,7 @@ steps:
  image: grafana/build-container:1.3.2
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/grabpl
  - chmod +x bin/grabpl
  - ./bin/grabpl verify-drone
  - ./bin/grabpl verify-version ${DRONE_TAG}
@ -1013,7 +1023,7 @@ steps:
  image: grafana/ci-wix:0.1.1
  commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/windows/grabpl.exe -OutFile grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/windows/grabpl.exe -OutFile grabpl.exe
  - .\grabpl.exe verify-drone

 - name: build-windows-installer
@ -1064,7 +1074,7 @@ steps:
  image: grafana/build-container:1.3.2
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/grabpl
  - chmod +x bin/grabpl
  - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
  - cd grafana-enterprise
@ -1434,7 +1444,7 @@ steps:
  image: grafana/ci-wix:0.1.1
  commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/windows/grabpl.exe -OutFile grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/windows/grabpl.exe -OutFile grabpl.exe
  - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
  - cd grafana-enterprise
  - git checkout ${DRONE_TAG}
@ -1500,7 +1510,7 @@ steps:
  image: grafana/build-container:1.3.2
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/grabpl
  - chmod +x bin/grabpl
  - ./bin/grabpl verify-drone
  - ./bin/grabpl verify-version ${DRONE_TAG}
@ -1605,7 +1615,7 @@ steps:
  image: grafana/build-container:1.3.2
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/grabpl
  - chmod +x bin/grabpl
  - ./bin/grabpl verify-drone
  - ./bin/grabpl verify-version v7.3.0-test
@ -1891,7 +1901,7 @@ steps:
  image: grafana/ci-wix:0.1.1
  commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/windows/grabpl.exe -OutFile grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/windows/grabpl.exe -OutFile grabpl.exe
  - .\grabpl.exe verify-drone

 - name: build-windows-installer
@ -1942,7 +1952,7 @@ steps:
  image: grafana/build-container:1.3.2
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/grabpl
  - chmod +x bin/grabpl
  - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
  - cd grafana-enterprise
@ -2306,7 +2316,7 @@ steps:
  image: grafana/ci-wix:0.1.1
  commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/windows/grabpl.exe -OutFile grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/windows/grabpl.exe -OutFile grabpl.exe
  - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
  - cd grafana-enterprise
  - git checkout master
@ -2372,7 +2382,7 @@ steps:
  image: grafana/build-container:1.3.2
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/grabpl
  - chmod +x bin/grabpl
  - ./bin/grabpl verify-drone
  - ./bin/grabpl verify-version v7.3.0-test
@ -2477,7 +2487,7 @@ steps:
  image: grafana/build-container:1.3.2
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/grabpl
  - chmod +x bin/grabpl
  - ./bin/grabpl verify-drone
  - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
@ -2738,7 +2748,7 @@ steps:
  image: grafana/ci-wix:0.1.1
  commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/windows/grabpl.exe -OutFile grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/windows/grabpl.exe -OutFile grabpl.exe
  - .\grabpl.exe verify-drone

 - name: build-windows-installer
@ -2785,7 +2795,7 @@ steps:
  image: grafana/build-container:1.3.2
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/grabpl
  - chmod +x bin/grabpl
  - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
  - cd grafana-enterprise
@ -3152,7 +3162,7 @@ steps:
  image: grafana/ci-wix:0.1.1
  commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/windows/grabpl.exe -OutFile grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/windows/grabpl.exe -OutFile grabpl.exe
  - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
  - cd grafana-enterprise
  - git checkout $$env:DRONE_BRANCH
--- a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh
+++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh
@ -43,7 +43,7 @@ get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-l
    "b4138199aa755ebfe171b57cc46910b13258ace5fbc4eaa099c42607cd0bff32"
 chmod +x /usr/local/bin/cc-test-reporter

-curl -fL -o /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl"
+curl -fL -o /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/grabpl"

 apk add --no-cache git
 # Install Mage
--- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh
+++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh
@ -44,7 +44,7 @@ get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-l
    "e1be1930379bd169d3a8e82135cf57216ad52ecfaf520b5804f269721e4dcc3d"
 chmod 755 /usr/local/bin/cc-test-reporter

-wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl"
+wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/grabpl"
 chmod +x /usr/local/bin/grabpl

 # Install Mage
--- a/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh
+++ b/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh
@ -27,7 +27,7 @@ get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-l
    "b4138199aa755ebfe171b57cc46910b13258ace5fbc4eaa099c42607cd0bff32"
 chmod +x /usr/local/bin/cc-test-reporter

-wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl"
+wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.37/grabpl"
 chmod +x /usr/local/bin/grabpl

 # Install Mage
--- a/scripts/lib.star
+++ b/scripts/lib.star
@ -1,4 +1,4 @@
-grabpl_version = '0.5.36'
+grabpl_version = '0.5.37'
 build_image = 'grafana/build-container:1.3.2'
 publish_image = 'grafana/grafana-ci-deploy:1.3.1'
 grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
@ -309,6 +309,23 @@ def publish_storybook_step(edition, ver_mode):
        'commands': commands,
    }

+def upload_cdn(edition):
+    return {
+        'name': 'upload-cdn-assets',
+        'image': publish_image,
+        'depends_on': [
+            'package',
+        ],
+        'environment': {
+            'GCP_KEY': {
+                'from_secret': 'gcp_key',
+            },
+        },
+        'commands': [
+             './bin/grabpl upload-cdn --edition {} --bucket "grafana-static-assets"'.format(edition),
+        ],
+    }
+
 def build_backend_step(edition, ver_mode, variants=None, is_downstream=False):
    variants_str = ''
    if variants:
--- a/scripts/master.star
+++ b/scripts/master.star
@ -32,6 +32,7 @@ load(
    'publish_packages_step',
    'notify_pipeline',
    'integration_test_services',
+    'upload_cdn'
 )

 ver_mode = 'master'
@ -79,7 +80,9 @@ def get_steps(edition, is_downstream=False):
        release_canary_npm_packages_step(edition),
        upload_packages_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
        deploy_to_kubernetes_step(edition=edition, is_downstream=is_downstream),
+        upload_cdn(edition)
    ])
+
    if include_enterprise2:
        edition2 = 'enterprise2'
        steps.extend([