From f9239a4d6cfa50d4dfbce8a4f25b5c6b2341cb36 Mon Sep 17 00:00:00 2001
From: Arve Knudsen <arve.knudsen@gmail.com>
Date: Wed, 22 Jul 2020 13:00:18 +0200
Subject: [PATCH] Chore: Upgrade build pipeline tool (#26510)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
---
 .circleci/config.yml | 2 +-
 .drone.yml           | 8 ++++----
 scripts/lib.star     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fa21f4bcae8..06eda588265 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.24
+            VERSION=0.4.25
             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 151a5a81289..91460b25e8a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -22,7 +22,7 @@ steps:
   - cp -r $(yarn cache dir) yarn-cache
   environment:
     DOCKERIZE_VERSION: 0.6.1
-    GRABPL_VERSION: 0.4.24
+    GRABPL_VERSION: 0.4.25
 
 - name: lint-backend
   image: grafana/build-container:1.2.21
@@ -78,7 +78,7 @@ steps:
 - name: test-backend
   image: grafana/build-container:1.2.21
   commands:
-  - go test -covermode=atomic ./pkg/...
+  - ./bin/grabpl test-backend
   - ./bin/grabpl integration-tests
   - cp -r $(go env GOCACHE) go-cache
   depends_on:
@@ -250,7 +250,7 @@ steps:
   - cp -r $(yarn cache dir) yarn-cache
   environment:
     DOCKERIZE_VERSION: 0.6.1
-    GRABPL_VERSION: 0.4.24
+    GRABPL_VERSION: 0.4.25
 
 - name: lint-backend
   image: grafana/build-container:1.2.21
@@ -306,7 +306,7 @@ steps:
 - name: test-backend
   image: grafana/build-container:1.2.21
   commands:
-  - go test -covermode=atomic ./pkg/...
+  - ./bin/grabpl test-backend
   - ./bin/grabpl integration-tests
   - cp -r $(go env GOCACHE) go-cache
   depends_on:
diff --git a/scripts/lib.star b/scripts/lib.star
index 04fd6a7e1a8..339e7bc1893 100644
--- a/scripts/lib.star
+++ b/scripts/lib.star
@@ -129,7 +129,7 @@ def pipeline(name, edition, trigger, steps, services=[]):
     return pipeline
 
 def init_steps(edition):
-    grabpl_version = '0.4.24'
+    grabpl_version = '0.4.25'
     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',
@@ -307,7 +307,7 @@ def test_backend_step():
         ],
         'commands': [
             # First execute non-integration tests in parallel, since it should be safe
-            'go test -covermode=atomic ./pkg/...',
+            './bin/grabpl test-backend',
             # Then execute integration tests in serial
             './bin/grabpl integration-tests',
             # Keep the test cache