cleaning code

redis · Dec 16, 2024 · 545e950 · 545e950
1 parent 6763990
commit 545e950
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -72,11 +72,11 @@ jobs:
       # Set up Docker Compose environment
       - name: Set up Docker Compose environment
         run: |
-          docker compose --profile all up -d --build
+          docker compose --profile all up -d
       
       - name: Run tests
         env:
-          USE_PREBUILT_REDIS: "true"
+          USE_CONTAINERIZED_REDIS: "true"
           RE_CLUSTER: "true"
         run: |
           go test \

diff --git a/.github/workflows/test-redis-enterprise.yml b/.github/workflows/test-redis-enterprise.yml
@@ -47,7 +47,7 @@ jobs:
       - name: Test
         env:
           RE_CLUSTER: "1"
-          USE_PREBUILT_REDIS: "1"
+          USE_CONTAINERIZED_REDIS: "1"
         run: |
           go test \
           --ginkgo.skip-file="ring_test.go" \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@
 
 services:
 
-  redis:
+  redis-stanalone:
     image: redislabs/client-libs-test:8.0-M02
     container_name: redis-standalone
     environment:

diff --git a/main_test.go b/main_test.go
@@ -66,7 +66,7 @@ var cluster = &clusterScenario{
 }
 
 var RECluster = false
-var USE_PREBUILT_REDIS = false
+var USE_CONTAINERIZED_REDIS = false
 
 func registerProcess(port string, p *redisProcess) {
 	if processes == nil {
@@ -83,9 +83,8 @@ var _ = BeforeSuite(func() {
 	}
 	var err error
 	RECluster, _ = strconv.ParseBool(os.Getenv("RE_CLUSTER"))
-	USE_PREBUILT_REDIS, _ = strconv.ParseBool(os.Getenv("USE_PREBUILT_REDIS"))
-	// panic("RECluster: " + strconv.FormatBool(RECluster) + " USE_PREBUILT_REDIS: " + strconv.FormatBool(USE_PREBUILT_REDIS))
-	if !RECluster || !USE_PREBUILT_REDIS {
+	USE_CONTAINERIZED_REDIS, _ = strconv.ParseBool(os.Getenv("USE_CONTAINERIZED_REDIS"))
+	if !RECluster || !USE_CONTAINERIZED_REDIS {
 
 		redisMain, err = startRedis(redisPort)
 		Expect(err).NotTo(HaveOccurred())