Publish enterprise2 to correct bucket (#43115) (#43119)

(cherry picked from commit 198f947d0b)

Co-authored-by: malcolmholmes <42545407+malcolmholmes@users.noreply.github.com>
This commit is contained in:
Carl Bergquist
2021-12-14 19:01:47 +01:00
committed by GitHub
co-authored by malcolmholmes
parent 89607fbdb3
commit ebcab2136c
2 changed files with 4 additions and 2 deletions
+2 -2
View File
@@ -3844,7 +3844,7 @@ steps:
image: grafana/grafana-ci-deploy:1.3.1
name: upload-cdn-assets-enterprise2
- commands:
- ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket grafana-downloads
- ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket grafana-downloads-enterprise2
depends_on:
- package-enterprise2
- redis-integration-tests
@@ -4001,6 +4001,6 @@ kind: secret
name: prerelease_bucket
---
kind: signature
hmac: 2677a57381f4801629ff230e97b7859207a61bcb3a9340fee836bb18a04b95e7
hmac: 18aa4bedb40fcb3c91faf357a5ecba3b9903bc9e4fb04a29fbbd0e1c0ae7a349
...
+2
View File
@@ -934,6 +934,8 @@ def upload_packages_step(edition, ver_mode, is_downstream=False):
elif ver_mode == 'release':
packages_bucket = '$${{PRERELEASE_BUCKET}}/artifacts/downloads{}/${{DRONE_TAG}}'.format(enterprise2_suffix(edition))
cmd = './bin/grabpl upload-packages --edition {} --packages-bucket {}'.format(edition, packages_bucket)
elif edition == 'enterprise2':
cmd = './bin/grabpl upload-packages --edition {} --packages-bucket grafana-downloads-enterprise2'.format(edition)
else:
cmd = './bin/grabpl upload-packages --edition {} --packages-bucket grafana-downloads'.format(edition)