split 04 test suite in two

Fixes ibm-functions#1086
rabbah · Aug 2, 2018 · 29d08da · 29d08da
1 parent a385909
commit 29d08da
Show file tree

Hide file tree

Showing 43 changed files with 83 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -59,7 +59,7 @@ install:
 
 # if for some reason we want to avoid the use of travis jobs:
 #script: (cd tests && npm run test)
-#script: (cd tests && ./bin/runLocal.sh 01 08 07 02 03 04 05)
+#script: (cd tests && ./bin/runLocal.sh 01 08 07 02 03 04a 04b 05)
 
 jobs:
   include:
@@ -69,5 +69,7 @@ jobs:
       env: EXECUTING=07
     - script: (cd tests && ./bin/runLocal.sh 03)
       env: EXECUTING=03
-    - script: (cd tests && ./bin/runLocal.sh 04)
-      env: EXECUTING=04
+    - script: (cd tests && ./bin/runLocal.sh 04a)
+      env: EXECUTING=04a
+    - script: (cd tests && ./bin/runLocal.sh 04b)
+      env: EXECUTING=04b
diff --git a/tests/tests/passes/04/apis.js → tests/tests/passes/04a/apis.js b/tests/tests/passes/04/apis.js → tests/tests/passes/04a/apis.js
diff --git a/tests/tests/passes/04/append-to-sequence.js → tests/tests/passes/04a/append-to-sequence.js b/tests/tests/passes/04/append-to-sequence.js → tests/tests/passes/04a/append-to-sequence.js
diff --git a/tests/tests/passes/04/at-file-params.js → tests/tests/passes/04a/at-file-params.js b/tests/tests/passes/04/at-file-params.js → tests/tests/passes/04a/at-file-params.js
diff --git a/...s/tests/passes/04/auth-from-slash-auth.js → .../tests/passes/04a/auth-from-slash-auth.js b/...s/tests/passes/04/auth-from-slash-auth.js → .../tests/passes/04a/auth-from-slash-auth.js
diff --git a/tests/tests/passes/04/auth.js → tests/tests/passes/04a/auth.js b/tests/tests/passes/04/auth.js → tests/tests/passes/04a/auth.js
diff --git a/tests/tests/passes/04/await.js → tests/tests/passes/04a/await.js b/tests/tests/passes/04/await.js → tests/tests/passes/04a/await.js
diff --git a/.../04/click-on-action-part-of-activation.js → ...04a/click-on-action-part-of-activation.js b/.../04/click-on-action-part-of-activation.js → ...04a/click-on-action-part-of-activation.js
diff --git a/tests/tests/passes/04/click-on-context.js → tests/tests/passes/04a/click-on-context.js b/tests/tests/passes/04/click-on-context.js → tests/tests/passes/04a/click-on-context.js
diff --git a/tests/tests/passes/04/click-on-selection.js → tests/tests/passes/04a/click-on-selection.js b/tests/tests/passes/04/click-on-selection.js → tests/tests/passes/04a/click-on-selection.js
diff --git a/tests/tests/passes/04/debugger.js → tests/tests/passes/04a/debugger.js b/tests/tests/passes/04/debugger.js → tests/tests/passes/04a/debugger.js
diff --git a/tests/tests/passes/04/edit-new.js → tests/tests/passes/04a/edit-new.js b/tests/tests/passes/04/edit-new.js → tests/tests/passes/04a/edit-new.js
diff --git a/tests/tests/passes/04/edit.js → tests/tests/passes/04a/edit.js b/tests/tests/passes/04/edit.js → tests/tests/passes/04a/edit.js
diff --git a/tests/tests/passes/04/every.js → tests/tests/passes/04a/every.js b/tests/tests/passes/04/every.js → tests/tests/passes/04a/every.js
diff --git a/tests/tests/passes/04/fancy-context.js → tests/tests/passes/04a/fancy-context.js b/tests/tests/passes/04/fancy-context.js → tests/tests/passes/04a/fancy-context.js
diff --git a/tests/tests/passes/04/history.js → tests/tests/passes/04a/history.js b/tests/tests/passes/04/history.js → tests/tests/passes/04a/history.js
diff --git a/tests/tests/passes/04/jar.js → tests/tests/passes/04a/jar.js b/tests/tests/passes/04/jar.js → tests/tests/passes/04a/jar.js
diff --git a/tests/tests/passes/04/let-anonymous.js → tests/tests/passes/04a/let-anonymous.js b/tests/tests/passes/04/let-anonymous.js → tests/tests/passes/04a/let-anonymous.js
diff --git a/tests/tests/passes/04/let-base64.js → tests/tests/passes/04a/let-base64.js b/tests/tests/passes/04/let-base64.js → tests/tests/passes/04a/let-base64.js
diff --git a/tests/tests/passes/04/let-remote.js → tests/tests/passes/04a/let-remote.js b/tests/tests/passes/04/let-remote.js → tests/tests/passes/04a/let-remote.js
diff --git a/tests/tests/passes/04/let-webjs.js → tests/tests/passes/04b/let-webjs.js b/tests/tests/passes/04/let-webjs.js → tests/tests/passes/04b/let-webjs.js
diff --git a/tests/tests/passes/04/let-with-dots.js → tests/tests/passes/04b/let-with-dots.js b/tests/tests/passes/04/let-with-dots.js → tests/tests/passes/04b/let-with-dots.js
diff --git a/tests/tests/passes/04/let-with-spaces.js → tests/tests/passes/04b/let-with-spaces.js b/tests/tests/passes/04/let-with-spaces.js → tests/tests/passes/04b/let-with-spaces.js
diff --git a/tests/tests/passes/04/let.js → tests/tests/passes/04b/let.js b/tests/tests/passes/04/let.js → tests/tests/passes/04b/let.js
diff --git a/tests/tests/passes/04/limits-via-let.js → tests/tests/passes/04b/limits-via-let.js b/tests/tests/passes/04/limits-via-let.js → tests/tests/passes/04b/limits-via-let.js
diff --git a/tests/tests/passes/04/limits.js → tests/tests/passes/04b/limits.js b/tests/tests/passes/04/limits.js → tests/tests/passes/04b/limits.js
diff --git a/tests/tests/passes/04/local.js → tests/tests/passes/04b/local.js b/tests/tests/passes/04/local.js → tests/tests/passes/04b/local.js
diff --git a/tests/tests/passes/04/on.js → tests/tests/passes/04b/on.js b/tests/tests/passes/04/on.js → tests/tests/passes/04b/on.js
diff --git a/tests/tests/passes/04/pagination.js → tests/tests/passes/04b/pagination.js b/tests/tests/passes/04/pagination.js → tests/tests/passes/04b/pagination.js
diff --git a/tests/tests/passes/04/paste.js → tests/tests/passes/04b/paste.js b/tests/tests/passes/04/paste.js → tests/tests/passes/04b/paste.js
diff --git a/tests/tests/passes/04/rm-with-wildcards.js → tests/tests/passes/04b/rm-with-wildcards.js b/tests/tests/passes/04/rm-with-wildcards.js → tests/tests/passes/04b/rm-with-wildcards.js
diff --git a/tests/tests/passes/04/rm.js → tests/tests/passes/04b/rm.js b/tests/tests/passes/04/rm.js → tests/tests/passes/04b/rm.js
diff --git a/tests/tests/passes/04/roots-with-error.js → tests/tests/passes/04b/roots-with-error.js b/tests/tests/passes/04/roots-with-error.js → tests/tests/passes/04b/roots-with-error.js
diff --git a/tests/tests/passes/04/roots.js → tests/tests/passes/04b/roots.js b/tests/tests/passes/04/roots.js → tests/tests/passes/04b/roots.js
diff --git a/tests/tests/passes/04/run.js → tests/tests/passes/04b/run.js b/tests/tests/passes/04/run.js → tests/tests/passes/04b/run.js
diff --git a/tests/tests/passes/04/seq-let.js → tests/tests/passes/04b/seq-let.js b/tests/tests/passes/04/seq-let.js → tests/tests/passes/04b/seq-let.js
diff --git a/tests/tests/passes/04/webbify.js → tests/tests/passes/04b/webbify.js b/tests/tests/passes/04/webbify.js → tests/tests/passes/04b/webbify.js
diff --git a/...passes/04/z-activation-list-drilldowns.js → ...asses/04b/z-activation-list-drilldowns.js b/...passes/04/z-activation-list-drilldowns.js → ...asses/04b/z-activation-list-drilldowns.js
diff --git a/tests/tests/passes/04/zip.js → tests/tests/passes/04b/zip.js b/tests/tests/passes/04/zip.js → tests/tests/passes/04b/zip.js
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
@@ -15,6 +15,9 @@ grep -vE 'controller1|invoker1' hosts.bak > hosts.j2.ini
 # Install OpenWhisk
 cd $WHISKDIR/ansible
 
+# smash in our smaller set up required runtimes
+cp "$SCRIPTDIR/runtimes.json" "$WHISKDIR/ansible/files"
+
 # note that we increase the quotas on invocations per minute and concurrent invocations (per namespace)
 ANSIBLE_CMD="ansible-playbook -i environments/local -e docker_image_prefix=openwhisk -e limit_invocations_per_minute=600 -e limit_invocations_concurrent=100"
 
@@ -23,7 +26,7 @@ $ANSIBLE_CMD prereq.yml
 #(cd $ROOTDIR/tests/docker && ./build.sh) & # initialize test docker base image, in parallel (!!! must be after prereq, as it restarts docker)
 $ANSIBLE_CMD couchdb.yml
 $ANSIBLE_CMD initdb.yml
-$ANSIBLE_CMD apigateway.yml  # not needed directly, but it comes with redis, which we need
+$ANSIBLE_CMD apigateway.yml  # not needed directly, but it comes with redis if we need it
 
 cd $WHISKDIR
 ./gradlew  -PdockerImagePrefix=openwhisk

diff --git a/tools/travis/init_auth.sh b/tools/travis/init_auth.sh
@@ -25,7 +25,8 @@ cd $SCRIPTDIR
 ./wskadmin user delete user01  | grep -v "Failed to delete subject"
 ./wskadmin user delete user02  | grep -v "Failed to delete subject"
 ./wskadmin user delete user03  | grep -v "Failed to delete subject"
-./wskadmin user delete user04  | grep -v "Failed to delete subject"
+./wskadmin user delete user04a  | grep -v "Failed to delete subject"
+./wskadmin user delete user04ab  | grep -v "Failed to delete subject"
 ./wskadmin user delete user04b | grep -v "Failed to delete subject"
 ./wskadmin user delete user05  | grep -v "Failed to delete subject"
 ./wskadmin user delete user06  | grep -v "Failed to delete subject"
@@ -35,7 +36,8 @@ cd $SCRIPTDIR
 ./wskadmin user create user01 -ns ns01 > $DIR/01    2> /dev/null
 ./wskadmin user create user02 -ns ns02 > $DIR/02    2> /dev/null
 ./wskadmin user create user03 -ns ns03 > $DIR/03    2> /dev/null
-./wskadmin user create user04 -ns ns04 > $DIR/04    2> /dev/null
+./wskadmin user create user04a -ns ns04a > $DIR/04a    2> /dev/null
+./wskadmin user create user04ab -ns ns04ab > $DIR/04ab    2> /dev/null
 ./wskadmin user create user04b -ns ns04b > $DIR/04b 2> /dev/null
 ./wskadmin user create user05 -ns ns05 > $DIR/05    2> /dev/null
 ./wskadmin user create user06 -ns ns06 > $DIR/06    2> /dev/null

diff --git a/tools/travis/runtimes.json b/tools/travis/runtimes.json
@@ -0,0 +1,69 @@
+{
+    "runtimes": {
+        "nodejs": [
+            {
+                "kind": "nodejs",
+                "image": {
+                    "prefix": "openwhisk",
+                    "name": "nodejsaction",
+                    "tag": "latest"
+                },
+                "deprecated": true
+            },
+            {
+                "kind": "nodejs:6",
+                "default": true,
+                "image": {
+                    "prefix": "openwhisk",
+                    "name": "nodejs6action",
+                    "tag": "latest"
+                },
+                "deprecated": false,
+                "stemCells": [{
+                    "count": 2,
+                    "memory": "256 MB"
+                }]
+            }
+        ],
+        "python": [
+            {
+                "kind": "python",
+                "image": {
+                    "prefix": "openwhisk",
+                    "name": "nodejs6action",
+                    "tag": "latest"
+                },
+                "deprecated": false
+            }
+        ],
+        "swift": [
+            {
+                "kind": "swift",
+                "image": {
+                    "prefix": "openwhisk",
+                    "name": "nodejs6action",
+                    "tag": "latest"
+                },
+                "deprecated": true
+            }
+        ],
+        "java": [
+            {
+                "kind": "java",
+                "default": true,
+                "image": {
+                    "prefix": "openwhisk",
+                    "name": "java8action",
+                    "tag": "latest"
+                },
+                "deprecated": false,
+                "attached": {
+                    "attachmentName": "jarfile",
+                    "attachmentType": "application/java-archive"
+                },
+                "requireMain": true
+            }
+        ]
+    },
+    "blackboxes": []
+}
diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh
@@ -2,9 +2,7 @@
 
 SCRIPTDIR=$(cd $(dirname "$0") && pwd)
 HOMEDIR="$SCRIPTDIR/../../../"
-
-# install node and npm
-#sudo apt-get -y install nodejs npm
+WHISKDIR="$ROOTDIR/openwhisk"
 
 cd $HOMEDIR