From e57ab953f8f2ec633c44cff85d01c79468fb61af Mon Sep 17 00:00:00 2001
From: Horst Gutmann <horst.gutmann@grafana.com>
Date: Wed, 8 Feb 2023 10:26:12 +0100
Subject: [PATCH] [v9.3.x] CI: Running Redis integration tests without grabpl
 (#63028) (#63073)

CI: Running Redis integration tests without grabpl (#63028)

This restores some changes from
https://github.com/grafana/grafana/pull/61920 that were accidentally
deleted.

(cherry picked from commit 2804acd264ff247673f71854d25d79656b7b0775)
---
 .drone.yml                   | 10 +++++++---
 scripts/drone/steps/lib.star |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 80f09bfa4ab..570af6f4dc1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3345,7 +3345,9 @@ steps:
   name: mysql-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
-  - ./bin/grabpl integration-tests
+  - go clean -testcache
+  - go list './pkg/...' | xargs -I {} sh -c 'go test -run Integration -covermode=atomic
+    -timeout=5m {}'
   depends_on:
   - wire-install
   environment:
@@ -6042,7 +6044,9 @@ steps:
   name: mysql-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
-  - ./bin/grabpl integration-tests
+  - go clean -testcache
+  - go list './pkg/...' | xargs -I {} sh -c 'go test -run Integration -covermode=atomic
+    -timeout=5m {}'
   depends_on:
   - wire-install
   environment:
@@ -6656,6 +6660,6 @@ kind: secret
 name: aws_secret_access_key
 ---
 kind: signature
-hmac: a541f0c1a294987a42d43f561def70db4d92e1b0e753f1e59384b61ad224adbb
+hmac: fff34e6f4039c1d3c805cc9b39ac71c991ee2b65c2cf8ca15382ebf5dc6f6432
 
 ...
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 38e8e6590ea..6a777d364c7 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -1142,7 +1142,8 @@ def redis_integration_tests_step():
         },
         "commands": [
             "dockerize -wait tcp://redis:6379/0 -timeout 120s",
-            "./bin/grabpl integration-tests",
+            "go clean -testcache",
+            "go list './pkg/...' | xargs -I {} sh -c 'go test -run Integration -covermode=atomic -timeout=5m {}'",
         ],
     }