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

Build: publish artifacts to correct GCS buckets for main and release builds (#42537)

Browse Source 
* Fix main build (deb downloads)

* Direct cdn assets to correct bucket
This commit is contained in:
malcolmholmes
2021-11-30 16:40:24 +00:00
committed by GitHub
parent 4f2ae190a2
commit 4d55c6fe51
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/drone/steps/lib.star
+10 -4
View File
@@ -289,7 +289,12 @@ def publish_storybook_step(edition, ver_mode):
}
def upload_cdn_step(edition):
def upload_cdn_step(edition, ver_mode):
if ver_mode == "main":
bucket = "grafana-static-assets"
else:
bucket = "$${PRERELEASE_BUCKET}/artifacts/static-assets"
return {
'name': 'upload-cdn-assets' + enterprise2_suffix(edition),
'image': publish_image,
@@ -301,7 +306,7 @@ def upload_cdn_step(edition):
'PRERELEASE_BUCKET': from_secret(prerelease_bucket)
},
'commands': [
'./bin/grabpl upload-cdn --edition {} --bucket "$${{PRERELEASE_BUCKET}}/artifacts/static-assets"'.format(edition),
'./bin/grabpl upload-cdn --edition {} --bucket "{}"'.format(edition, bucket),
],
}
@@ -911,12 +916,13 @@ def upload_packages_step(edition, ver_mode, is_downstream=False):
if ver_mode == 'main' and edition in ('enterprise', 'enterprise2') and not is_downstream:
return None
packages_bucket = ' --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads' + enterprise2_suffix(edition)
if ver_mode == 'test-release':
cmd = './bin/grabpl upload-packages --edition {} '.format(edition) + \
'--packages-bucket grafana-downloads-test'
elif ver_mode == 'main':
cmd = './bin/grabpl upload-packages --edition {} --packages-bucket grafana-downloads'.format(edition)
else:
packages_bucket = ' --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads' + enterprise2_suffix(edition)
cmd = './bin/grabpl upload-packages --edition {}{}'.format(edition, packages_bucket)
dependencies = [