Drone: Fix test-release pipeline (#28102)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen 2020-10-08 09:21:27 +02:00 committed by GitHub
parent 4751923442
commit c064c16e83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions

View File

@ -1703,7 +1703,7 @@ steps:
- name: upload-packages
image: grafana/grafana-ci-deploy:1.2.6
commands:
- ./bin/grabpl upload-packages --edition oss
- ./bin/grabpl upload-packages --edition oss --deb-db-bucket grafana-testing-aptly-db --deb-repo-bucket grafana-testing-repo --packages-bucket grafana-downloads-test --rpm-repo-bucket grafana-testing-repo
environment:
GCP_GRAFANA_UPLOAD_KEY:
from_secret: gcp_key
@ -2023,7 +2023,7 @@ steps:
- name: upload-packages
image: grafana/grafana-ci-deploy:1.2.6
commands:
- ./bin/grabpl upload-packages --edition enterprise
- ./bin/grabpl upload-packages --edition enterprise --deb-db-bucket grafana-testing-aptly-db --deb-repo-bucket grafana-testing-repo --packages-bucket grafana-downloads-test --rpm-repo-bucket grafana-testing-repo
environment:
GCP_GRAFANA_UPLOAD_KEY:
from_secret: gcp_key

View File

@ -750,7 +750,7 @@ def upload_packages_step(edition, ver_mode, is_downstream=False):
if ver_mode == 'test-release':
cmd = './bin/grabpl upload-packages --edition {} '.format(edition) + \
'--deb-db-bucket grafana-testing-aptly-db --deb-repo-bucket grafana-testing-repo --packages-bucket ' + \
'grafana-downloads-test --rpm-repo-bucket grafana-testing-repo --dry-run'
'grafana-downloads-test --rpm-repo-bucket grafana-testing-repo'
else:
cmd = './bin/grabpl upload-packages --edition {}'.format(edition)
@ -780,9 +780,7 @@ def upload_packages_step(edition, ver_mode, is_downstream=False):
'from_secret': 'gpg_key_password',
},
},
'commands': [
'./bin/grabpl upload-packages --edition {}'.format(edition),
],
'commands': [cmd,],
}
def publish_packages_step(edition, is_downstream):