From c064c16e8300b770050df1b0a3108322d193a903 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Thu, 8 Oct 2020 09:21:27 +0200 Subject: [PATCH] Drone: Fix test-release pipeline (#28102) Signed-off-by: Arve Knudsen --- .drone.yml | 4 ++-- scripts/lib.star | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6a51d0d7fd4..6705ed9b194 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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 diff --git a/scripts/lib.star b/scripts/lib.star index c1877815cf4..585bfc7ff54 100644 --- a/scripts/lib.star +++ b/scripts/lib.star @@ -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):