From d823b26b06b2f50101671547b9109021f0d797af Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Thu, 13 Aug 2020 16:04:34 +0200 Subject: [PATCH] Drone/CircleCI: Upgrade build pipeline tool (#26854) * Drone/CircleCI: Upgrade build pipeline tool Signed-off-by: Arve Knudsen * Upgrade build pipeline tool in Docker scripts Signed-off-by: Arve Knudsen --- .circleci/config.yml | 2 +- .drone.yml | 4 ++-- .../docker/grafana-plugin-ci-alpine/scripts/deploy.sh | 2 +- .../docker/grafana-plugin-ci-e2e/scripts/deploy.sh | 4 ++-- .../docker/grafana-plugin-ci/scripts/deploy.sh | 4 ++-- scripts/lib.star | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dda70c0ee5f..b1f00edf9dc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -45,7 +45,7 @@ commands: - run: name: "Install Grafana build pipeline tool" command: | - VERSION=0.4.25 + VERSION=0.5.0 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 3b8490b0fb2..cccc8871aa2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,7 +27,7 @@ steps: - cp -r $(yarn cache dir) yarn-cache environment: DOCKERIZE_VERSION: 0.6.1 - GRABPL_VERSION: 0.4.25 + GRABPL_VERSION: 0.5.0 - name: lint-backend image: grafana/build-container:1.2.24 @@ -264,7 +264,7 @@ steps: - cp -r $(yarn cache dir) yarn-cache environment: DOCKERIZE_VERSION: 0.6.1 - GRABPL_VERSION: 0.4.25 + GRABPL_VERSION: 0.5.0 - name: lint-backend image: grafana/build-container:1.2.24 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 2a253f8d78b..516be061a3d 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 -wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.4.4/grabpl" +wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.0/grabpl" chmod +x /usr/local/bin/grabpl apk add --no-cache git 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 dcbc4d81afc..435e3cefee2 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 @@ -43,7 +43,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.4.4/grabpl" +wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.0/grabpl" chmod +x /usr/local/bin/grabpl # Install Mage @@ -52,7 +52,7 @@ git clone https://github.com/magefile/mage.git /tmp/mage pushd /tmp/mage && go run bootstrap.go && popd mv $HOME/go/bin/mage /usr/local/bin # Cleanup after yourself -/bin/rm -rf /tmp/mage +/bin/rm -rf /tmp/mage /bin/rm -rf $HOME/go # Install grafana-toolkit deps 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 be89bb48536..728271b3189 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.4.4/grabpl" +wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.0/grabpl" chmod +x /usr/local/bin/grabpl # Install Mage @@ -36,7 +36,7 @@ git clone https://github.com/magefile/mage.git /tmp/mage pushd /tmp/mage && go run bootstrap.go && popd mv $HOME/go/bin/mage /usr/local/bin # Cleanup after yourself -/bin/rm -rf /tmp/mage +/bin/rm -rf /tmp/mage /bin/rm -rf $HOME/go # Perform user specific initialization diff --git a/scripts/lib.star b/scripts/lib.star index 3541fd35625..be2abd1ee7a 100644 --- a/scripts/lib.star +++ b/scripts/lib.star @@ -137,7 +137,7 @@ def pipeline(name, edition, trigger, steps, services=[]): return pipeline def init_steps(edition): - grabpl_version = '0.4.25' + grabpl_version = '0.5.0' common_cmds = [ 'curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz', 'tar -C bin -xzvf dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz',