From a54c8b4ce900caee7b41b813c7c728e57618fd95 Mon Sep 17 00:00:00 2001
From: Kyle D <kdumontnu@gmail.com>
Date: Wed, 10 May 2023 22:09:37 -0400
Subject: [PATCH] Kd/fix redis unit test (#24650)

Replaces #24641

Currently, unit tests fail when run locally (unless users have minio
instance running). This PR only requires redis unit tests if in CI.

- Only run redis unit tests when `CI` env variable is set
- Add minio as a service in unit tests actions
---
 .github/workflows/pull-db_test.yml | 10 ++++++++++
 modules/queue/base_redis_test.go   |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pull-db_test.yml b/.github/workflows/pull-db_test.yml
index ce97bfcb2c0f..243499b611fb 100644
--- a/.github/workflows/pull-db_test.yml
+++ b/.github/workflows/pull-db_test.yml
@@ -110,6 +110,16 @@ jobs:
           - "143:143"
           - "587:587"
           - "993:993"
+      redis:
+        image: redis
+        # Set health checks to wait until redis has started
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 5s
+          --health-timeout 3s
+          --health-retries 10
+        ports:
+          - 6379:6379
     steps:
       - name: checkout
         uses: actions/checkout@v3
diff --git a/modules/queue/base_redis_test.go b/modules/queue/base_redis_test.go
index 3d49e8d98c5f..19fbccbc8fe7 100644
--- a/modules/queue/base_redis_test.go
+++ b/modules/queue/base_redis_test.go
@@ -56,7 +56,7 @@ func TestBaseRedis(t *testing.T) {
 	}()
 	if !waitRedisReady("redis://127.0.0.1:6379/0", 0) {
 		redisServer = redisServerCmd(t)
-		if redisServer == nil && os.Getenv("CI") != "" {
+		if redisServer == nil && os.Getenv("CI") == "" {
 			t.Skip("redis-server not found")
 			return
 		}