Remove unnecessary Travis setup. (#53)

* Travis cleanup
* Tag master build as 'latest'.

Author: rabbah

.travis.yml

@@ -20,8 +20,7 @@ before_install:
   - "./tools/travis/setup.sh"
 install: true
 script:
-  - "./tools/travis/build.sh && ./tools/travis/build_sdk.sh && ./tools/travis/deploy.sh
-    && ./tools/travis/test.sh"
+  - "./tools/travis/build.sh && ./tools/travis/build_sdk.sh && ./tools/travis/test.sh"
 before_deploy:
   - "./tools/travis/rename_sdk.sh ${TRAVIS_TAG%@*} ${TRAVIS_TAG##*@}"
 deploy:
@@ -33,7 +32,7 @@ deploy:
       condition: "${TRAVIS_TAG%@*} = dockerskeleton || ${TRAVIS_TAG%@*} = example"
       repo: apache/incubator-openwhisk-runtime-docker
   - provider: script
-    script: "./tools/travis/publish.sh openwhisk dockerskeleton master && ./tools/travis/publish.sh openwhisk example master"
+    script: "./tools/travis/publish.sh openwhisk dockerskeleton latest && ./tools/travis/publish.sh openwhisk example latest"
     on:
       branch: master
       repo: apache/incubator-openwhisk-runtime-docker

ansible/environments/local/group_vars/all

@@ -27,25 +27,17 @@ UTILDIR="$ROOTDIR/../incubator-openwhisk-utilities"
 
 export OPENWHISK_HOME=$WHISKDIR
 
-IMAGE_PREFIX="testing"
-
 # run scancode using the ASF Release configuration
 cd $UTILDIR
 scancode/scanCode.py --config scancode/ASF-Release.cfg $ROOTDIR
 
-# Build OpenWhisk
+# Build OpenWhisk deps before we run tests
 cd $WHISKDIR
-
-#pull down images
-docker pull openwhisk/controller
-docker tag openwhisk/controller ${IMAGE_PREFIX}/controller
-docker pull openwhisk/invoker
-docker tag openwhisk/invoker ${IMAGE_PREFIX}/invoker
-docker pull openwhisk/nodejs6action
-docker tag openwhisk/nodejs6action nodejs6action
-
 TERM=dumb ./gradlew install
+# Mock file (works around bug upstream)
+echo "openwhisk.home=$WHISKDIR" > whisk.properties
+echo "vcap.services.file=" >> whisk.properties
 
 # Build runtime
 cd $ROOTDIR
-TERM=dumb ./gradlew distDocker -PdockerImagePrefix=${IMAGE_PREFIX}
+TERM=dumb ./gradlew distDocker

ansible/environments/local/hosts

@@ -31,4 +31,5 @@ git clone https://github.com/apache/incubator-openwhisk-utilities.git
 # clone main openwhisk repo. for testing purposes
 git clone --depth=1 https://github.com/apache/incubator-openwhisk.git openwhisk
 cd openwhisk
+
 ./tools/travis/setup.sh

tools/travis/build.sh

@@ -25,10 +25,6 @@ ROOTDIR="$SCRIPTDIR/../.."
 WHISKDIR="$ROOTDIR/../openwhisk"
 
 export OPENWHISK_HOME=$WHISKDIR
-
 cd ${ROOTDIR}
 TERM=dumb ./gradlew :tests:checkScalafmtAll
 TERM=dumb ./gradlew :tests:test
-
-
-