Add 8.6 to test matrix (#3617)

* Add 8.6 to test matrix

* Fix test

* Fix test

* Revert changes

Hashes:
- 2812110
- a65bf15

* Disable hybrid tests

Author: a-TODO-rov

.github/workflows/integration.yml

@@ -26,6 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         redis_version:
+          - "8.6"
           - "8.4"
           - "8.2"
           - "8.0"

Makefile

@@ -2,7 +2,7 @@ SHELL := /bin/bash
 PATH := ./work/redis-git/src:${PATH}
 ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 PROFILE ?= ci
-SUPPORTED_TEST_ENV_VERSIONS := 8.4 8.2 8.0 7.4 7.2
+SUPPORTED_TEST_ENV_VERSIONS := 8.6 8.4 8.2 8.0 7.4 7.2
 DEFAULT_TEST_ENV_VERSION := 8.4
 REDIS_ENV_WORK_DIR := $(or ${REDIS_ENV_WORK_DIR},$(ROOT_DIR)/work)
 

src/test/java/io/lettuce/core/search/RediSearchIntegrationTests.java

@@ -36,6 +36,7 @@
 import io.lettuce.test.condition.EnabledOnCommand;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
@@ -1202,6 +1203,7 @@ void testFtSynonymCommands() {
 
     @Test
     @EnabledOnCommand("FT.HYBRID")
+    @Disabled("FT.HYBRID feature requires update after Redis 8.6")
     void ftHybridAdvancedMultiQueryWithPostProcessing() {
         String indexName = "idx:ecommerce";
 

src/test/java/io/lettuce/core/search/RediSearchKeylessRoutingIntegrationTests.java

@@ -396,6 +396,7 @@ private void prepareHybrid() {
 
     @Test
     @EnabledOnCommand("FT.HYBRID")
+    @Disabled("FT.HYBRID feature requires update after Redis 8.6")
     void hybrid_routesRandomly_acrossUpstreams_whenReadFromUpstream() {
         prepareHybrid();
         long upstreams = connection.getPartitions().stream().filter(n -> n.is(RedisClusterNode.NodeFlag.UPSTREAM)).count();
@@ -419,6 +420,7 @@ void hybrid_routesRandomly_acrossUpstreams_whenReadFromUpstream() {
 
     @Test
     @EnabledOnCommand("FT.HYBRID")
+    @Disabled("FT.HYBRID feature requires update after Redis 8.6")
     void hybrid_routesRandomly_acrossReplicas_whenReadFromAnyReplica() {
         prepareHybrid();
         long replicas = connection.getPartitions().stream().filter(n -> n.is(RedisClusterNode.NodeFlag.REPLICA)).count();

src/test/resources/docker-env/.env.v8.6

@@ -0,0 +1,3 @@
+REDIS_ENV_WORK_DIR=../../../../work/docker
+REDIS_VERSION=custom-21183968220-debian-amd64
+REDIS_STACK_VERSION=custom-21183968220-debian-amd64