From 29d08da71bf0c7b0b6297ae4a1e07b95dafb5e88 Mon Sep 17 00:00:00 2001 From: Nick Mitchell Date: Thu, 2 Aug 2018 08:04:47 -0400 Subject: [PATCH] split 04 test suite in two Fixes #1086 --- .travis.yml | 8 ++- tests/tests/passes/{04 => 04a}/apis.js | 0 .../passes/{04 => 04a}/append-to-sequence.js | 0 .../passes/{04 => 04a}/at-file-params.js | 0 .../{04 => 04a}/auth-from-slash-auth.js | 0 tests/tests/passes/{04 => 04a}/auth.js | 0 tests/tests/passes/{04 => 04a}/await.js | 0 .../click-on-action-part-of-activation.js | 0 .../passes/{04 => 04a}/click-on-context.js | 0 .../passes/{04 => 04a}/click-on-selection.js | 0 tests/tests/passes/{04 => 04a}/debugger.js | 0 tests/tests/passes/{04 => 04a}/edit-new.js | 0 tests/tests/passes/{04 => 04a}/edit.js | 0 tests/tests/passes/{04 => 04a}/every.js | 0 .../tests/passes/{04 => 04a}/fancy-context.js | 0 tests/tests/passes/{04 => 04a}/history.js | 0 tests/tests/passes/{04 => 04a}/jar.js | 0 .../tests/passes/{04 => 04a}/let-anonymous.js | 0 tests/tests/passes/{04 => 04a}/let-base64.js | 0 tests/tests/passes/{04 => 04a}/let-remote.js | 0 tests/tests/passes/{04 => 04b}/let-webjs.js | 0 .../tests/passes/{04 => 04b}/let-with-dots.js | 0 .../passes/{04 => 04b}/let-with-spaces.js | 0 tests/tests/passes/{04 => 04b}/let.js | 0 .../passes/{04 => 04b}/limits-via-let.js | 0 tests/tests/passes/{04 => 04b}/limits.js | 0 tests/tests/passes/{04 => 04b}/local.js | 0 tests/tests/passes/{04 => 04b}/on.js | 0 tests/tests/passes/{04 => 04b}/pagination.js | 0 tests/tests/passes/{04 => 04b}/paste.js | 0 .../passes/{04 => 04b}/rm-with-wildcards.js | 0 tests/tests/passes/{04 => 04b}/rm.js | 0 .../passes/{04 => 04b}/roots-with-error.js | 0 tests/tests/passes/{04 => 04b}/roots.js | 0 tests/tests/passes/{04 => 04b}/run.js | 0 tests/tests/passes/{04 => 04b}/seq-let.js | 0 tests/tests/passes/{04 => 04b}/webbify.js | 0 .../z-activation-list-drilldowns.js | 0 tests/tests/passes/{04 => 04b}/zip.js | 0 tools/travis/build.sh | 5 +- tools/travis/init_auth.sh | 6 +- tools/travis/runtimes.json | 69 +++++++++++++++++++ tools/travis/setup.sh | 4 +- 43 files changed, 83 insertions(+), 9 deletions(-) rename tests/tests/passes/{04 => 04a}/apis.js (100%) rename tests/tests/passes/{04 => 04a}/append-to-sequence.js (100%) rename tests/tests/passes/{04 => 04a}/at-file-params.js (100%) rename tests/tests/passes/{04 => 04a}/auth-from-slash-auth.js (100%) rename tests/tests/passes/{04 => 04a}/auth.js (100%) rename tests/tests/passes/{04 => 04a}/await.js (100%) rename tests/tests/passes/{04 => 04a}/click-on-action-part-of-activation.js (100%) rename tests/tests/passes/{04 => 04a}/click-on-context.js (100%) rename tests/tests/passes/{04 => 04a}/click-on-selection.js (100%) rename tests/tests/passes/{04 => 04a}/debugger.js (100%) rename tests/tests/passes/{04 => 04a}/edit-new.js (100%) rename tests/tests/passes/{04 => 04a}/edit.js (100%) rename tests/tests/passes/{04 => 04a}/every.js (100%) rename tests/tests/passes/{04 => 04a}/fancy-context.js (100%) rename tests/tests/passes/{04 => 04a}/history.js (100%) rename tests/tests/passes/{04 => 04a}/jar.js (100%) rename tests/tests/passes/{04 => 04a}/let-anonymous.js (100%) rename tests/tests/passes/{04 => 04a}/let-base64.js (100%) rename tests/tests/passes/{04 => 04a}/let-remote.js (100%) rename tests/tests/passes/{04 => 04b}/let-webjs.js (100%) rename tests/tests/passes/{04 => 04b}/let-with-dots.js (100%) rename tests/tests/passes/{04 => 04b}/let-with-spaces.js (100%) rename tests/tests/passes/{04 => 04b}/let.js (100%) rename tests/tests/passes/{04 => 04b}/limits-via-let.js (100%) rename tests/tests/passes/{04 => 04b}/limits.js (100%) rename tests/tests/passes/{04 => 04b}/local.js (100%) rename tests/tests/passes/{04 => 04b}/on.js (100%) rename tests/tests/passes/{04 => 04b}/pagination.js (100%) rename tests/tests/passes/{04 => 04b}/paste.js (100%) rename tests/tests/passes/{04 => 04b}/rm-with-wildcards.js (100%) rename tests/tests/passes/{04 => 04b}/rm.js (100%) rename tests/tests/passes/{04 => 04b}/roots-with-error.js (100%) rename tests/tests/passes/{04 => 04b}/roots.js (100%) rename tests/tests/passes/{04 => 04b}/run.js (100%) rename tests/tests/passes/{04 => 04b}/seq-let.js (100%) rename tests/tests/passes/{04 => 04b}/webbify.js (100%) rename tests/tests/passes/{04 => 04b}/z-activation-list-drilldowns.js (100%) rename tests/tests/passes/{04 => 04b}/zip.js (100%) create mode 100644 tools/travis/runtimes.json diff --git a/.travis.yml b/.travis.yml index 123ef9b8..1de805ff 100644 --- 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 b/tests/tests/passes/04a/apis.js similarity index 100% rename from tests/tests/passes/04/apis.js rename to tests/tests/passes/04a/apis.js diff --git a/tests/tests/passes/04/append-to-sequence.js b/tests/tests/passes/04a/append-to-sequence.js similarity index 100% rename from tests/tests/passes/04/append-to-sequence.js rename to tests/tests/passes/04a/append-to-sequence.js diff --git a/tests/tests/passes/04/at-file-params.js b/tests/tests/passes/04a/at-file-params.js similarity index 100% rename from tests/tests/passes/04/at-file-params.js rename to tests/tests/passes/04a/at-file-params.js diff --git a/tests/tests/passes/04/auth-from-slash-auth.js b/tests/tests/passes/04a/auth-from-slash-auth.js similarity index 100% rename from tests/tests/passes/04/auth-from-slash-auth.js rename to tests/tests/passes/04a/auth-from-slash-auth.js diff --git a/tests/tests/passes/04/auth.js b/tests/tests/passes/04a/auth.js similarity index 100% rename from tests/tests/passes/04/auth.js rename to tests/tests/passes/04a/auth.js diff --git a/tests/tests/passes/04/await.js b/tests/tests/passes/04a/await.js similarity index 100% rename from tests/tests/passes/04/await.js rename to tests/tests/passes/04a/await.js diff --git a/tests/tests/passes/04/click-on-action-part-of-activation.js b/tests/tests/passes/04a/click-on-action-part-of-activation.js similarity index 100% rename from tests/tests/passes/04/click-on-action-part-of-activation.js rename to tests/tests/passes/04a/click-on-action-part-of-activation.js diff --git a/tests/tests/passes/04/click-on-context.js b/tests/tests/passes/04a/click-on-context.js similarity index 100% rename from tests/tests/passes/04/click-on-context.js rename to tests/tests/passes/04a/click-on-context.js diff --git a/tests/tests/passes/04/click-on-selection.js b/tests/tests/passes/04a/click-on-selection.js similarity index 100% rename from tests/tests/passes/04/click-on-selection.js rename to tests/tests/passes/04a/click-on-selection.js diff --git a/tests/tests/passes/04/debugger.js b/tests/tests/passes/04a/debugger.js similarity index 100% rename from tests/tests/passes/04/debugger.js rename to tests/tests/passes/04a/debugger.js diff --git a/tests/tests/passes/04/edit-new.js b/tests/tests/passes/04a/edit-new.js similarity index 100% rename from tests/tests/passes/04/edit-new.js rename to tests/tests/passes/04a/edit-new.js diff --git a/tests/tests/passes/04/edit.js b/tests/tests/passes/04a/edit.js similarity index 100% rename from tests/tests/passes/04/edit.js rename to tests/tests/passes/04a/edit.js diff --git a/tests/tests/passes/04/every.js b/tests/tests/passes/04a/every.js similarity index 100% rename from tests/tests/passes/04/every.js rename to tests/tests/passes/04a/every.js diff --git a/tests/tests/passes/04/fancy-context.js b/tests/tests/passes/04a/fancy-context.js similarity index 100% rename from tests/tests/passes/04/fancy-context.js rename to tests/tests/passes/04a/fancy-context.js diff --git a/tests/tests/passes/04/history.js b/tests/tests/passes/04a/history.js similarity index 100% rename from tests/tests/passes/04/history.js rename to tests/tests/passes/04a/history.js diff --git a/tests/tests/passes/04/jar.js b/tests/tests/passes/04a/jar.js similarity index 100% rename from tests/tests/passes/04/jar.js rename to tests/tests/passes/04a/jar.js diff --git a/tests/tests/passes/04/let-anonymous.js b/tests/tests/passes/04a/let-anonymous.js similarity index 100% rename from tests/tests/passes/04/let-anonymous.js rename to tests/tests/passes/04a/let-anonymous.js diff --git a/tests/tests/passes/04/let-base64.js b/tests/tests/passes/04a/let-base64.js similarity index 100% rename from tests/tests/passes/04/let-base64.js rename to tests/tests/passes/04a/let-base64.js diff --git a/tests/tests/passes/04/let-remote.js b/tests/tests/passes/04a/let-remote.js similarity index 100% rename from tests/tests/passes/04/let-remote.js rename to tests/tests/passes/04a/let-remote.js diff --git a/tests/tests/passes/04/let-webjs.js b/tests/tests/passes/04b/let-webjs.js similarity index 100% rename from tests/tests/passes/04/let-webjs.js rename to tests/tests/passes/04b/let-webjs.js diff --git a/tests/tests/passes/04/let-with-dots.js b/tests/tests/passes/04b/let-with-dots.js similarity index 100% rename from tests/tests/passes/04/let-with-dots.js rename to tests/tests/passes/04b/let-with-dots.js diff --git a/tests/tests/passes/04/let-with-spaces.js b/tests/tests/passes/04b/let-with-spaces.js similarity index 100% rename from tests/tests/passes/04/let-with-spaces.js rename to tests/tests/passes/04b/let-with-spaces.js diff --git a/tests/tests/passes/04/let.js b/tests/tests/passes/04b/let.js similarity index 100% rename from tests/tests/passes/04/let.js rename to tests/tests/passes/04b/let.js diff --git a/tests/tests/passes/04/limits-via-let.js b/tests/tests/passes/04b/limits-via-let.js similarity index 100% rename from tests/tests/passes/04/limits-via-let.js rename to tests/tests/passes/04b/limits-via-let.js diff --git a/tests/tests/passes/04/limits.js b/tests/tests/passes/04b/limits.js similarity index 100% rename from tests/tests/passes/04/limits.js rename to tests/tests/passes/04b/limits.js diff --git a/tests/tests/passes/04/local.js b/tests/tests/passes/04b/local.js similarity index 100% rename from tests/tests/passes/04/local.js rename to tests/tests/passes/04b/local.js diff --git a/tests/tests/passes/04/on.js b/tests/tests/passes/04b/on.js similarity index 100% rename from tests/tests/passes/04/on.js rename to tests/tests/passes/04b/on.js diff --git a/tests/tests/passes/04/pagination.js b/tests/tests/passes/04b/pagination.js similarity index 100% rename from tests/tests/passes/04/pagination.js rename to tests/tests/passes/04b/pagination.js diff --git a/tests/tests/passes/04/paste.js b/tests/tests/passes/04b/paste.js similarity index 100% rename from tests/tests/passes/04/paste.js rename to tests/tests/passes/04b/paste.js diff --git a/tests/tests/passes/04/rm-with-wildcards.js b/tests/tests/passes/04b/rm-with-wildcards.js similarity index 100% rename from tests/tests/passes/04/rm-with-wildcards.js rename to tests/tests/passes/04b/rm-with-wildcards.js diff --git a/tests/tests/passes/04/rm.js b/tests/tests/passes/04b/rm.js similarity index 100% rename from tests/tests/passes/04/rm.js rename to tests/tests/passes/04b/rm.js diff --git a/tests/tests/passes/04/roots-with-error.js b/tests/tests/passes/04b/roots-with-error.js similarity index 100% rename from tests/tests/passes/04/roots-with-error.js rename to tests/tests/passes/04b/roots-with-error.js diff --git a/tests/tests/passes/04/roots.js b/tests/tests/passes/04b/roots.js similarity index 100% rename from tests/tests/passes/04/roots.js rename to tests/tests/passes/04b/roots.js diff --git a/tests/tests/passes/04/run.js b/tests/tests/passes/04b/run.js similarity index 100% rename from tests/tests/passes/04/run.js rename to tests/tests/passes/04b/run.js diff --git a/tests/tests/passes/04/seq-let.js b/tests/tests/passes/04b/seq-let.js similarity index 100% rename from tests/tests/passes/04/seq-let.js rename to tests/tests/passes/04b/seq-let.js diff --git a/tests/tests/passes/04/webbify.js b/tests/tests/passes/04b/webbify.js similarity index 100% rename from tests/tests/passes/04/webbify.js rename to tests/tests/passes/04b/webbify.js diff --git a/tests/tests/passes/04/z-activation-list-drilldowns.js b/tests/tests/passes/04b/z-activation-list-drilldowns.js similarity index 100% rename from tests/tests/passes/04/z-activation-list-drilldowns.js rename to tests/tests/passes/04b/z-activation-list-drilldowns.js diff --git a/tests/tests/passes/04/zip.js b/tests/tests/passes/04b/zip.js similarity index 100% rename from tests/tests/passes/04/zip.js rename to tests/tests/passes/04b/zip.js diff --git a/tools/travis/build.sh b/tools/travis/build.sh index 188ee97a..1685e7bc 100755 --- 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 index 3dafd3a8..43d09b6b 100755 --- 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 new file mode 100644 index 00000000..9edaae84 --- /dev/null +++ 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 index 87463457..8696cf0d 100755 --- 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