wip, change local redis setup

Author: ndyakov

.github/actions/run-tests/action.yml

@@ -49,8 +49,8 @@ runs:
       shell: bash
     - name: Run tests
       env:
-        USE_CONTAINERIZED_REDIS: "true"
-        RE_CLUSTER: "true"
+        RCE_DOCKER: "true"
+        RE_CLUSTER: "false"
       run: |
         go test \
         --ginkgo.skip-file="ring_test.go" \

Makefile

@@ -32,7 +32,7 @@ build:
 
 testdata/redis:
 	mkdir -p $@
-	wget -qO- https://download.redis.io/releases/redis-7.4-rc2.tar.gz  | tar xvz --strip-components=1 -C $@
+	wget -qO- https://github.com/redis/redis/archive/unstable.tar.gz  | tar xvz --strip-components=1 -C $@
 
 testdata/redis/src/redis-server: testdata/redis
 	cd $< && make all

docker-compose.yml

@@ -25,16 +25,11 @@ services:
     image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
     container_name: redis-cluster
     environment:
-      - REDIS_CLUSTER=yes
       - NODES=6
-      - REPLICAS=1
-      - TLS_ENABLED=yes
-      - PORT=16379
-      - TLS_PORT=27379
-    command: ${REDIS_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --tls-auth-clients optional --save ""}
+      - PORT=16600
+    command: ${REDIS_EXTRA_ARGS:--cluster-enabled yes ""}
     ports:
-      - "16379-16384:16379-16384"
-      - "27379-27384:27379-27384"
+      - "16600-16605:16600-16605"
     volumes:
       - "./dockers/cluster:/redis/work"
     profiles:

dockers/.gitignore

@@ -1 +1,2 @@
 redis-standalone
+*/

main_test.go

@@ -38,7 +38,7 @@ const (
 )
 
 var (
-	redisPort = "6380"
+	redisPort = "6379"
 	redisAddr = ":" + redisPort
 )
 
@@ -59,14 +59,17 @@ var (
 )
 
 var cluster = &clusterScenario{
-	ports:     []string{"16379", "16380", "16381", "16382", "16383", "16384"},
+	ports:     []string{"16600", "16601", "16602", "16603", "16604", "16605"},
 	nodeIDs:   make([]string, 6),
 	processes: make(map[string]*redisProcess, 6),
 	clients:   make(map[string]*redis.Client, 6),
 }
 
+// Redis Software Cluster
 var RECluster = false
-var USE_CONTAINERIZED_REDIS = false
+
+// Redis Community Edition Docker
+var RCEDocker = false
 
 func registerProcess(port string, p *redisProcess) {
 	if processes == nil {
@@ -83,8 +86,10 @@ var _ = BeforeSuite(func() {
 	}
 	var err error
 	RECluster, _ = strconv.ParseBool(os.Getenv("RE_CLUSTER"))
-	USE_CONTAINERIZED_REDIS, _ = strconv.ParseBool(os.Getenv("USE_CONTAINERIZED_REDIS"))
-	if !RECluster || !USE_CONTAINERIZED_REDIS {
+	RCEDocker, _ = strconv.ParseBool(os.Getenv("RCE_DOCKER"))
+	fmt.Printf("RECluster: %v\n", RECluster)
+	fmt.Printf("RCEDocker: %v\n", RCEDocker)
+	if !RECluster || !RCEDocker {
 
 		redisMain, err = startRedis(redisPort)
 		Expect(err).NotTo(HaveOccurred())
@@ -122,6 +127,9 @@ var _ = BeforeSuite(func() {
 	} else {
 		redisPort = rediStackPort
 		redisAddr = rediStackAddr
+		// populate cluster node information
+		Expect(configureClusterTopology(ctx, cluster)).NotTo(HaveOccurred())
+
 	}
 })
 
@@ -155,8 +163,8 @@ func redisOptions() *redis.Options {
 			ContextTimeoutEnabled: true,
 
 			MaxRetries: -1,
-			PoolSize:   10,
 
+			PoolSize:        10,
 			PoolTimeout:     30 * time.Second,
 			ConnMaxIdleTime: time.Minute,
 		}