fix build failure on travis (#28)

eweiter · csantanapr · commit 6dbe8e5bd911 · 2018-04-09T12:24:19.000-04:00
diff --git a/ansible/environments/local/group_vars/all b/ansible/environments/local/group_vars/all
@@ -1,8 +1,11 @@
 whisk_version_name: local
-config_root_dir: /tmp/wskconf
-whisk_logs_dir: /tmp/wsklogs
+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_dns: ""
+runtimes_bypass_pull_for_local_images: true
+invoker_use_runc: "{{ ansible_distribution != 'MacOSX' }}"
 
 db_prefix: whisk_local_
 
@@ -19,8 +22,8 @@ apigw_auth_user: ""
 apigw_auth_pwd: ""
 apigw_host_v2: "http://{{ groups['apigateway']|first }}:{{apigateway.port.api}}/v2"
 
-controller_arguments: '-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=1098'
-invoker_arguments: "{{ controller_arguments }}"
+invoker_allow_multiple_instances: true
+env_hosts_dir: "{{ playbook_dir }}/environments/local"
 
 runtimes_manifest:
   defaultImagePrefix: "openwhisk"
@@ -45,3 +48,5 @@ runtimes_manifest:
       deprecated: false
   blackboxes:
     - name: "dockerskeleton"
+
+controller_protocol: "http"
diff --git a/settings.gradle b/settings.gradle
@@ -12,6 +12,10 @@ include 'python3'
 
 rootProject.name = 'runtime-python-ibm'
 
+gradle.ext.openwhisk = [
+        version: '1.0.0-SNAPSHOT'
+]
+
 gradle.ext.scala = [
     version: '2.11.11',
     compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import']
diff --git a/tests/build.gradle b/tests/build.gradle
@@ -2,10 +2,9 @@ apply plugin: 'scala'
 apply plugin: 'eclipse'
 compileTestScala.options.encoding = 'UTF-8'
 
-evaluationDependsOn(':whisktests')
-
 repositories {
     mavenCentral()
+    mavenLocal()
 }
 
 tasks.withType(Test) {
@@ -31,8 +30,8 @@ task testBlueDeployment(type: Test) {
 
 dependencies {
     compile "org.scala-lang:scala-library:${gradle.scala.version}"
-    compile project(':whisktests')
-    compile project(':whisktests').sourceSets.test.output
+    compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:tests"
+    compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:test-sources"
 }
 
 tasks.withType(ScalaCompile) {
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
@@ -10,13 +10,6 @@ IMAGE_PREFIX="testing"
 
 export OPENWHISK_HOME=$WHISKDIR
 
-# Build IBM nodejs runtime
-cd $ROOTDIR
-TERM=dumb ./gradlew \
-:python3:distDocker \
--PdockerImagePrefix=${IMAGE_PREFIX}
-
-
 # Build OpenWhisk
 cd $WHISKDIR
 
@@ -29,3 +22,15 @@ docker pull openwhisk/nodejs6action
 docker tag openwhisk/nodejs6action ${IMAGE_PREFIX}/nodejs6action
 docker pull openwhisk/python2action
 docker tag openwhisk/python2action ${IMAGE_PREFIX}/python2action
+
+TERM=dumb ./gradlew \
+:common:scala:install \
+:core:controller:install \
+:core:invoker:install \
+:tests:install
+
+# Build IBM nodejs runtime
+cd $ROOTDIR
+TERM=dumb ./gradlew \
+:python3:distDocker \
+-PdockerImagePrefix=${IMAGE_PREFIX}
