public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Publish non-release CDN assets (#43087) (#43091)

Browse Source 
(cherry picked from commit 555f5a49ce)

Co-authored-by: malcolmholmes <42545407+malcolmholmes@users.noreply.github.com>
This commit is contained in:
Carl Bergquist
2021-12-14 13:26:50 +01:00
committed by GitHub
co-authored by malcolmholmes
parent 41e812bced
commit 92859ce0e5
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/drone/pipelines/main.star
+2 -2
View File
@@ -109,7 +109,7 @@ def get_steps(edition, is_downstream=False):
steps.extend([
release_canary_npm_packages_step(edition),
upload_packages_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
upload_cdn_step(edition=edition)
upload_cdn_step(edition=edition, ver_mode=ver_mode)
])
if include_enterprise2:
@@ -117,7 +117,7 @@ def get_steps(edition, is_downstream=False):
steps.extend([
package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=['linux-x64'], is_downstream=is_downstream),
upload_packages_step(edition=edition2, ver_mode=ver_mode, is_downstream=is_downstream),
upload_cdn_step(edition=edition2)
upload_cdn_step(edition=edition2, ver_mode=ver_mode)
])
windows_steps = get_windows_steps(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream)
scripts/drone/pipelines/release.star
+2 -2
View File
@@ -175,7 +175,7 @@ def get_steps(edition, ver_mode):
build_steps.extend([redis_integration_tests_step(edition=edition2, ver_mode=ver_mode), memcached_integration_tests_step(edition=edition2, ver_mode=ver_mode)])
if should_upload:
publish_steps.append(upload_cdn_step(edition=edition))
publish_steps.append(upload_cdn_step(edition=edition, ver_mode=ver_mode))
publish_steps.append(upload_packages_step(edition=edition, ver_mode=ver_mode))
if should_publish:
publish_step = publish_storybook_step(edition=edition, ver_mode=ver_mode)
@@ -191,7 +191,7 @@ def get_steps(edition, ver_mode):
if include_enterprise2:
publish_steps.extend([
package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=['linux-x64']),
upload_cdn_step(edition=edition2),
upload_cdn_step(edition=edition2, ver_mode=ver_mode),
])
if should_upload:
step = upload_packages_step(edition=edition2, ver_mode=ver_mode)
scripts/drone/steps/lib.star
+6 -1
View File
@@ -292,7 +292,12 @@ def publish_storybook_step(edition, ver_mode):
}
def upload_cdn_step(edition):
def upload_cdn_step(edition, ver_mode):
if ver_mode == "release":
bucket = "$${PRERELEASE_BUCKET}/artifacts/static-assets"
else:
bucket = "grafana-static-assets"
deps = []
if edition in 'enterprise2':
deps.extend([