Compose for running automation against environments using linodemanag…

…er-e2e-v2 (#4208)
linode · Dec 12, 2018 · 1211912 · 1211912
1 parent c3159ca
commit 1211912
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/ci-environment-test.yml b/ci-environment-test.yml
@@ -0,0 +1,34 @@
+version: '3.1'
+services:
+  selenium:
+    image: selenium/hub:3.13.0-argon
+  chrome:
+    image: selenium/node-chrome:3.13.0-argon
+    volumes:
+      - /dev/shm:/dev/shm #Mitigates the Chromium issue described at https://code.google.com/p/chromium/issues/detail?id=519952
+    environment:
+      - HUB_PORT_4444_TCP_ADDR=selenium
+      - HUB_PORT_4444_TCP_PORT=4444
+      - SCREEN_HEIGHT=1080
+      - SCREEN_WIDTH=1600
+    depends_on:
+      - selenium
+  manager-e2e:
+    environment:
+      - DOCKER=true
+      - REACT_APP_APP_ROOT=${REACT_APP_APP_ROOT}
+      - REACT_APP_API_ROOT=${REACT_APP_API_ROOT}
+      - MANAGER_USER=${MANAGER_USER}
+      - MANAGER_PASS=${MANAGER_PASS}
+      - MANAGER_USER_2=${MANAGER_USER_2}
+      - MANAGER_PASS_2=${MANAGER_PASS_2}
+      - MANAGER_OAUTH=${MANAGER_OAUTH}
+      - MANAGER_OAUTH_2=${MANAGER_OAUTH_2}
+    build:
+      context: .
+      dockerfile: Dockerfile
+    volumes:
+      - ./e2e/test-results:/src/e2e/test-results
+    entrypoint: ["./scripts/wait-for-it.sh", "-t", "250", "-s", "selenium:4444", "--", "yarn","e2e", "--log"]
+    depends_on:
+      - chrome
diff --git a/e2e/config/wdio.conf.js b/e2e/config/wdio.conf.js
@@ -125,7 +125,7 @@ exports.config = {
     // with `/`, the base url gets prepended, not including the path portion of your baseUrl.
     // If your `url` parameter starts without a scheme or `/` (like `some/path`), the base url
     // gets prepended directly.
-    baseUrl: process.env.DOCKER ? 'https://manager-local:3000' : process.env.REACT_APP_APP_ROOT,
+    baseUrl: process.env.REACT_APP_APP_ROOT,
     //
     // Default timeout for all waitFor* commands.
     waitforTimeout: process.env.DOCKER || process.env.BROWSERSTACK_USERNAME ? 30000 : 10000,

diff --git a/integration-test.yml b/integration-test.yml
@@ -16,7 +16,7 @@ services:
   manager-local:
     environment:
       - HTTPS=true
-      - REACT_APP_APP_ROOT=https://manager-local:3000
+      - REACT_APP_APP_ROOT=${REACT_APP_APP_ROOT}
       - REACT_APP_LOGIN_ROOT=${REACT_APP_LOGIN_ROOT}
       - REACT_APP_CLIENT_ID=${REACT_APP_CLIENT_ID}
       - REACT_APP_API_ROOT=${REACT_APP_API_ROOT}
@@ -30,6 +30,7 @@ services:
   manager-e2e:
     environment:
       - DOCKER=true
+      - REACT_APP_APP_ROOT=${REACT_APP_APP_ROOT}
       - REACT_APP_API_ROOT=${REACT_APP_API_ROOT}
       - MANAGER_USER=${MANAGER_USER}
       - MANAGER_PASS=${MANAGER_PASS}