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
This commit is contained in:
Torkel Ödegaard
2021-02-10 08:58:41 +01:00
committed by GitHub
parent 9679b15ef9
commit d6e8e47698
8 changed files with 125 additions and 26 deletions

View File

@ -1,4 +1,4 @@
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': {

View File

@ -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)

View File

@ -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),
])