Publish enterprise2 to correct bucket (#43115)

This commit is contained in:
malcolmholmes 2021-12-14 17:43:24 +00:00 committed by GitHub
parent c0ff685d3b
commit 198f947d0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -3873,7 +3873,7 @@ steps:
image: grafana/grafana-ci-deploy:1.3.1 image: grafana/grafana-ci-deploy:1.3.1
name: upload-cdn-assets-enterprise2 name: upload-cdn-assets-enterprise2
- commands: - commands:
- ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket grafana-downloads - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket grafana-downloads-enterprise2
depends_on: depends_on:
- package-enterprise2 - package-enterprise2
- redis-integration-tests - redis-integration-tests
@ -4109,6 +4109,6 @@ kind: secret
name: prerelease_bucket name: prerelease_bucket
--- ---
kind: signature kind: signature
hmac: d408adc68afccd30b8a463ad877b0105d346aafd5e1cc9a3f7a207a5f24a9c64 hmac: f5a6e496e7c71454eebf1a74ee83030fa3bab8dd721a2c228e8de2fdbc1e47de
... ...

View File

@ -933,6 +933,8 @@ def upload_packages_step(edition, ver_mode, is_downstream=False):
elif ver_mode == 'release': elif ver_mode == 'release':
packages_bucket = '$${{PRERELEASE_BUCKET}}/artifacts/downloads{}/${{DRONE_TAG}}'.format(enterprise2_suffix(edition)) packages_bucket = '$${{PRERELEASE_BUCKET}}/artifacts/downloads{}/${{DRONE_TAG}}'.format(enterprise2_suffix(edition))
cmd = './bin/grabpl upload-packages --edition {} --packages-bucket {}'.format(edition, packages_bucket) 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: else:
cmd = './bin/grabpl upload-packages --edition {} --packages-bucket grafana-downloads'.format(edition) cmd = './bin/grabpl upload-packages --edition {} --packages-bucket grafana-downloads'.format(edition)