Merge pull request #1749 from RedisInsight/feature/RI-4188-add_rs_2.6_rte

#RI-4188 add redisearch 2.6.5 for redis 7.0.6 oss cluster

Author: nmammadli

redisinsight/api/test/api/database/GET-databases-id-info.test.ts

@@ -65,7 +65,7 @@ describe(`GET /databases/:id/info`, () => {
 
 
   describe('ACL', () => {
-    requirements('rte.acl', 'rte.type=STANDALONE', '!rte.re');
+    requirements('rte.acl', 'rte.type=STANDALONE', '!rte.re', '!rte.sharedData');
     before(async () => rte.data.setAclUserRules('~* +@all'));
     beforeEach(rte.data.truncate);
 

tests/e2e/rte.docker-compose.yml

@@ -108,6 +108,33 @@ services:
       default:
         ipv4_address: 172.31.100.213
 
+  # oss cluster (v7) with rediserch > 2.2
+  cluster-rs-creator-7:
+    build:
+      context: &cluster-rs-7-build ./rte/oss-cluster-7-rs
+      dockerfile: creator.Dockerfile
+    depends_on:
+      - master-rs-7-1
+      - master-rs-7-2
+      - master-rs-7-3
+  master-rs-7-1:
+    build: *cluster-rs-7-build
+    ports:
+      - 8221:6379
+    networks:
+      default:
+        ipv4_address: 172.31.100.221
+  master-rs-7-2:
+    build: *cluster-rs-7-build
+    networks:
+      default:
+        ipv4_address: 172.31.100.222
+  master-rs-7-3:
+    build: *cluster-rs-7-build
+    networks:
+      default:
+        ipv4_address: 172.31.100.223
+
   # redis enterprise
   redis-enterprise:
     build: ./rte/redis-enterprise

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

@@ -0,0 +1,11 @@
+FROM redislabs/rejson:1.0.8 as rejson
+
+FROM redislabs/redisearch:2.6.5 as redisearch
+
+FROM redis:7.0.8
+
+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-rs/cluster-create.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+echo 'Try to sleep for a while...'
+sleep 5
+echo 'Creating cluster...'
+echo "yes" | redis-cli \
+  --cluster create \
+  172.31.100.221:6379 \
+  172.31.100.222:6379 \
+  172.31.100.223:6379 \
+  --cluster-replicas 0 \
+  && redis-server

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

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