Use Redis CE for 8.x redis stack related tests

Author: ggivo

.github/CONTRIBUTING.md

@@ -47,20 +47,28 @@ To bring up the test environment for a specific Redis version (8.0-M02, 7.4.1, 7
 ```bash
 make start-test-env version=8.0-M02  # Replace with desired version
 ```
+To stop test environment:
+```bash
+make stop-test-env
+```
+To run tests using dockerized environment:
+```bash
+make test-on-docker
+```
 
 ## Option 2: Using docker compose commands directly
 Docker compose file can be found in `src/test/resources/env` folder.
-- **Redis  8.0-M02, 7.4.1, 7.2.6**
+- **Redis  8.0-M02**
 ```bash
 rm -rf /tmp/redis-env-work
 export REDIS_VERSION=8.0-M02
 docker compose up
 ```
-- **Redis 6.2.16**
-- **NOTE:** Redis 6.2.16 uses a dedicated `.env.v6.2.16`.
+- **Redis 7.4.1, 7.2.6, 6.2.16,**
 ```bash
 rm -rf /tmp/redis-env-work
-docker compose --env-file .env.v6.2.16 up
+export REDIS_VERSION=6.2.16
+docker compose --env-file .env --env-file .env.v6.2.16 up
 ```
 
 

.github/workflows/test-on-docker.yml

@@ -64,11 +64,7 @@ jobs:
         run: |
           mkdir -m 777 $REDIS_ENV_WORK_DIR
           export REDIS_VERSION="${{ matrix.redis_version }}"
-          export COMPOSE_ENV_FILES="src/test/resources/env/.env"
-          if [[ "${{ matrix.redis_version }}" == "6.2.16" ]]; then
-           COMPOSE_ENV_FILES="src/test/resources/env/.env.v${{ matrix.redis_version }}"
-          fi
-          docker compose -f src/test/resources/env/docker-compose.yml up -d
+          make start-test-env version=$REDIS_VERSION
       - name: Maven offline
         run: |
           mvn -q dependency:go-offline

Makefile

@@ -3,6 +3,7 @@ PATH := ./redis-git/src:${PATH}
 # Supported test env versions
 SUPPORTED_TEST_ENV_VERSIONS := 8.0-M02 7.4.1 7.2.6 6.2.16
 DEFAULT_TEST_ENV_VERSION := 8.0-M02
+REDIS_ENV_WORK_DIR := $(or ${REDIS_ENV_WORK_DIR},/tmp/redis-env-work)
 
 define REDIS1_CONF
 daemonize yes
@@ -576,19 +577,24 @@ start-test-env:
 		echo "Error: Invalid version '$$version'. Supported versions are: $(SUPPORTED_TEST_ENV_VERSIONS)."; \
 		exit 1; \
 	fi; \
-	env_file="src/test/resources/env/.env"; \
-	if [ "$$version" = "6.2.16" ]; then \
-		env_file="src/test/resources/env/.env.v6.2.16"; \
+    default_env_file="src/test/resources/env/.env"; \
+	custom_env_file="src/test/resources/env/.env.v$$version"; \
+	env_files="--env-file $$default_env_file"; \
+	if [ -f "$$custom_env_file" ]; then \
+		env_files="$$env_files --env-file $$custom_env_file"; \
 	fi; \
-	rm -rf /tmp/redis-env-work; \
+	rm -rf "$(REDIS_ENV_WORK_DIR)"; \
+	mkdir -p "$(REDIS_ENV_WORK_DIR)"; \
 	export REDIS_VERSION=$$version && \
-	docker compose --env-file $$env_file -f src/test/resources/env/docker-compose.yml up -d; \
+	docker compose $$env_files -f src/test/resources/env/docker-compose.yml up -d; \
 	echo "Started test environment with Redis version $$version."
 
 # Stop the test environment
 stop-test-env:
 	docker compose -f src/test/resources/env/docker-compose.yml down; \
-	rm -rf /tmp/redis-env-work; \
+	rm -rf "$(REDIS_ENV_WORK_DIR)"; \
 	echo "Stopped test environment and performed cleanup."
 
+test-on-docker: | start-test-env mvn-test stop-test-env
+
 .PHONY: test

src/test/java/redis/clients/jedis/util/TlsUtil.java

@@ -25,7 +25,7 @@ public class TlsUtil {
     private static final String TRUST_STORE_TYPE = "JCEKS";
     private static final String CERTIFICATE_TYPE = "X.509";
 
-    private static final String TEST_WORK_FOLDER = System.getenv().getOrDefault("TEST_WORK_FOLDER", "./redis-env/");
+    private static final String TEST_WORK_FOLDER = System.getenv().getOrDefault("TEST_WORK_FOLDER", "/tmp/redis-env-work");
     private static final String TEST_TRUSTSTORE = System.getenv().getOrDefault("TEST_TRUSTSTORE", "truststore.jceks");
     private static final String TEST_CA_CERT = System.getenv().getOrDefault("TEST_CA_CERT", "ca.crt");
     private static final String TEST_SERVER_CERT = System.getenv().getOrDefault("TEST_SERVER_CERT", "redis.crt");

src/test/resources/env/.env.v6.2.16

@@ -1,8 +1,5 @@
 REDIS_VERSION=6.2.16
-CLIENT_LIBS_TEST_IMAGE=redislabs/client-libs-test
-REDIS_ENV_CONF_DIR=./
-REDIS_MODULES_DIR=/tmp
-REDIS_ENV_WORK_DIR=/tmp/redis-env-work
+REDIS_STACK_VERSION=rs-6.2.6-v17
 
 #REMOVE UNSUPPORTED DIRECTIVE
 ENABLE_MODULE_COMMAND_DIRECTIVE=

src/test/resources/env/.env.v7.2.6

@@ -0,0 +1,2 @@
+REDIS_VERSION=7.2.6
+REDIS_STACK_VERSION=rs-7.2.0-v13

src/test/resources/env/.env.v7.4.1

@@ -0,0 +1,2 @@
+REDIS_VERSION=7.4.1
+REDIS_STACK_VERSION=rs-7.4.0-v1

src/test/resources/env/docker-compose.yml

@@ -145,10 +145,17 @@ services:
       - ${REDIS_ENV_WORK_DIR}/cluster-stable/work:/redis/work:rw
 
   jedis-stack:
-      image: redis/redis-stack-server:edge
-      container_name: jedis-stack
-      ports:
-        - "6479:6379"
+    sysctls:
+      - net.ipv6.conf.all.disable_ipv6=1
+    image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_STACK_VERSION:-${REDIS_VERSION}}"
+    container_name: jedis-stack
+    environment:
+      - REDIS_CLUSTER=no
+      - PORT=6479
+    ports:
+      - "6479:6479"
+    volumes:
+      -  ${REDIS_ENV_WORK_DIR}/jedis-stack/work:/redis/work:rw
 #todo find a way to connect from mac os host to exposed unix socket in container
 #  redis_uds:
 #    image: redis:${REDIS_VERSION}