further parallel optimization for travis

rabbah · Nov 4, 2017 · 4f2619a · 4f2619a
1 parent bf8bbc5
commit 4f2619a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -34,8 +34,14 @@ env:
     - UV_THREADPOOL_SIZE=64
 
 install:
-    - ./tools/travis/setup.sh; ./tools/travis/build.sh; ./tools/travis/init_auth.sh  # initialize openwhisk and test docker
-    - docker build -t shell-test .                                                   # initialize test docker image
+    - echo "API_HOST=foo" > ~/.wskprops                                                  # dist/compile.sh needs something here
+    - echo "AUTH=bar" >>  ~/.wskprops                                                    # ibid
+    - (cd app && npm install) &                                                          # app npm install
+    - (cd tests && npm install) &                                                        # tests npm install
+    - (./tools/travis/setup.sh; ./tools/travis/build.sh; ./tools/travis/init_auth.sh) &  # initialize openwhisk and test docker
+    - wait
+    - cp tools/travis/Dockerfile .
+    - docker build -t shell-test .                                                       # initialize test docker image
 
 script: (cd tests && npm run test)
 
diff --git a/tools/travis/Dockerfile b/tools/travis/Dockerfile
@@ -0,0 +1,12 @@
+FROM shell-test-base
+
+WORKDIR /tests
+
+# auth keys
+ADD .openwhisk-shell /.openwhisk-shell
+
+ADD dist /dist
+ADD app /app
+ADD tests /tests
+
+CMD ./bin/runWithXvfb.sh