21764: Preload cypress in wb2 build docker and start cypress as e2e by default

Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen@curii.com>

diff --git a/services/workbench2/docker/Dockerfile b/services/workbench2/docker/Dockerfile
index fa4266191aa0c3f8998cc92f879ba4195b6aef4a..be8b9d9c632729e39c8c0d9a928f9bf7dc8a34de 100644 (file)
--- a/services/workbench2/docker/Dockerfile
+++ b/services/workbench2/docker/Dockerfile
@@ -33,7 +33,12 @@ RUN cd /usr/src/arvados && \
 RUN cd /usr/src/arvados && \
     apt-get update && \
     go mod download && \
-    go run ./cmd/arvados-server install -type test && cd .. && \
+    go run ./cmd/arvados-server install -type test && \
+    # Installing WB2 deps persists cypress to the home folder
+    # This is convenient to running cypress locally where yarn is run outside the container
+    cd services/workbench2 && \
+    yarn install && \
+    cd /usr/src/arvados && \
     rm -rf arvados && \
     apt-get clean
 

diff --git a/services/workbench2/tools/run-integration-tests.sh b/services/workbench2/tools/run-integration-tests.sh
index b2745b3a6e1ca90cace7b5b797d05e8e4e4cd61b..2c3717f00db7e1eb5582c1d8601adc0460df9147 100755 (executable)
--- a/services/workbench2/tools/run-integration-tests.sh
+++ b/services/workbench2/tools/run-integration-tests.sh
@@ -41,7 +41,7 @@ while getopts "ia:w:" o; do
     case "${o}" in
         i)
             # Interactive mode
-            CYPRESS_MODE="open"
+            CYPRESS_MODE="open --e2e"
             ;;
         a)
             ARVADOS_DIR=${OPTARG}