[E2E] Resolve conflicts and merge new changes

Author: elenaNaboko

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

@@ -15,7 +15,11 @@ services:
         './upload-custom-plugins.sh',
     ]
     environment:
-      TEST_FILES: $TEST_FILES
+      E2E_CLOUD_DATABASE_HOST: $E2E_CLOUD_DATABASE_HOST
+      E2E_CLOUD_DATABASE_PORT: $E2E_CLOUD_DATABASE_PORT
+      E2E_CLOUD_DATABASE_PASSWORD: $E2E_CLOUD_DATABASE_PASSWORD
+      E2E_CLOUD_DATABASE_USERNAME: $E2E_CLOUD_DATABASE_USERNAME
+      E2E_CLOUD_DATABASE_NAME: $E2E_CLOUD_DATABASE_NAME
     command: [
         './wait-for-it.sh', 'redis-enterprise:12000', '-s', '-t', '120',
         '--',

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

@@ -13,7 +13,11 @@ services:
       - ./.env
     environment:
       COMMON_URL: 'http://app:5000'
-      TEST_FILES: $TEST_FILES
+      E2E_CLOUD_DATABASE_HOST: $E2E_CLOUD_DATABASE_HOST
+      E2E_CLOUD_DATABASE_PORT: $E2E_CLOUD_DATABASE_PORT
+      E2E_CLOUD_DATABASE_PASSWORD: $E2E_CLOUD_DATABASE_PASSWORD
+      E2E_CLOUD_DATABASE_USERNAME: $E2E_CLOUD_DATABASE_USERNAME
+      E2E_CLOUD_DATABASE_NAME: $E2E_CLOUD_DATABASE_NAME
     entrypoint: [
         './upload-custom-plugins.sh',
     ]

tests/e2e/tests/regression/database/overview.e2e.ts

@@ -13,12 +13,10 @@ fixture `Overview`
     .page(commonUrl)
     .beforeEach(async() => {
         await acceptLicenseTerms();
-        console.log(`cloudDatabaseConfig.HOST: ${cloudDatabaseConfig.host}`);
-        console.log(`cloudDatabaseConfig.PORT: ${cloudDatabaseConfig.port}`);
         await addRedisDatabasePage.addRedisDataBase(cloudDatabaseConfig);
         //Click for saving
         await t.click(addRedisDatabasePage.addRedisDatabaseButton);
-        //Increase timeout to add Cloud DB
+        //Increase timeout to add Cloud DB (due to RI-1993 issue)
         await t.wait(5000);
         //Refresh the page
         await t.eval(() => location.reload(true));