E2e/feature/ri 5093 fix e2e tests

Dockerfile

@@ -6,15 +6,7 @@
 # the best way to minimize the number of node_module restores and build steps
 # while still keeping the final image small.
 
-FROM node:18.17.0-alpine as build
-
-# build time args and environment variables
-ARG SERVER_TLS_CERT
-ARG SERVER_TLS_KEY
-ARG SEGMENT_WRITE_KEY
-ENV SERVER_TLS_CERT=${SERVER_TLS_CERT}
-ENV SERVER_TLS_KEY=${SERVER_TLS_KEY}
-ENV SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY}
+FROM node:18.18-alpine as build
 
 # update apk repository and install build dependencies
 RUN apk update && apk add --no-cache --virtual .gyp \

tests/e2e/.env

@@ -1,7 +1,6 @@
 COMMON_URL=https://app:5000
 API_URL=https://app:5000/api
 OSS_SENTINEL_PASSWORD=password
-APP_FOLDER_NAME=.redisinsight-app
 NOTIFICATION_UPDATE_URL=https://s3.amazonaws.com/redisinsight.test/public/tests/e2e/notifications.json
 NOTIFICATION_SYNC_INTERVAL=30000
 RI_FEATURES_CONFIG_URL=http://static-server:5551/remote/features-config.json

tests/e2e/docker.web.docker-compose.yml

@@ -10,10 +10,8 @@ services:
       - ./results:/usr/src/app/results
       - ./report:/usr/src/app/report
       - ./plugins:/usr/src/app/plugins
-      - .redisinsight-app:/root/.redisinsight-app
-      - .ritmp:/tmp
-      - ./test-data/certs:/root/certs
-      - ./test-data/ssh:/root/ssh
+      - rihomedir:/root/.redisinsight-app
+      - tmp:/tmp
       - ./remote:/root/remote
     env_file:
       - ./.env
@@ -38,13 +36,16 @@ services:
 
   # Built image
   app:
-    cap_add:
-      - ipc_lock
+    logging:
+      driver: none
     image: riv2:latest
     env_file:
       - ./.env
     volumes:
-      - .redisinsight-app:/root/.redisinsight-app
-      - .ritmp:/tmp
-      - ./test-data/certs:/root/certs
-      - ./test-data/ssh:/root/ssh
+      - rihomedir:/data
+      - tmp:/tmp
+      - ./test-data:/test-data
+
+volumes:
+  tmp:
+  rihomedir:

tests/e2e/rte.docker-compose.yml

@@ -2,6 +2,8 @@ version: "3.4"
 
 services:
   static-server:
+    logging: &logging
+      driver: none
     build:
       context: .
       dockerfile: static-server.Dockerfile
@@ -11,6 +13,7 @@ services:
       - 5551:5551
   # ssh
   ssh:
+    logging: *logging
     image: lscr.io/linuxserver/openssh-server:latest
     environment:
       - PASSWORD_ACCESS=true
@@ -30,6 +33,7 @@ services:
 
   # oss standalone
   oss-standalone:
+    logging: *logging
     image: redislabs/redismod
     command: [
         "--loadmodule", "/usr/lib/redis/modules/redisearch.so",
@@ -42,6 +46,7 @@ services:
       - 8100:6379
 
   oss-standalone-empty:
+    logging: *logging
     image: redislabs/redismod
     command: [
       "--loadmodule", "/usr/lib/redis/modules/redisearch.so",
@@ -55,6 +60,7 @@ services:
 
   # oss standalone v5
   oss-standalone-v5:
+    logging: *logging
     image: redis:5
     ports:
       - 8101:6379
@@ -65,16 +71,19 @@ services:
         ipv4_address: 172.33.100.111
   # oss standalone redisearch
   oss-standalone-redisearch:
+    logging: *logging
     image: redislabs/redismod
     ports:
       - 8102:6379
 
   oss-standalone-redisgears-2-0:
+    logging: *logging
     image: redislabs/redisgears:edge
     ports:
       - 8106:6379
 
   oss-standalone-big:
+    logging: *logging
     build:
       context: ./rte/oss-standalone-big
       dockerfile: Dockerfile
@@ -85,6 +94,7 @@ services:
 
   # oss standalone tls
   oss-standalone-tls:
+    logging: *logging
     build:
       context: ./rte/oss-standalone-tls
       dockerfile: Dockerfile
@@ -93,6 +103,7 @@ services:
 
   # oss sentinel
   oss-sentinel:
+    logging: *logging
     build: ./rte/oss-sentinel
     depends_on:
       - oss-sentinel-primary-1
@@ -101,13 +112,16 @@ services:
       - 28100:26379
 
   oss-sentinel-primary-1:
+    logging: *logging
     image: redis:5
 
   oss-sentinel-primary-2:
+    logging: *logging
     image: redis:5
 
   # oss cluster (v7)
   cluster-plain-creator-7:
+    logging: *logging
     build:
       context: ./rte/oss-cluster-7
       dockerfile: creator.Dockerfile
@@ -116,25 +130,29 @@ services:
       - master-plain-7-2
       - master-plain-7-3
   master-plain-7-1:
+    logging: *logging
     build: &cluster-plain-7-build ./rte/oss-cluster-7
     ports:
       - 8200:6379
     networks:
       default:
         ipv4_address: 172.31.100.211
   master-plain-7-2:
+    logging: *logging
     build: *cluster-plain-7-build
     networks:
       default:
         ipv4_address: 172.31.100.212
   master-plain-7-3:
+    logging: *logging
     build: *cluster-plain-7-build
     networks:
       default:
         ipv4_address: 172.31.100.213
 
   # oss cluster (v7) with rediserch > 2.2
   cluster-rs-creator-7:
+    logging: *logging
     build:
       context: &cluster-rs-7-build ./rte/oss-cluster-7-rs
       dockerfile: creator.Dockerfile
@@ -143,25 +161,29 @@ services:
       - master-rs-7-2
       - master-rs-7-3
   master-rs-7-1:
+    logging: *logging
     build: *cluster-rs-7-build
     ports:
       - 8221:6379
     networks:
       default:
         ipv4_address: 172.31.100.221
   master-rs-7-2:
+    logging: *logging
     build: *cluster-rs-7-build
     networks:
       default:
         ipv4_address: 172.31.100.222
   master-rs-7-3:
+    logging: *logging
     build: *cluster-rs-7-build
     networks:
       default:
         ipv4_address: 172.31.100.223
 
   # oss cluster with redisgears 2
   gears-cluster-2-0-creator:
+    logging: *logging
     image: redis:latest
     entrypoint: ['/bin/sh', '-c', 'redis-cli --cluster create 172.31.100.191:6379 172.31.100.192:6379 172.31.100.193:6379 172.31.100.194:6379 172.31.100.195:6379 172.31.100.196:6379 --cluster-replicas 1 --cluster-yes && tail -f /dev/null']
     depends_on:
@@ -172,36 +194,42 @@ services:
       - gears-cluster-2-0-node-5
       - gears-cluster-2-0-node-6
   gears-cluster-2-0-node-1:
+    logging: *logging
     image: &gears-cluster-img redislabs/redisgears:edge
     command: &gears-cluster-cmd redis-server --protected-mode no --loadmodule /build/target/release/libredisgears.so v8-plugin-path /build/target/release/libredisgears_v8_plugin.so --cluster-enabled yes
     networks:
       default:
         ipv4_address: 172.31.100.191
   gears-cluster-2-0-node-2:
+    logging: *logging
     image: *gears-cluster-img
     command: *gears-cluster-cmd
     networks:
       default:
         ipv4_address: 172.31.100.192
   gears-cluster-2-0-node-3:
+    logging: *logging
     image: *gears-cluster-img
     command: *gears-cluster-cmd
     networks:
       default:
         ipv4_address: 172.31.100.193
   gears-cluster-2-0-node-4:
+    logging: *logging
     image: *gears-cluster-img
     command: *gears-cluster-cmd
     networks:
       default:
         ipv4_address: 172.31.100.194
   gears-cluster-2-0-node-5:
+    logging: *logging
     image: *gears-cluster-img
     command: *gears-cluster-cmd
     networks:
       default:
         ipv4_address: 172.31.100.195
   gears-cluster-2-0-node-6:
+    logging: *logging
     image: *gears-cluster-img
     command: *gears-cluster-cmd
     networks:
@@ -210,6 +238,7 @@ services:
 
   # redis enterprise
   redis-enterprise:
+    logging: *logging
     build: ./rte/redis-enterprise
     cap_add:
       - sys_resource

tests/e2e/test-data/import-databases/racompFullSSH.json

@@ -90,7 +90,7 @@
 		"enablePreferredSlaves": false,
 		"sshKeyPassphrase": "test",
 		"sshKeyFileBookmark": "Ym9vaywDAAAAAAQQMAAAAIBWP/gr7z3b88NnoG4DgHrVdcb9xooy0jrMPBXgQNZ5KAIAAAQAAAADAwAAAAgAKAUAAAABAQAAVXNlcnMAAAAPAAAAAQEAAHZsYWRpc2xhdmRhcmdlbAAIAAAAAQEAAFByb2plY3RzCAAAAAEBAABzc2gtZW52cwMAAAABAQAAc3NoAAQAAAABAQAAa2V5cwUAAAABAQAAdGVzdHAAAAAcAAAAAQYAABAAAAAgAAAAOAAAAEgAAABYAAAAZAAAAHAAAAAIAAAABAMAAAFdAAAAAAAACAAAAAQDAAB2gQAAAAAAAAgAAAAEAwAAQpMRAAAAAAAIAAAABAMAAC783QAAAAAACAAAAAQDAAAz/N0AAAAAAAgAAAAEAwAANPzdAAAAAAAIAAAABAMAADn83QAAAAAAHAAAAAEGAACkAAAAtAAAAMQAAADUAAAA5AAAAPQAAAAEAQAACAAAAAAEAABBxLVvdQAAABgAAAABAgAAAQAAAAAAAAAPAAAAAAAAAAAAAAAAAAAACAAAAAQDAAAFAAAAAAAAAAQAAAADAwAA9QEAAAgAAAABCQAAZmlsZTovLy8MAAAAAQEAAE1hY2ludG9zaCBIRAgAAAAEAwAAAACHETkAAAAIAAAAAAQAAEHEUm5rAAAAJAAAAAEBAABDMjExQUM1Qy00MTlGLTQ0NTQtOEZEOS0xNDEwMDFBMDhFOTQYAAAAAQIAAIEAAAABAAAA7xMAAAEAAAAAAAAAAAAAAAEAAAABAQAALwAAAAAAAAABBQAAzAAAAP7///8BAAAAAAAAABAAAAAEEAAAgAAAAAAAAAAFEAAAFAEAAAAAAAAQEAAASAEAAAAAAABAEAAAOAEAAAAAAAACIAAAFAIAAAAAAAAFIAAAhAEAAAAAAAAQIAAAlAEAAAAAAAARIAAAyAEAAAAAAAASIAAAqAEAAAAAAAATIAAAuAEAAAAAAAAgIAAA9AEAAAAAAAAwIAAAIAIAAAAAAAABwAAAaAEAAAAAAAARwAAAIAAAAAAAAAASwAAAeAEAAAAAAAAQ0AAABAAAAAAAAAA=",
-		"sshKeyFile": "/root/ssh/sshPrivateKeyPasscode",
+		"sshKeyFile": "/test-data/ssh/sshPrivateKeyPasscode",
 		"sshPassword": null,
 		"sshUser": "u",
 		"sshPort": 2222,
@@ -121,7 +121,7 @@
 		"enablePreferredSlaves": false,
 		"sshKeyPassphrase": null,
 		"sshKeyFileBookmark": "Ym9vaygDAAAAAAQQMAAAAFCmPsFThwh4jmVDMVb0pSIjuOx1dHbxRiMdvR0o1X/gJAIAAAQAAAADAwAAAAgAKAUAAAABAQAAVXNlcnMAAAAPAAAAAQEAAHZsYWRpc2xhdmRhcmdlbAAIAAAAAQEAAFByb2plY3RzCAAAAAEBAABzc2gtZW52cwMAAAABAQAAc3NoAAQAAAABAQAAa2V5cwQAAAABAQAAdGVzdBwAAAABBgAAEAAAACAAAAA4AAAASAAAAFgAAABkAAAAcAAAAAgAAAAEAwAAAV0AAAAAAAAIAAAABAMAAHaBAAAAAAAACAAAAAQDAABCkxEAAAAAAAgAAAAEAwAALvzdAAAAAAAIAAAABAMAADP83QAAAAAACAAAAAQDAAA0/N0AAAAAAAgAAAAEAwAANfzdAAAAAAAcAAAAAQYAAKAAAACwAAAAwAAAANAAAADgAAAA8AAAAAABAAAIAAAAAAQAAEHEtW9qAAAAGAAAAAECAAABAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAIAAAABAMAAAUAAAAAAAAABAAAAAMDAAD1AQAACAAAAAEJAABmaWxlOi8vLwwAAAABAQAATWFjaW50b3NoIEhECAAAAAQDAAAAAIcROQAAAAgAAAAABAAAQcRSbmsAAAAkAAAAAQEAAEMyMTFBQzVDLTQxOUYtNDQ1NC04RkQ5LTE0MTAwMUEwOEU5NBgAAAABAgAAgQAAAAEAAADvEwAAAQAAAAAAAAAAAAAAAQAAAAEBAAAvAAAAAAAAAAEFAADMAAAA/v///wEAAAAAAAAAEAAAAAQQAAB8AAAAAAAAAAUQAAAQAQAAAAAAABAQAABEAQAAAAAAAEAQAAA0AQAAAAAAAAIgAAAQAgAAAAAAAAUgAACAAQAAAAAAABAgAACQAQAAAAAAABEgAADEAQAAAAAAABIgAACkAQAAAAAAABMgAAC0AQAAAAAAACAgAADwAQAAAAAAADAgAAAcAgAAAAAAAAHAAABkAQAAAAAAABHAAAAgAAAAAAAAABLAAAB0AQAAAAAAABDQAAAEAAAAAAAAAA==",
-		"sshKeyFile": "/root/ssh/sshPrivateKey",
+		"sshKeyFile": "/test-data/ssh/sshPrivateKey",
 		"sshPassword": null,
 		"sshUser": "u",
 		"sshPort": 2222,
@@ -187,7 +187,7 @@
 		"ssh_host": "172.31.100.245",
 		"ssh_password": "",
 		"ssh_port": 2222,
-		"ssh_private_key_path": "/root/ssh/sshPrivateKeyPasscode",
+		"ssh_private_key_path": "/test-data/ssh/sshPrivateKeyPasscode",
 		"ssh_user": "u",
 		"timeout_connect": 60000,
 		"timeout_execute": 60000,
@@ -202,7 +202,7 @@
 		"ssh_password": "test",
 		"ssh_port": 2222,
 		"ssh_private_key_path": "",
-		"ssh_agent_path": "/root/ssh/sshPrivateKeyPasscode",
+		"ssh_agent_path": "/test-data/ssh/sshPrivateKeyPasscode",
 		"ssh_user": "u",
 		"timeout_connect": 60000,
 		"timeout_execute": 60000,
@@ -266,4 +266,4 @@
 		"id": "1cafc9cc-bfe3-4b60-9a29-adf033cbd909",
 		"result": "partial"
 	}
-]
+]

tests/e2e/test-data/import-databases/rdm-certificates.json

@@ -48,27 +48,27 @@
 		"host": "localhost",
 		"port": 8102,
 		"name": "theSameBody1Path",
-		"ssl_ca_cert_path": "/root/certs/certsByPath/caPath.crt",
-		"ssl_local_cert_path": "/root/certs/certsByPath/clientPath.crt",
-		"ssl_private_key_path": "/root/certs/certsByPath/clientPath.key",
+		"ssl_ca_cert_path": "/test-data/certs/certsByPath/caPath.crt",
+		"ssl_local_cert_path": "/test-data/certs/certsByPath/clientPath.crt",
+		"ssl_private_key_path": "/test-data/certs/certsByPath/clientPath.key",
 		"result": "success"
 	},
 	{
 		"host": "localhost",
 		"port": 8101,
 		"name": "theSameBody2Path",
-		"ssl_ca_cert_path": "/root/certs/certsByPath/caSameBody.crt",
-		"ssl_local_cert_path": "/root/certs/certsByPath/clientSameBody.crt",
-		"ssl_private_key_path": "/root/certs/certsByPath/clientSameBody.key",
+		"ssl_ca_cert_path": "/test-data/certs/certsByPath/caSameBody.crt",
+		"ssl_local_cert_path": "/test-data/certs/certsByPath/clientSameBody.crt",
+		"ssl_private_key_path": "/test-data/certs/certsByPath/clientSameBody.key",
 		"result": "success"
 	},
 	{
 		"host": "localhost",
 		"port": 8103,
 		"name": "theSameNamePath",
-		"ssl_ca_cert_path": "/root/certs/sameNameCerts/caPath.crt",
-		"ssl_local_cert_path": "/root/certs/sameNameCerts/clientPath.crt",
-		"ssl_private_key_path": "/root/certs/sameNameCerts/clientPath.key",
+		"ssl_ca_cert_path": "/test-data/certs/sameNameCerts/caPath.crt",
+		"ssl_local_cert_path": "/test-data/certs/sameNameCerts/clientPath.crt",
+		"ssl_private_key_path": "/test-data/certs/sameNameCerts/clientPath.key",
 		"result": "success"
 	}
-]
+]