Remove extra git pull nodejs6 (#68)
diff --git a/ansible/environments/local/group_vars/all b/ansible/environments/local/group_vars/all
index de48d98..4e8454e 100755
--- a/ansible/environments/local/group_vars/all
+++ b/ansible/environments/local/group_vars/all
@@ -5,7 +5,8 @@
openwhisk_tmp_dir: "{{ lookup('env', 'OPENWHISK_TMP_DIR')|default('/tmp', true) }}"
config_root_dir: "{{ openwhisk_tmp_dir }}/wskconf"
whisk_logs_dir: "{{ openwhisk_tmp_dir }}/wsklogs"
-docker_registry: ""
+docker_registry: "docker.io/"
+docker_image_prefix: "openwhisk"
docker_dns: ""
runtimes_bypass_pull_for_local_images: true
invoker_use_runc: "{{ ansible_distribution != 'MacOSX' }}"
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index acb7379..13fb411 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -27,33 +27,12 @@
export OPENWHISK_HOME=$WHISKDIR
-IMAGE_PREFIX="testing"
-
-# run scancode using the ASF Release configuration
+# Run scancode using the ASF Release configuration
cd $UTILDIR
scancode/scanCode.py --config scancode/ASF-Release.cfg $ROOTDIR
-# Build OpenWhisk
-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 ${IMAGE_PREFIX}/nodejs6action
-
-TERM=dumb ./gradlew \
-:common:scala:install \
-:core:controller:install \
-:core:invoker:install \
-:tools:admin:install \
-:tests:install
-
# Build runtime
cd $ROOTDIR
TERM=dumb ./gradlew \
:core:nodejs6Action:distDocker \
-:core:nodejs8Action:distDocker \
--PdockerImagePrefix=${IMAGE_PREFIX}
+:core:nodejs8Action:distDocker
diff --git a/tools/travis/deploy.sh b/tools/travis/deploy.sh
index 58b0988..0618340 100755
--- a/tools/travis/deploy.sh
+++ b/tools/travis/deploy.sh
@@ -26,17 +26,19 @@
export OPENWHISK_HOME=$WHISKDIR
-IMAGE_PREFIX="testing"
+# Pull core images
+docker pull openwhisk/controller
+docker pull openwhisk/invoker
# Deploy OpenWhisk
cd $WHISKDIR/ansible
-ANSIBLE_CMD="ansible-playbook -i ${ROOTDIR}/ansible/environments/local -e docker_image_prefix=${IMAGE_PREFIX}"
+ANSIBLE_CMD="ansible-playbook -i ${ROOTDIR}/ansible/environments/local"
$ANSIBLE_CMD setup.yml
$ANSIBLE_CMD prereq.yml
$ANSIBLE_CMD couchdb.yml
$ANSIBLE_CMD initdb.yml
$ANSIBLE_CMD wipe.yml
-$ANSIBLE_CMD openwhisk.yml -e cli_installation_mode=remote
+$ANSIBLE_CMD openwhisk.yml
docker images
docker ps
diff --git a/tools/travis/test.sh b/tools/travis/test.sh
index f6f9f5c..c8973d7 100755
--- a/tools/travis/test.sh
+++ b/tools/travis/test.sh
@@ -26,6 +26,11 @@
export OPENWHISK_HOME=$WHISKDIR
+# Build OpenWhisk deps before we run tests
+cd ${OPENWHISK_HOME}
+TERM=dumb ./gradlew install
+
+
cd ${ROOTDIR}
TERM=dumb ./gradlew :tests:checkScalafmtAll
TERM=dumb ./gradlew :tests:test --tests *NodeJs*Tests
