[ARVADOS-WORKBENCH2] updated: 1.4.1-315-g0c1be947

[Git user]

Summary of changes:
 tools/run-integration-tests.sh | 54 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 50 insertions(+), 4 deletions(-)

       via  0c1be947ff362ebf31e2af9440abbb4464a8c6f5 (commit)
      from  855193b8c5ab28a2b82999b0f4911d17f874303b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 0c1be947ff362ebf31e2af9440abbb4464a8c6f5
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Tue Apr 21 12:18:23 2020 -0300

    16029: Adds options to orchestration script to allow interactive mode.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/tools/run-integration-tests.sh b/tools/run-integration-tests.sh
index 74476b8e..68e8a560 100755
--- a/tools/run-integration-tests.sh
+++ b/tools/run-integration-tests.sh
@@ -9,7 +9,9 @@ cleanup() {
     set -x
     kill ${arvboot_PID} ${consume_stdout_PID} ${wb2_PID} ${consume_wb2_stdout_PID}
     wait ${arvboot_PID} ${consume_stdout_PID} ${wb2_PID} ${consume_wb2_stdout_PID} || true
-    rm -rf ${ARVADOS_DIR}
+    if [ "${CLEANUP_ARVADOS_DIR}" -eq "1" ]; then
+        rm -rf ${ARVADOS_DIR}
+    fi
     echo >&2 "done"
 }
 
@@ -21,20 +23,64 @@ random_free_port() {
     echo $port
 }
 
+usage() {
+    echo "Usage: ${0} [options]"
+    echo "Options:"
+    echo "  -i            Run Cypress in interactive mode."
+    echo "  -a PATH       Arvados dir. If PATH doesn't exist, a repo clone is downloaded there."
+    echo "  -w PATH       Workbench2 dir. Default: Current working directory"
+    exit 0
+}
+
 # Allow self-signed certs on 'wait-on'
 export NODE_TLS_REJECT_UNAUTHORIZED=0
 
+CLEANUP_ARVADOS_DIR=0
+CYPRESS_MODE="run"
 ARVADOS_DIR=`mktemp -d`
-ARVADOS_LOG=${ARVADOS_DIR}/arvados.log
 WB2_DIR=`pwd`
+
+while getopts "ia:w:" o; do
+    case "${o}" in
+        i)
+            # Interactive mode
+            CYPRESS_MODE="open"
+            ;;
+        a)
+            ARVADOS_DIR=${OPTARG}
+            ;;
+        w)
+            WB2_DIR=${OPTARG}
+            ;;
+        *)
+            echo "Invalid Option: -$OPTARG" 1>&2
+            usage
+            ;;
+    esac
+done
+shift $((OPTIND-1))
+
+ARVADOS_LOG=${ARVADOS_DIR}/arvados.log
 ARVADOS_CONF=${WB2_DIR}/tools/arvados_config.yml
 
+if [ ! -f "${WB2_DIR}/src/index.tsx" ]; then
+    echo "ERROR: '${WB2_DIR}' isn't workbench2's directory"
+    usage
+fi
+
+if [ ! -f ${ARVADOS_CONF} ]; then
+    echo "ERROR: Arvados config file ${ARVADOS_CONF} not found"
+    exit 1
+fi
+
 if [ -f "${WB2_DIR}/public/config.json" ]; then
     echo "ERROR: Cannot run with Workbench2's public/config.json file"
     exit 1
 fi
 
-if [ ! -d "${ARVADOS_DIR}/lib" ]; then
+if [ ! -d "${ARVADOS_DIR}/.git" ]; then
+    mkdir -p ${ARVADOS_DIR} || exit 1
+    CLEANUP_ARVADOS_DIR=1
     echo "Downloading arvados..."
     git clone https://git.arvados.org/arvados.git ${ARVADOS_DIR} || exit 1
 fi
@@ -82,4 +128,4 @@ echo "Running tests..."
 CYPRESS_system_token=systemusertesttoken1234567890aoeuidhtnsqjkxbmwvzpy \
     CYPRESS_controller_url=${controllerURL} \
     CYPRESS_BASE_URL=https://localhost:${WB2_PORT} \
-    yarn run cypress run
+    yarn run cypress ${CYPRESS_MODE}

-----------------------------------------------------------------------


hooks/post-receive
--