Update redis server test versions (#4114)

Bump test infra to use 8.0-M05-pre

Author: ggivo

.github/CONTRIBUTING.md

@@ -43,7 +43,7 @@ This guide explains how to bootstrap and manage a test environment for Jedis usi
 You can bootstrap the test environment for supported versions of Redis using the provided `make` targets.
 
 ## Option 1: Using `make` Targets
-To bring up the test environment for a specific Redis version (8.0-M02, 7.4.1, 7.2.6, or 6.2.16), use the following command:
+To bring up the test environment for a specific Redis version (8.0-M05-pre, 8.0-M04-pre, 8.0-M02, 7.4, 7.2, or 6.2), use the following command:
 ```bash
 make start-test-env version=8.0-M02  # Replace with desired version
 ```
@@ -64,11 +64,11 @@ rm -rf /tmp/redis-env-work
 export REDIS_VERSION=8.0-M02
 docker compose up
 ```
-- **Redis 7.4.1, 7.2.6, 6.2.16,**
+- **Redis 7.4, 7.2, 6.2,**
 ```bash
 rm -rf /tmp/redis-env-work
-export REDIS_VERSION=6.2.16
-docker compose --env-file .env --env-file .env.v6.2.16 up
+export REDIS_VERSION=6.2
+docker compose --env-file .env --env-file .env.v6.2 up
 ```
 
 

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

@@ -36,10 +36,10 @@ jobs:
       fail-fast: false
       matrix:
         redis_version:
-          - "8.0-M04-pre"
-          - "7.4.1"
-          - "7.2.6"
-          # - "6.2.16"
+          - "8.0"
+          - "7.4"
+          - "7.2"
+          # - "6.2"
     steps:
       - uses: actions/checkout@v4
       - name: Set up publishing to maven central
@@ -63,8 +63,7 @@ jobs:
       - name: Set up Docker Compose environment
         run: |
           mkdir -m 777 $REDIS_ENV_WORK_DIR
-          export REDIS_VERSION="${{ matrix.redis_version }}"
-          make start-test-env version=$REDIS_VERSION
+          make start-test-env version=${{ matrix.redis_version }}
       - name: Maven offline
         run: |
           mvn -q dependency:go-offline
@@ -99,7 +98,7 @@ jobs:
           path: target/surefire-reports/*.dumpstream
       - name: Publish Test Results
         uses: EnricoMi/publish-unit-test-result-action@v2
-        if: always()
+        if: github.actor != 'dependabot[bot]'
         with:
           files: |
             target/surefire-reports/**/*.xml

Makefile

@@ -1,8 +1,8 @@
 PATH := ./redis-git/src:${PATH}
 
 # Supported test env versions
-SUPPORTED_TEST_ENV_VERSIONS := 8.0-M04-pre, 8.0-M02 7.4.1 7.2.6 6.2.16
-DEFAULT_TEST_ENV_VERSION := 8.0-M04-pre
+SUPPORTED_TEST_ENV_VERSIONS := 8.0 7.4 7.2 6.2
+DEFAULT_TEST_ENV_VERSION := 8.0
 REDIS_ENV_WORK_DIR := $(or ${REDIS_ENV_WORK_DIR},/tmp/redis-env-work)
 
 define REDIS1_CONF
@@ -585,9 +585,8 @@ start-test-env:
 	fi; \
 	rm -rf "$(REDIS_ENV_WORK_DIR)"; \
 	mkdir -p "$(REDIS_ENV_WORK_DIR)"; \
-	export REDIS_VERSION=$$version && \
 	docker compose $$env_files -f src/test/resources/env/docker-compose.yml up -d; \
-	echo "Started test environment with Redis version $$version."
+    echo "Started test environment with Redis version $$version. "
 
 # Stop the test environment
 stop-test-env:

src/test/resources/env/.env

@@ -1,4 +1,5 @@
-REDIS_VERSION=8.0-M02
+REDIS_VERSION=8.0-M05-pre
+REDIS_STACK_VERSION=8.0-M05-pre
 CLIENT_LIBS_TEST_IMAGE=redislabs/client-libs-test
 REDIS_ENV_CONF_DIR=./
 REDIS_MODULES_DIR=/tmp

src/test/resources/env/.env.v6.2.16 renamed to src/test/resources/env/.env.v6.2

@@ -1,5 +1,5 @@
-REDIS_VERSION=6.2.16
-REDIS_STACK_VERSION=rs-6.2.6-v17
+REDIS_VERSION=6.2.17
+REDIS_STACK_VERSION=rs-6.2.6-v19
 
 #REMOVE UNSUPPORTED DIRECTIVE
 ENABLE_MODULE_COMMAND_DIRECTIVE=

src/test/resources/env/.env.v7.2

@@ -0,0 +1,2 @@
+REDIS_VERSION=7.2.7
+REDIS_STACK_VERSION=rs-7.2.0-v15

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

@@ -0,0 +1,2 @@
+REDIS_VERSION=7.4.2
+REDIS_STACK_VERSION=rs-7.4.0-v2