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

Build: Still auto-publish non-release artifacts (#43021) (#43074)

Browse Source 
* Still auto-publish non-release artifacts

* Add version to prerelease bucket path

(cherry picked from commit 4a4d076bb1)
This commit is contained in:
malcolmholmes
2021-12-14 10:00:44 +00:00
committed by GitHub
parent e76d898f22
commit b0152ff2f2
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.yml
+8 -8
View File
@@ -770,7 +770,7 @@ steps:
image: grafana/build-container:1.4.8
name: release-canary-npm-packages
- commands:
- ./bin/grabpl upload-packages --edition oss --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads
- ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads
depends_on:
- end-to-end-tests-dashboards-suite
- end-to-end-tests-panels-suite
@@ -1267,7 +1267,7 @@ steps:
image: grafana/grafana-ci-deploy:1.3.1
name: upload-cdn-assets
- commands:
- ./bin/grabpl upload-packages --edition oss --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads
- ./bin/grabpl upload-packages --edition oss --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads/${DRONE_TAG}
depends_on:
- end-to-end-tests-dashboards-suite
- end-to-end-tests-panels-suite
@@ -1783,7 +1783,7 @@ steps:
image: grafana/grafana-ci-deploy:1.3.1
name: upload-cdn-assets
- commands:
- ./bin/grabpl upload-packages --edition enterprise --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads
- ./bin/grabpl upload-packages --edition enterprise --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads/${DRONE_TAG}
depends_on:
- package
- redis-integration-tests
@@ -1829,7 +1829,7 @@ steps:
image: grafana/grafana-ci-deploy:1.3.1
name: upload-cdn-assets-enterprise2
- commands:
- ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads-enterprise2
- ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads-enterprise2/${DRONE_TAG}
depends_on:
- package-enterprise2
- redis-integration-tests
@@ -3324,7 +3324,7 @@ steps:
image: grafana/grafana-ci-deploy:1.3.1
name: upload-cdn-assets
- commands:
- ./bin/grabpl upload-packages --edition oss --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads
- ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads
depends_on:
- end-to-end-tests-dashboards-suite
- end-to-end-tests-panels-suite
@@ -3798,7 +3798,7 @@ steps:
image: grafana/grafana-ci-deploy:1.3.1
name: upload-cdn-assets
- commands:
- ./bin/grabpl upload-packages --edition enterprise --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads
- ./bin/grabpl upload-packages --edition enterprise --packages-bucket grafana-downloads
depends_on:
- package
- redis-integration-tests
@@ -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 $${PRERELEASE_BUCKET}/artifacts/downloads-enterprise2
- ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket grafana-downloads
depends_on:
- package-enterprise2
- redis-integration-tests
@@ -4001,6 +4001,6 @@ kind: secret
name: prerelease_bucket
---
kind: signature
hmac: 17bd201bc211982f0ee6c2c29631ac7638205e03bc5661e208f0624d86377bb0
hmac: 58af750fc05d94856a7e15d0fd348ff8cf2b606aab0523690e87a209bdc87e2c
...
scripts/drone/steps/lib.star
+4 -1
View File
@@ -927,8 +927,11 @@ def upload_packages_step(edition, ver_mode, is_downstream=False):
if ver_mode == 'test-release':
cmd = './bin/grabpl upload-packages --edition {} '.format(edition) + \
'--packages-bucket grafana-downloads-test'
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)
else:
cmd = './bin/grabpl upload-packages --edition {}{}'.format(edition, packages_bucket)
cmd = './bin/grabpl upload-packages --edition {} --packages-bucket grafana-downloads'.format(edition)
deps = []
if edition in 'enterprise2':