From 68f2a1da1afb23e1935d8232aa76f12ae264a3ab Mon Sep 17 00:00:00 2001 From: ggivo Date: Thu, 16 Jan 2025 10:50:45 +0200 Subject: [PATCH] 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 --- .github/workflows/integration.yml | 11 +++++++ Makefile | 2 +- pom.xml | 1 + .../core/RedisContainerIntegrationTests.java | 11 ++++--- src/test/resources/docker/Dockerfile | 23 -------------- .../docker/cluster-nodes/nodes-36379.conf | 7 ----- .../docker/cluster-nodes/nodes-36380.conf | 7 ----- .../docker/cluster-nodes/nodes-36381.conf | 7 ----- .../docker/cluster-nodes/nodes-36382.conf | 7 ----- .../docker/cluster-nodes/nodes-36383.conf | 7 ----- .../docker/cluster-nodes/nodes-36384.conf | 7 ----- .../docker/cluster-nodes/redis-36379.conf | 13 -------- .../docker/cluster-nodes/redis-36380.conf | 13 -------- .../docker/cluster-nodes/redis-36381.conf | 13 -------- .../docker/cluster-nodes/redis-36382.conf | 13 -------- .../docker/cluster-nodes/redis-36383.conf | 13 -------- .../docker/cluster-nodes/redis-36384.conf | 13 -------- src/test/resources/docker/docker-compose.yml | 17 +++++----- src/test/resources/docker/start_cluster.sh | 31 ------------------- 19 files changed, 28 insertions(+), 188 deletions(-) delete mode 100644 src/test/resources/docker/Dockerfile delete mode 100644 src/test/resources/docker/cluster-nodes/nodes-36379.conf delete mode 100644 src/test/resources/docker/cluster-nodes/nodes-36380.conf delete mode 100644 src/test/resources/docker/cluster-nodes/nodes-36381.conf delete mode 100644 src/test/resources/docker/cluster-nodes/nodes-36382.conf delete mode 100644 src/test/resources/docker/cluster-nodes/nodes-36383.conf delete mode 100644 src/test/resources/docker/cluster-nodes/nodes-36384.conf delete mode 100644 src/test/resources/docker/cluster-nodes/redis-36379.conf delete mode 100644 src/test/resources/docker/cluster-nodes/redis-36380.conf delete mode 100644 src/test/resources/docker/cluster-nodes/redis-36381.conf delete mode 100644 src/test/resources/docker/cluster-nodes/redis-36382.conf delete mode 100644 src/test/resources/docker/cluster-nodes/redis-36383.conf delete mode 100644 src/test/resources/docker/cluster-nodes/redis-36384.conf delete mode 100644 src/test/resources/docker/start_cluster.sh diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 2bc828614a..9f061d0cdb 100644 --- a/.github/workflows/integration.yml +++ b/.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 diff --git a/Makefile b/Makefile index eed833116b..f288f218da 100644 --- a/Makefile +++ b/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 diff --git a/pom.xml b/pom.xml index 48ecbdfd1f..75eab696bd 100644 --- a/pom.xml +++ b/pom.xml @@ -933,6 +933,7 @@ maven-failsafe-plugin + ${env.REDIS_STACK_VERSION} 4 diff --git a/src/test/java/io/lettuce/core/RedisContainerIntegrationTests.java b/src/test/java/io/lettuce/core/RedisContainerIntegrationTests.java index c42a90dc3f..5eda44ffd9 100644 --- a/src/test/java/io/lettuce/core/RedisContainerIntegrationTests.java +++ b/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(); diff --git a/src/test/resources/docker/Dockerfile b/src/test/resources/docker/Dockerfile deleted file mode 100644 index fb85a2d529..0000000000 --- a/src/test/resources/docker/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM redis/redis-stack:latest - -RUN mkdir -p /nodes/36379 /nodes/36380 /nodes/36381 /nodes/36382 /nodes/36383 /nodes/36384 - -COPY cluster-nodes/nodes-36379.conf /nodes/36379/nodes.conf -COPY cluster-nodes/nodes-36380.conf /nodes/36380/nodes.conf -COPY cluster-nodes/nodes-36381.conf /nodes/36381/nodes.conf -COPY cluster-nodes/nodes-36382.conf /nodes/36382/nodes.conf -COPY cluster-nodes/nodes-36383.conf /nodes/36383/nodes.conf -COPY cluster-nodes/nodes-36384.conf /nodes/36384/nodes.conf - -COPY cluster-nodes/redis-36379.conf /nodes/36379/redis.conf -COPY cluster-nodes/redis-36380.conf /nodes/36380/redis.conf -COPY cluster-nodes/redis-36381.conf /nodes/36381/redis.conf -COPY cluster-nodes/redis-36382.conf /nodes/36382/redis.conf -COPY cluster-nodes/redis-36383.conf /nodes/36383/redis.conf -COPY cluster-nodes/redis-36384.conf /nodes/36384/redis.conf - -COPY start_cluster.sh /start_cluster.sh - -RUN chmod a+x /start_cluster.sh - -ENTRYPOINT [ "/start_cluster.sh"] \ No newline at end of file diff --git a/src/test/resources/docker/cluster-nodes/nodes-36379.conf b/src/test/resources/docker/cluster-nodes/nodes-36379.conf deleted file mode 100644 index f895cdc702..0000000000 --- a/src/test/resources/docker/cluster-nodes/nodes-36379.conf +++ /dev/null @@ -1,7 +0,0 @@ -2ece6db60f8e5665c140c89720d3d259c024d179 127.0.0.1:36381@46381,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee master - 0 1724417170931 3 connected 10923-16383 -916a157a7772af418664b6b2c7feeede5e1851dd 127.0.0.1:36383@46383,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 slave 3c5ae3144eb30caa272796173d3d8b314d881b51 1724417171949 1724417168901 1 connected -024a891ec46aeded14511b7c5899460198306353 127.0.0.1:36384@46384,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 slave 72d77afa00d3572b7fcb0215181bb46b3e869c42 0 1724417170000 2 connected -72d77afa00d3572b7fcb0215181bb46b3e869c42 127.0.0.1:36380@46380,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 master - 0 1724417170000 2 connected 5461-10922 -a7ff9d3ed43a7ff58485c4e780f86c4202b8224f 127.0.0.1:36382@46382,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee slave 2ece6db60f8e5665c140c89720d3d259c024d179 0 1724417169000 3 connected -3c5ae3144eb30caa272796173d3d8b314d881b51 127.0.0.1:36379@46379,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 myself,master - 0 1724417168000 1 connected 0-5460 -vars currentEpoch 6 lastVoteEpoch 0 \ No newline at end of file diff --git a/src/test/resources/docker/cluster-nodes/nodes-36380.conf b/src/test/resources/docker/cluster-nodes/nodes-36380.conf deleted file mode 100644 index a39749dac8..0000000000 --- a/src/test/resources/docker/cluster-nodes/nodes-36380.conf +++ /dev/null @@ -1,7 +0,0 @@ -72d77afa00d3572b7fcb0215181bb46b3e869c42 127.0.0.1:36380@46380,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 myself,master - 0 1724417169000 2 connected 5461-10922 -3c5ae3144eb30caa272796173d3d8b314d881b51 127.0.0.1:36379@46379,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 master - 0 1724417169000 1 connected 0-5460 -024a891ec46aeded14511b7c5899460198306353 127.0.0.1:36384@46384,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 slave 72d77afa00d3572b7fcb0215181bb46b3e869c42 0 1724417167171 2 connected -2ece6db60f8e5665c140c89720d3d259c024d179 127.0.0.1:36381@46381,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee master - 0 1724417170930 3 connected 10923-16383 -a7ff9d3ed43a7ff58485c4e780f86c4202b8224f 127.0.0.1:36382@46382,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee slave 2ece6db60f8e5665c140c89720d3d259c024d179 0 1724417169917 3 connected -916a157a7772af418664b6b2c7feeede5e1851dd 127.0.0.1:36383@46383,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 slave 3c5ae3144eb30caa272796173d3d8b314d881b51 0 1724417168901 1 connected -vars currentEpoch 6 lastVoteEpoch 0 \ No newline at end of file diff --git a/src/test/resources/docker/cluster-nodes/nodes-36381.conf b/src/test/resources/docker/cluster-nodes/nodes-36381.conf deleted file mode 100644 index b69b042a7c..0000000000 --- a/src/test/resources/docker/cluster-nodes/nodes-36381.conf +++ /dev/null @@ -1,7 +0,0 @@ -024a891ec46aeded14511b7c5899460198306353 127.0.0.1:36384@46384,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 slave 72d77afa00d3572b7fcb0215181bb46b3e869c42 0 1724417167171 2 connected -2ece6db60f8e5665c140c89720d3d259c024d179 127.0.0.1:36381@46381,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee myself,master - 0 1724417166000 3 connected 10923-16383 -3c5ae3144eb30caa272796173d3d8b314d881b51 127.0.0.1:36379@46379,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 master - 0 1724417168901 1 connected 0-5460 -72d77afa00d3572b7fcb0215181bb46b3e869c42 127.0.0.1:36380@46380,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 master - 0 1724417169916 2 connected 5461-10922 -a7ff9d3ed43a7ff58485c4e780f86c4202b8224f 127.0.0.1:36382@46382,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee slave 2ece6db60f8e5665c140c89720d3d259c024d179 0 1724417167000 3 connected -916a157a7772af418664b6b2c7feeede5e1851dd 127.0.0.1:36383@46383,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 slave 3c5ae3144eb30caa272796173d3d8b314d881b51 0 1724417168000 1 connected -vars currentEpoch 6 lastVoteEpoch 0 \ No newline at end of file diff --git a/src/test/resources/docker/cluster-nodes/nodes-36382.conf b/src/test/resources/docker/cluster-nodes/nodes-36382.conf deleted file mode 100644 index 415345dbfe..0000000000 --- a/src/test/resources/docker/cluster-nodes/nodes-36382.conf +++ /dev/null @@ -1,7 +0,0 @@ -024a891ec46aeded14511b7c5899460198306353 127.0.0.1:36384@46384,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 slave 72d77afa00d3572b7fcb0215181bb46b3e869c42 0 1724417171948 2 connected -2ece6db60f8e5665c140c89720d3d259c024d179 127.0.0.1:36381@46381,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee master - 0 1724417171000 3 connected 10923-16383 -a7ff9d3ed43a7ff58485c4e780f86c4202b8224f 127.0.0.1:36382@46382,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee myself,slave 2ece6db60f8e5665c140c89720d3d259c024d179 0 1724417169000 3 connected -3c5ae3144eb30caa272796173d3d8b314d881b51 127.0.0.1:36379@46379,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 master - 0 1724417170931 1 connected 0-5460 -72d77afa00d3572b7fcb0215181bb46b3e869c42 127.0.0.1:36380@46380,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 master - 1724417172965 1724417168902 2 connected 5461-10922 -916a157a7772af418664b6b2c7feeede5e1851dd 127.0.0.1:36383@46383,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 slave 3c5ae3144eb30caa272796173d3d8b314d881b51 0 1724417168000 1 connected -vars currentEpoch 6 lastVoteEpoch 0 \ No newline at end of file diff --git a/src/test/resources/docker/cluster-nodes/nodes-36383.conf b/src/test/resources/docker/cluster-nodes/nodes-36383.conf deleted file mode 100644 index 0cbe1550b9..0000000000 --- a/src/test/resources/docker/cluster-nodes/nodes-36383.conf +++ /dev/null @@ -1,7 +0,0 @@ -72d77afa00d3572b7fcb0215181bb46b3e869c42 127.0.0.1:36380@46380,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 master - 0 1724417170000 2 connected 5461-10922 -3c5ae3144eb30caa272796173d3d8b314d881b51 127.0.0.1:36379@46379,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 master - 0 1724417171000 1 connected 0-5460 -024a891ec46aeded14511b7c5899460198306353 127.0.0.1:36384@46384,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 slave 72d77afa00d3572b7fcb0215181bb46b3e869c42 0 1724417171000 2 connected -2ece6db60f8e5665c140c89720d3d259c024d179 127.0.0.1:36381@46381,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee master - 0 1724417171949 3 connected 10923-16383 -916a157a7772af418664b6b2c7feeede5e1851dd 127.0.0.1:36383@46383,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 myself,slave 3c5ae3144eb30caa272796173d3d8b314d881b51 0 1724417168000 1 connected -a7ff9d3ed43a7ff58485c4e780f86c4202b8224f 127.0.0.1:36382@46382,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee slave 2ece6db60f8e5665c140c89720d3d259c024d179 0 1724417172966 3 connected -vars currentEpoch 6 lastVoteEpoch 0 \ No newline at end of file diff --git a/src/test/resources/docker/cluster-nodes/nodes-36384.conf b/src/test/resources/docker/cluster-nodes/nodes-36384.conf deleted file mode 100644 index 313b0c30eb..0000000000 --- a/src/test/resources/docker/cluster-nodes/nodes-36384.conf +++ /dev/null @@ -1,7 +0,0 @@ -3c5ae3144eb30caa272796173d3d8b314d881b51 127.0.0.1:36379@46379,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 master - 0 1724417169000 1 connected 0-5460 -916a157a7772af418664b6b2c7feeede5e1851dd 127.0.0.1:36383@46383,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 slave 3c5ae3144eb30caa272796173d3d8b314d881b51 0 1724417166981 1 connected -2ece6db60f8e5665c140c89720d3d259c024d179 127.0.0.1:36381@46381,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee master - 0 1724417168903 3 connected 10923-16383 -024a891ec46aeded14511b7c5899460198306353 127.0.0.1:36384@46384,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 myself,slave 72d77afa00d3572b7fcb0215181bb46b3e869c42 0 1724417167000 2 connected -a7ff9d3ed43a7ff58485c4e780f86c4202b8224f 127.0.0.1:36382@46382,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee slave 2ece6db60f8e5665c140c89720d3d259c024d179 0 1724417169917 3 connected -72d77afa00d3572b7fcb0215181bb46b3e869c42 127.0.0.1:36380@46380,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 master - 1724417170930 1724417167000 2 connected 5461-10922 -vars currentEpoch 6 lastVoteEpoch 0 \ No newline at end of file diff --git a/src/test/resources/docker/cluster-nodes/redis-36379.conf b/src/test/resources/docker/cluster-nodes/redis-36379.conf deleted file mode 100644 index 710b18d611..0000000000 --- a/src/test/resources/docker/cluster-nodes/redis-36379.conf +++ /dev/null @@ -1,13 +0,0 @@ -dir /nodes/36379 -port 36379 -logfile /redis.log -daemonize yes -protected-mode no -cluster-enabled yes -enable-debug-command yes -loadmodule /opt/redis-stack/lib/redisearch.so -# loadmodule /opt/redis-stack/lib/redisgraph.so -loadmodule /opt/redis-stack/lib/redistimeseries.so -loadmodule /opt/redis-stack/lib/rejson.so -loadmodule /opt/redis-stack/lib/redisbloom.so -loadmodule /opt/redis-stack/lib/redisgears.so v8-plugin-path /opt/redis-stack/lib/libredisgears_v8_plugin.so diff --git a/src/test/resources/docker/cluster-nodes/redis-36380.conf b/src/test/resources/docker/cluster-nodes/redis-36380.conf deleted file mode 100644 index 5aab7dfa55..0000000000 --- a/src/test/resources/docker/cluster-nodes/redis-36380.conf +++ /dev/null @@ -1,13 +0,0 @@ -dir /nodes/36380 -port 36380 -logfile /redis.log -daemonize yes -protected-mode no -cluster-enabled yes -enable-debug-command yes -loadmodule /opt/redis-stack/lib/redisearch.so -# loadmodule /opt/redis-stack/lib/redisgraph.so -loadmodule /opt/redis-stack/lib/redistimeseries.so -loadmodule /opt/redis-stack/lib/rejson.so -loadmodule /opt/redis-stack/lib/redisbloom.so -loadmodule /opt/redis-stack/lib/redisgears.so v8-plugin-path /opt/redis-stack/lib/libredisgears_v8_plugin.so diff --git a/src/test/resources/docker/cluster-nodes/redis-36381.conf b/src/test/resources/docker/cluster-nodes/redis-36381.conf deleted file mode 100644 index 91210574d4..0000000000 --- a/src/test/resources/docker/cluster-nodes/redis-36381.conf +++ /dev/null @@ -1,13 +0,0 @@ -dir /nodes/36381 -port 36381 -logfile /redis.log -daemonize yes -protected-mode no -cluster-enabled yes -enable-debug-command yes -loadmodule /opt/redis-stack/lib/redisearch.so -# loadmodule /opt/redis-stack/lib/redisgraph.so -loadmodule /opt/redis-stack/lib/redistimeseries.so -loadmodule /opt/redis-stack/lib/rejson.so -loadmodule /opt/redis-stack/lib/redisbloom.so -loadmodule /opt/redis-stack/lib/redisgears.so v8-plugin-path /opt/redis-stack/lib/libredisgears_v8_plugin.so diff --git a/src/test/resources/docker/cluster-nodes/redis-36382.conf b/src/test/resources/docker/cluster-nodes/redis-36382.conf deleted file mode 100644 index fcf2c7ecd7..0000000000 --- a/src/test/resources/docker/cluster-nodes/redis-36382.conf +++ /dev/null @@ -1,13 +0,0 @@ -dir /nodes/36382 -port 36382 -logfile /redis.log -daemonize yes -protected-mode no -cluster-enabled yes -enable-debug-command yes -loadmodule /opt/redis-stack/lib/redisearch.so -# loadmodule /opt/redis-stack/lib/redisgraph.so -loadmodule /opt/redis-stack/lib/redistimeseries.so -loadmodule /opt/redis-stack/lib/rejson.so -loadmodule /opt/redis-stack/lib/redisbloom.so -loadmodule /opt/redis-stack/lib/redisgears.so v8-plugin-path /opt/redis-stack/lib/libredisgears_v8_plugin.so diff --git a/src/test/resources/docker/cluster-nodes/redis-36383.conf b/src/test/resources/docker/cluster-nodes/redis-36383.conf deleted file mode 100644 index a3d4772714..0000000000 --- a/src/test/resources/docker/cluster-nodes/redis-36383.conf +++ /dev/null @@ -1,13 +0,0 @@ -dir /nodes/36383 -port 36383 -logfile /redis.log -daemonize yes -protected-mode no -cluster-enabled yes -enable-debug-command yes -loadmodule /opt/redis-stack/lib/redisearch.so -# loadmodule /opt/redis-stack/lib/redisgraph.so -loadmodule /opt/redis-stack/lib/redistimeseries.so -loadmodule /opt/redis-stack/lib/rejson.so -loadmodule /opt/redis-stack/lib/redisbloom.so -loadmodule /opt/redis-stack/lib/redisgears.so v8-plugin-path /opt/redis-stack/lib/libredisgears_v8_plugin.so diff --git a/src/test/resources/docker/cluster-nodes/redis-36384.conf b/src/test/resources/docker/cluster-nodes/redis-36384.conf deleted file mode 100644 index 70c5428e4d..0000000000 --- a/src/test/resources/docker/cluster-nodes/redis-36384.conf +++ /dev/null @@ -1,13 +0,0 @@ -dir /nodes/36384 -port 36384 -logfile /redis.log -daemonize yes -protected-mode no -cluster-enabled yes -enable-debug-command yes -loadmodule /opt/redis-stack/lib/redisearch.so -# loadmodule /opt/redis-stack/lib/redisgraph.so -loadmodule /opt/redis-stack/lib/redistimeseries.so -loadmodule /opt/redis-stack/lib/rejson.so -loadmodule /opt/redis-stack/lib/redisbloom.so -loadmodule /opt/redis-stack/lib/redisgears.so v8-plugin-path /opt/redis-stack/lib/libredisgears_v8_plugin.so diff --git a/src/test/resources/docker/docker-compose.yml b/src/test/resources/docker/docker-compose.yml index aede734651..97b1777373 100644 --- a/src/test/resources/docker/docker-compose.yml +++ b/src/test/resources/docker/docker-compose.yml @@ -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" \ No newline at end of file + - "36379-36381:36379-36381" \ No newline at end of file diff --git a/src/test/resources/docker/start_cluster.sh b/src/test/resources/docker/start_cluster.sh deleted file mode 100644 index 85e3ac94ec..0000000000 --- a/src/test/resources/docker/start_cluster.sh +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/bash - -# -# Copyright 2024, Redis Ltd. and Contributors -# All rights reserved. -# -# Licensed under the MIT License. -# - -if [ -z ${START_PORT} ]; then - START_PORT=36379 -fi -if [ -z ${END_PORT} ]; then - END_PORT=36384 -fi -if [ ! -z "$3" ]; then - START_PORT=$2 - START_PORT=$3 -fi - -for PORT in `seq ${START_PORT} ${END_PORT}`; do - echo ">>> Starting Redis server at port ${PORT}" - /opt/redis-stack/bin/redis-server /nodes/$PORT/redis.conf > /nodes/$PORT/console.log - if [ $? -ne 0 ]; then - echo "Redis failed to start, exiting." - continue - fi - echo 127.0.0.1:$PORT >> /nodes/nodemap -done - -tail -f /redis.log \ No newline at end of file