From a59a89dfb84731ea696038b34a1ff49de685825a Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Wed, 30 Sep 2020 13:36:09 +0200 Subject: [PATCH] Drone: Fix publishing of next NPM packages (#27925) Signed-off-by: Arve Knudsen --- .circleci/config.yml | 2 +- .drone.yml | 10 +++++----- .../grafana-plugin-ci-alpine/scripts/deploy.sh | 2 +- .../grafana-plugin-ci-e2e/scripts/deploy.sh | 2 +- .../docker/grafana-plugin-ci/scripts/deploy.sh | 2 +- scripts/circle-release-next-packages.sh | 18 +----------------- scripts/lib.star | 2 +- 7 files changed, 11 insertions(+), 27 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7fae54549b1..8ad3e6a6d47 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,7 +47,7 @@ commands: - run: name: "Install Grafana build pipeline tool" command: | - VERSION=0.5.13 + VERSION=0.5.14 curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v${VERSION}/grabpl chmod +x grabpl mv grabpl /tmp diff --git a/.drone.yml b/.drone.yml index 373c6c28945..f101fe99b39 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,7 +16,7 @@ steps: - name: initialize image: grafana/build-container:1.2.27 commands: - - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.13/grabpl + - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.14/grabpl - chmod +x grabpl - mkdir -p bin - mv grabpl bin @@ -241,7 +241,7 @@ steps: image: grafana/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.13/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.14/windows/grabpl.exe -OutFile grabpl.exe trigger: event: @@ -265,7 +265,7 @@ steps: - name: initialize image: grafana/build-container:1.2.27 commands: - - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.13/grabpl + - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.14/grabpl - chmod +x grabpl - mkdir -p bin - mv grabpl bin @@ -598,7 +598,7 @@ steps: image: grafana/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.13/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.14/windows/grabpl.exe -OutFile grabpl.exe - name: build-windows-installer image: grafana/ci-wix:0.1.1 @@ -646,7 +646,7 @@ steps: - name: initialize image: grafana/build-container:1.2.27 commands: - - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.13/grabpl + - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.14/grabpl - chmod +x grabpl - mkdir -p bin - mv grabpl bin diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh index 5b7f81aed1b..cd0ec26fa79 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh @@ -43,7 +43,7 @@ get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-l "b4138199aa755ebfe171b57cc46910b13258ace5fbc4eaa099c42607cd0bff32" chmod +x /usr/local/bin/cc-test-reporter -curl -fL -o /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.13/grabpl" +curl -fL -o /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.14/grabpl" apk add --no-cache git # Install Mage diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh index 9cec1143825..b980969b27c 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh @@ -44,7 +44,7 @@ get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-l "b4138199aa755ebfe171b57cc46910b13258ace5fbc4eaa099c42607cd0bff32" chmod 755 /usr/local/bin/cc-test-reporter -wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.13/grabpl" +wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.14/grabpl" chmod +x /usr/local/bin/grabpl # Install Mage diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh index 5b569bdcba4..1c6de19827f 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh @@ -27,7 +27,7 @@ get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-l "b4138199aa755ebfe171b57cc46910b13258ace5fbc4eaa099c42607cd0bff32" chmod +x /usr/local/bin/cc-test-reporter -wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.13/grabpl" +wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.14/grabpl" chmod +x /usr/local/bin/grabpl # Install Mage diff --git a/scripts/circle-release-next-packages.sh b/scripts/circle-release-next-packages.sh index fd7d98665e2..713d6e4c787 100755 --- a/scripts/circle-release-next-packages.sh +++ b/scripts/circle-release-next-packages.sh @@ -64,23 +64,7 @@ else for PACKAGE in "${PACKAGES[@]}" do - start=$(date +%s%N) - yarn workspace @grafana/"${PACKAGE}" run build - runtime=$((($(date +%s%N) - start)/1000000)) - if [ "${DRONE_BRANCH}" == "master" ]; then - exit_if_fail ./scripts/ci-metrics-publisher.sh "grafana.ci-buildtimes.${DRONE_STEP_NAME}.$PACKAGE=$runtime" - elif [ "${CIRCLE_BRANCH}" == "master" ]; then - exit_if_fail ./scripts/ci-metrics-publisher.sh "grafana.ci-buildtimes.${CIRCLE_JOB}.$PACKAGE=$runtime" - fi - - exit_status=$? - if [ $exit_status -eq 0 ]; then - unpublish_previous_canary "$PACKAGE" - else - echo "Packages build failed, skipping canary release" - # TODO: notify on slack/email? - exit - fi + unpublish_previous_canary "$PACKAGE" done echo $'\nPublishing packages' diff --git a/scripts/lib.star b/scripts/lib.star index dddfc1f8214..d0374afc509 100644 --- a/scripts/lib.star +++ b/scripts/lib.star @@ -3,7 +3,7 @@ publish_image = 'grafana/grafana-ci-deploy:1.2.6' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' alpine_image = 'alpine:3.12' windows_image = 'mcr.microsoft.com/windows:1809' -grabpl_version = '0.5.13' +grabpl_version = '0.5.14' git_image = 'alpine/git:v2.26.2' dockerize_version = '0.6.1' wix_image = 'grafana/ci-wix:0.1.1'