Merge pull request #925 from RedisInsight/feature/RI-3244-replace-cluster-5-with-7-for-e2e

replace oss-5-cluster with oss-7-cluster

Author: arthosofteq

tests/e2e/rte.docker-compose.yml

@@ -50,13 +50,32 @@ services:
   oss-sentinel-primary-2:
     image: redis:5
 
-  # oss cluster
-  oss-cluster:
-    image: rdbtools/redis-cluster-modules
-    networks:
-      - default
+  # oss cluster (v7)
+  cluster-plain-creator-7:
+    build:
+      context: ./rte/oss-cluster-7
+      dockerfile: creator.Dockerfile
+    depends_on:
+      - master-plain-7-1
+      - master-plain-7-2
+      - master-plain-7-3
+  master-plain-7-1:
+    build: &cluster-plain-7-build ./rte/oss-cluster-7
     ports:
-      - 8200:7000
+      - 8200:6379
+    networks:
+      default:
+        ipv4_address: 172.31.100.211
+  master-plain-7-2:
+    build: *cluster-plain-7-build
+    networks:
+      default:
+        ipv4_address: 172.31.100.212
+  master-plain-7-3:
+    build: *cluster-plain-7-build
+    networks:
+      default:
+        ipv4_address: 172.31.100.213
 
   # redis enterprise
   redis-enterprise:
@@ -66,3 +85,11 @@ services:
     ports:
       - 19443:9443
       - 12000:12000
+networks:
+  default:
+    name: "e2e-private-network"
+    ipam:
+      driver: default
+      config:
+        - subnet: 172.31.100.0/24
+          gateway: 172.31.100.1

tests/e2e/rte/oss-cluster-7/Dockerfile

@@ -0,0 +1,11 @@
+FROM redislabs/rejson:1.0.8 as rejson
+
+FROM redislabs/redisearch:2.0.13 as redisearch
+
+FROM redis:7.0.0
+
+COPY redis.conf /etc/redis/
+COPY --from=rejson /usr/lib/redis/modules/rejson.so /etc/redis/modules/
+COPY --from=redisearch /usr/lib/redis/modules/redisearch.so /etc/redis/modules/
+
+CMD [ "redis-server", "/etc/redis/redis.conf" ]

tests/e2e/rte/oss-cluster-7/cluster-create.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+echo 'Try to sleep for a while...'
+sleep 5
+echo 'Creating cluster...'
+echo "yes" | redis-cli \
+  --cluster create \
+  172.31.100.211:6379 \
+  172.31.100.212:6379 \
+  172.31.100.213:6379 \
+  --cluster-replicas 0

tests/e2e/rte/oss-cluster-7/creator.Dockerfile

@@ -0,0 +1,9 @@
+FROM redis:7.0.0
+
+USER root
+
+COPY cluster-create.sh ./
+
+RUN chmod a+x cluster-create.sh
+
+CMD ["/bin/sh", "./cluster-create.sh"]