Migrate JSON tests infra to use client-lilb-test (#3128)

* Migrate JSON tests infra to use client-lilb-test image to support running tests against Redis CE 8.0

* Remove legacy JSON test Docker image

* formating

* propagate REDIS_STACK_VERSION to failsafe

Author: ggivo

.github/workflows/integration.yml

@@ -15,6 +15,16 @@ on:
   schedule:
     - cron: '0 1 * * *' # nightly build
   workflow_dispatch:
+    inputs:
+      redis_version:
+        description: "Redis stack version to use for testing"
+        required: false
+        default: "8.0-M02"
+        type: choice
+        options:
+          - "8.0-M02"
+          - "rs-7.4.0-v1"
+          - "rs-7.2.0-v13"
 
 jobs:
 
@@ -51,6 +61,7 @@ jobs:
         run: |
           make test-coverage
         env:
+          REDIS_STACK_VERSION: ${{ inputs.redis_version || '8.0-M02' }}
           JVM_OPTS: -Xmx3200m
           TERM: dumb
       - name: Upload coverage reports to Codecov

Makefile

@@ -93,7 +93,7 @@ ifeq ($(REDIS),unstable)
 	@echo slaveof localhost 6482 >> $@
 	@echo replica-announce-ip localhost >> $@
 else
-	@echo slaveof 127.0.1 6482 >> $@
+	@echo slaveof 127.0.0.1 6482 >> $@
 endif
 
 

pom.xml

@@ -933,6 +933,7 @@
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <configuration>
                     <systemPropertyVariables>
+                        <REDIS_STACK_VERSION>${env.REDIS_STACK_VERSION}</REDIS_STACK_VERSION>
                         <io.netty.eventLoopThreads>4</io.netty.eventLoopThreads>
                     </systemPropertyVariables>
                     <includes>

src/test/java/io/lettuce/core/RedisContainerIntegrationTests.java

@@ -26,14 +26,16 @@ public class RedisContainerIntegrationTests {
 
     private static final String REDIS_STACK_CLUSTER = "clustered-stack";
 
+    private static final String REDIS_STACK_VERSION = System.getProperty("REDIS_STACK_VERSION", "8.0-M02");;
+
     private static Exception initializationException;
 
     public static ComposeContainer CLUSTERED_STACK = new ComposeContainer(
             new File("src/test/resources/docker/docker-compose.yml")).withExposedService(REDIS_STACK_CLUSTER, 36379)
                     .withExposedService(REDIS_STACK_CLUSTER, 36380).withExposedService(REDIS_STACK_CLUSTER, 36381)
-                    .withExposedService(REDIS_STACK_CLUSTER, 36382).withExposedService(REDIS_STACK_CLUSTER, 36383)
-                    .withExposedService(REDIS_STACK_CLUSTER, 36384).withExposedService(REDIS_STACK_STANDALONE, 6379)
-                    .withLocalCompose(true);
+                    .withExposedService(REDIS_STACK_STANDALONE, 6379)
+                    .withEnv("CLIENT_LIBS_TEST_IMAGE", "redislabs/client-libs-test")
+                    .withEnv("REDIS_STACK_VERSION", REDIS_STACK_VERSION).withPull(false).withLocalCompose(true);
 
     // Singleton container pattern - start the containers only once
     // See https://java.testcontainers.org/test_framework_integration/manual_lifecycle_control/#singleton-containers
@@ -44,8 +46,7 @@ public class RedisContainerIntegrationTests {
         CLUSTERED_STACK.withLogConsumer(REDIS_STACK_CLUSTER, (OutputFrame frame) -> LOGGER.debug(frame.getUtf8String()));
         CLUSTERED_STACK.withLogConsumer(REDIS_STACK_STANDALONE, (OutputFrame frame) -> LOGGER.debug(frame.getUtf8String()));
 
-        CLUSTERED_STACK.waitingFor(REDIS_STACK_CLUSTER,
-                Wait.forLogMessage(".*Background RDB transfer terminated with success.*", 1));
+        CLUSTERED_STACK.waitingFor(REDIS_STACK_CLUSTER, Wait.forLogMessage("Cluster created with nodes:.*", 1));
         do {
             try {
                 CLUSTERED_STACK.start();

src/test/resources/docker/Dockerfile

@@ -2,16 +2,17 @@
 services:
 
   standalone-stack:
-    image: redis/redis-stack:latest
+    image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_STACK_VERSION}"
+    environment:
+        - REDIS_CLUSTER=no
+        - PORT=6379
     ports:
       - "16379:6379"
 
   clustered-stack:
-    image: tihomirmateev339/cae-infra:latest
+    image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_STACK_VERSION}"
+    environment:
+      - REDIS_CLUSTER=yes
+      - PORT=36379
     ports:
-      - "36379:36379"
-      - "36380:36380"
-      - "36381:36381"
-      - "36382:36382"
-      - "36383:36383"
-      - "36384:36384"
+      - "36379-36381:36379-36381"