CDN: Add CDN upload step to enterprise and release pipelines (#31058)

* CDN: Fixing drone CI config

* was in wrong dir when I executed command

* removed whitespace

* Update path

* Update Drone master and enterprise piplelines with CDN Upload

* Update test

* removed whitespace

* Go back to public folder defined

* updated build-pipeline

* Updated drone

* wrong version

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.37/grabpl"
+curl -fL -o /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.38/grabpl"
 
 apk add --no-cache git
 # Install Mage

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.37/grabpl"
+wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.38/grabpl"
 chmod +x /usr/local/bin/grabpl
 
 # Install Mage

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.37/grabpl"
+wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.38/grabpl"
 chmod +x /usr/local/bin/grabpl
 
 # Install Mage

public/views/index-template.html

@@ -299,4 +299,4 @@
       performance.mark('js done blocking');
     </script>
   </body>
-</html>
+</html>
\ No newline at end of file

scripts/lib.star

-grabpl_version = '0.5.37'
+grabpl_version = '0.5.38'
 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'
@@ -310,11 +310,15 @@ def publish_storybook_step(edition, ver_mode):
     }
 
 def upload_cdn(edition):
+    sfx = ''
+    if edition == 'enterprise2':
+        sfx = '-{}'.format(edition)
+
     return {
-        'name': 'upload-cdn-assets',
+        'name': 'upload-cdn-assets' + sfx,
         'image': publish_image,
         'depends_on': [
-            'package',
+            'package' + sfx,
         ],
         'environment': {
             'GCP_GRAFANA_UPLOAD_KEY': {

scripts/master.star

@@ -80,7 +80,7 @@ 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)
+        upload_cdn(edition=edition)
     ])
 
     if include_enterprise2:
@@ -90,6 +90,7 @@ def get_steps(edition, is_downstream=False):
             e2e_tests_server_step(edition=edition2, port=3002),
             e2e_tests_step(edition=edition2, port=3002),
             upload_packages_step(edition=edition2, ver_mode=ver_mode, is_downstream=is_downstream),
+            upload_cdn(edition=edition2)
         ])
 
     windows_steps = get_windows_steps(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream)

scripts/release.star

@@ -31,6 +31,7 @@ load(
     'notify_pipeline',
     'integration_test_services',
     'publish_packages_step',
+    'upload_cdn'
 )
 
 def release_npm_packages_step(edition, ver_mode):
@@ -99,7 +100,9 @@ def get_steps(edition, ver_mode):
         postgres_integration_tests_step(),
         mysql_integration_tests_step(),
     ])
+
     if should_upload:
+        steps.append(upload_cdn(edition=edition))
         steps.append(upload_packages_step(edition=edition, ver_mode=ver_mode))
     if should_publish:
         steps.extend([
@@ -112,6 +115,7 @@ def get_steps(edition, ver_mode):
         edition2 = 'enterprise2'
         steps.extend([
             package_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64']),
+            upload_cdn(edition=edition2),
             e2e_tests_server_step(edition=edition2, port=3002),
             e2e_tests_step(edition=edition2, port=3002),
         ])