You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by cs...@apache.org on 2018/05/02 04:22:52 UTC
[incubator-openwhisk-runtime-go] branch master updated: switch to
go 1.10 (#22)
This is an automated email from the ASF dual-hosted git repository.
csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-go.git
The following commit(s) were added to refs/heads/master by this push:
new a982174 switch to go 1.10 (#22)
a982174 is described below
commit a98217415c57c10ce7acb3ebbfb5bbd3ffbbe43b
Author: Carlos Santana <cs...@apache.org>
AuthorDate: Wed May 2 00:22:49 2018 -0400
switch to go 1.10 (#22)
* switch to go 1.10
* remove :build from actionloop
* refactor container build directories
* use official golang images
* setup travis for publish
---
.gitattributes | 7 -------
.gitignore | 9 +++++----
.travis.yml | 23 +++++++++++++++++------
README.md | 26 ++++++++++++++++++++++----
actionProxyLoop/Dockerfile | 9 +++++++++
actionProxyLoop/build.gradle | 2 ++
build.gradle | 4 +---
core/gobuild => common/gobuild.sh | 0
core/.gitkeep | 0
core/actionloop-golang/Dockerfile | 13 -------------
core/actionloop-golang/build.gradle | 17 -----------------
core/actionloop/Dockerfile | 6 ------
core/actionloop/build.gradle | 10 ----------
golang1.10/Dockerfile | 13 +++++++++++++
golang1.10/build.gradle | 22 ++++++++++++++++++++++
openwhisk/compiler_test.go | 20 ++++++++++----------
openwhisk/initHandler_test.go | 8 ++++----
settings.gradle | 4 ++--
test/NOTES.md | 4 ++--
test/test_actionloop-golang.t | 2 +-
tools/travis/build.sh | 10 ++++++----
tools/travis/{build.sh => publish.sh} | 33 ++++++++++++++++++---------------
tools/travis/test.sh | 5 +----
23 files changed, 135 insertions(+), 112 deletions(-)
diff --git a/.gitattributes b/.gitattributes
index b19d1c0..0df2192 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -19,13 +19,6 @@
*.jar binary
*.png binary
-# python files not having the .py extension
-tools/cli/wsk text eol=lf
-tools/cli/wskadmin text eol=lf
# bash files not having the .sh extension
-tools/vagrant/simple/wsk text eol=lf
gradlew text eol=lf
-core/javaAction/proxy/gradlew text eol=lf
-tools/vagrant/hello text eol=lf
-sdk/docker/client/action text eol=lf
diff --git a/.gitignore b/.gitignore
index b81c91e..a35ea03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,12 @@
+# Mac
+.DS_Store
+
.gradle/
.gogradle/
*.log
vendor/
-core/proxy
-core/actionloop-golang/proxy
-core/actionloop-golang/gobuild
-core/actionloop/proxy
+actionProxyLoop/proxy
+golang1.10/proxy
openwhisk/_test/exec
openwhisk/_test/hi
openwhisk/_test/hello_greeting
diff --git a/.travis.yml b/.travis.yml
index 8b29734..1d716d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,18 +16,29 @@
sudo: required
language: go
-go:
- - "1.9"
+go:
+- 1.10.1
services:
- docker
-
notifications:
email: true
-
before_install:
- "./tools/travis/setup.sh"
install: true
script:
- "./tools/travis/build.sh && ./tools/travis/test.sh"
-after_failure: "cat /home/travis/gopath/src/github.com/apache/incubator-openwhisk-runtime-go/.gogradle/reports/test/index.html"
-
+after_failure: cat .gogradle/reports/test/index.html
+deploy:
+- provider: script
+ script: "./tools/travis/publish.sh openwhisk ${TRAVIS_TAG%@*} ${TRAVIS_TAG##*@}"
+ on:
+ tags: true
+ all_branches: true
+- provider: script
+ script: "./tools/travis/publish.sh openwhisk 1.10 master"
+ on:
+ branch: master
+env:
+ global:
+ - secure: GNKMZjEW1BKBb8NSiFB/Bogh0V5co5TefLLaj9oYJrKCP8rheFY4mWwINR74dYwSFIVmBhuuwZCm62zZwzb2TTivjQihOwU9SeTaUvJHlcLu6j1T/gTcMX5dkDOrdzqZaKoU5NpMbvad1fnDfEG9oU/VE7fARAxziZ2yBXOGkt2p2whkGXrs43gMyRKJv7ytUwpjvzhD48hJHgn0Eq6EwVIYxO5gJfGAhiA0ucH75c3jI4yEz7sw7SaoFxAQRL7VICaTH8JI+tKWU673HCclIRiPeZWQ23rI/f3MV8SNTKJm0GtnjM8LA9uC96qV6f5aXMn1EdaMGoCQbR9jBeqZG7pq8O2QHA/1eNNDw5sCISS05plCJ2yz/G4PUndnuToKm/sx6/qbdRA3QzTrNQfwTTcuUi+j4mYEFANgT774CeGdnajfNy4cZoeVEFmBTXdi5V1DuFLujSQrzRSHddHHUQXGUMaz4qv5 [...]
+ - secure: sdSLUbg6ZkZiSO/gytXd83IpJ3TD2KeFWMP60VwadEPBDJf88Wju1S9xlHSan+gOgX5wU8S5Az1wfi1njGKZTmxNHgXa/LgCgJvmdoKPIHsJld5A38tvK3t1qeOzrM7UpzwdqqrEt+Xl6AlxCE82293IznOgCWaaLfBc5TawCThTLGZ2XSQYbZj4Uh12twCsKIUvnHV0Kr2wHRrSDGq6r2VSniHk8w66QMNOBu6V6zxYXKNhJpoRBU6X8vMGsn9GDNr6PG1GnO0oZGDQn/dJMxUK/QAgeskVHptX8Fytnzyri6vut0JPiMbT8AtolOxzjv/7KcqhO0YdxjVy+/3sTLpCRM0zfcx8q9RbufNiBTuERDrUYb8EKqHyX4QNJEVpf+oImNsKw/8ry991OdhrG9cyzXNT+0/oS5U7C/F7gS7nqb/kjBP+qJ+6AwdnOU1re5brv7BkH9Rj6d6tVLfSG35gRXAuwoou [...]
diff --git a/README.md b/README.md
index 7afddd4..e74f7df 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,8 @@
-->
# Apache OpenWhisk Runtime for Go (and Generic executables)
+:warning: Work in progress :warning:
+
This is an OpenWhisk runtime for Golang and Generic executables.
- [Building it](#building)
@@ -30,17 +32,33 @@ This is an OpenWhisk runtime for Golang and Generic executables.
You need a linux environment, with Java and Docker installed to build the sources.
-To build and run the test suite, use:
+Prerequisites for running build and tests:
+- docker
+- jdk
+- go 1.10.1
+- bc (sudo apt-get install bc)
-`./gradlew distDocker`
+To compile go proxy
+```
+./gradlew build
+```
+To build the docker images after compiling go proxy
+```
+./gradlew distDocker
+```
This will build the images:
-* `actionloop-golang-v1.9`: an image supporting Go sources
+* `actionloop-golang-v1.10`: an image supporting Go sources
* `actionloop`: the base image, supporting generic executables
The `actionloop` image is used as a basis also for the `actionloop-swift` image. It can be used for supporting other compiled programming languages as long as they implement a `compile` script and the *action loop* protocol described below.
+To run tests
+```
+./gradlew test --info
+```
+
<a name="gosources"/>
# Using it with Go Sources
@@ -95,7 +113,7 @@ If you have docker, you can do it this way:
- place your sources under `src` folder in current directory
- create an `out` folder to receive the binary
-- run: `docker run -v $PWD/src:/src -v $PWD/out openwhisk/actionloop-golang-v1.9 compile`
+- run: `docker run -v $PWD/src:/src -v $PWD/out openwhisk/actionloop-golang-v1.10 compile`
- you can now use `wsk` to publish the `out/main` executable
If you have a function named in a different way, for example `Hello`, specify `compile hello`. It will produce a binary named `out/hello`
diff --git a/actionProxyLoop/Dockerfile b/actionProxyLoop/Dockerfile
new file mode 100644
index 0000000..d7f65fa
--- /dev/null
+++ b/actionProxyLoop/Dockerfile
@@ -0,0 +1,9 @@
+FROM golang:1.10.1
+RUN apt-get update && apt-get install -y \
+ curl \
+ jq \
+ && rm -rf /var/lib/apt/lists/*
+RUN mkdir /action
+WORKDIR /action
+ADD proxy /proxy
+CMD /proxy
diff --git a/actionProxyLoop/build.gradle b/actionProxyLoop/build.gradle
new file mode 100644
index 0000000..b69ec48
--- /dev/null
+++ b/actionProxyLoop/build.gradle
@@ -0,0 +1,2 @@
+ext.dockerImageName = 'actionloop'
+apply from: '../gradle/docker.gradle'
diff --git a/build.gradle b/build.gradle
index 8e261f0..0f7bfec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,11 +21,9 @@ golang {
}
-build.dependsOn check
-
build.dependsOn vendor
build {
targetPlatform = ['linux-amd64']
- go 'build -o core/proxy main/proxy.go'
+ go 'build -o actionProxyLoop/proxy main/proxy.go'
}
diff --git a/core/gobuild b/common/gobuild.sh
similarity index 100%
rename from core/gobuild
rename to common/gobuild.sh
diff --git a/core/.gitkeep b/core/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/core/actionloop-golang/Dockerfile b/core/actionloop-golang/Dockerfile
deleted file mode 100644
index c419a7a..0000000
--- a/core/actionloop-golang/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM ibmcom/ubuntu:14.04
-RUN apt-get -y update && apt-get -y upgrade && apt-get -y install curl jq git
-RUN mkdir /action /home/go
-WORKDIR /action
-ADD proxy /proxy
-ADD gobuild /bin/compile
-RUN curl https://dl.google.com/go/go1.9.4.linux-amd64.tar.gz | tar xzvf - -C /usr/local
-ENV GOROOT /usr/local/go
-ENV GOPATH /home/go
-ENV COMPILER /bin/compile
-ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin:/home/go/bin
-RUN go get github.com/apache/incubator-openwhisk-client-go/whisk
-CMD /proxy
diff --git a/core/actionloop-golang/build.gradle b/core/actionloop-golang/build.gradle
deleted file mode 100644
index e2935bd..0000000
--- a/core/actionloop-golang/build.gradle
+++ /dev/null
@@ -1,17 +0,0 @@
-ext.dockerImageName = 'actionloop-golang-v1.9'
-apply from: '../../gradle/docker.gradle'
-
-distDocker.dependsOn ':build'
-distDocker.dependsOn 'copyProxy'
-distDocker.dependsOn 'copyCompiler'
-
-
-task copyProxy(type: Copy) {
- from '../proxy'
- into '.'
-}
-
-task copyCompiler(type: Copy) {
- from '../gobuild'
- into '.'
-}
diff --git a/core/actionloop/Dockerfile b/core/actionloop/Dockerfile
deleted file mode 100644
index ee0f1bd..0000000
--- a/core/actionloop/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM ibmcom/ubuntu:14.04
-RUN apt-get -y update && apt-get -y upgrade && apt-get -y install curl jq
-RUN mkdir /action
-WORKDIR /action
-ADD proxy /proxy
-CMD /proxy
diff --git a/core/actionloop/build.gradle b/core/actionloop/build.gradle
deleted file mode 100644
index da826b0..0000000
--- a/core/actionloop/build.gradle
+++ /dev/null
@@ -1,10 +0,0 @@
-ext.dockerImageName = 'actionloop'
-apply from: '../../gradle/docker.gradle'
-
-distDocker.dependsOn ':build'
-distDocker.dependsOn 'copyProxy'
-
-task copyProxy(type: Copy) {
- from '../proxy'
- into '.'
-}
diff --git a/golang1.10/Dockerfile b/golang1.10/Dockerfile
new file mode 100644
index 0000000..03be150
--- /dev/null
+++ b/golang1.10/Dockerfile
@@ -0,0 +1,13 @@
+FROM golang:1.10.1
+RUN apt-get update && apt-get install -y \
+ curl \
+ jq \
+ git \
+ && rm -rf /var/lib/apt/lists/*
+RUN mkdir /action /home/go
+WORKDIR /action
+ADD proxy /proxy
+ADD gobuild.sh /bin/compile
+ENV COMPILER /bin/compile
+RUN go get github.com/apache/incubator-openwhisk-client-go/whisk
+CMD /proxy
diff --git a/golang1.10/build.gradle b/golang1.10/build.gradle
new file mode 100644
index 0000000..3244c03
--- /dev/null
+++ b/golang1.10/build.gradle
@@ -0,0 +1,22 @@
+ext.dockerImageName = 'actionloop-golang-v1.10'
+apply from: '../gradle/docker.gradle'
+
+distDocker.dependsOn 'copyProxy'
+distDocker.dependsOn 'copyCompiler'
+distDocker.finalizedBy('cleanup')
+
+
+task copyProxy(type: Copy) {
+ from '../actionProxyLoop/proxy'
+ into '.'
+}
+
+task copyCompiler(type: Copy) {
+ from '../common/gobuild.sh'
+ into '.'
+}
+
+task cleanup(type: Delete) {
+ delete 'proxy'
+ delete 'gobuild.sh'
+}
diff --git a/openwhisk/compiler_test.go b/openwhisk/compiler_test.go
index 4d2b5b7..d6a0f7a 100644
--- a/openwhisk/compiler_test.go
+++ b/openwhisk/compiler_test.go
@@ -26,7 +26,7 @@ import (
func Example_compileAction_wrong() {
sys("_test/precompile.sh", "hello.sh", "0")
log, _ := ioutil.TempFile("", "log")
- ap := NewActionProxy("./action/0", "../core/gobuild", log)
+ ap := NewActionProxy("./action/0", "../common/gobuild.sh", log)
fmt.Println(ap.CompileAction("_test/compile/0/exec", "exec", ""))
// Output:
// exit status 1
@@ -40,7 +40,7 @@ func Example_isCompiled() {
fmt.Println(isCompiled(dir, "exec"))
log, _ := ioutil.TempFile("", "log")
- ap := NewActionProxy("./action/c", "../core/gobuild", log)
+ ap := NewActionProxy("./action/c", "../common/gobuild.sh", log)
ap.CompileAction("main", abs("_test/compile/c/exec"), "")
fmt.Println(isCompiled(file, "main"))
@@ -61,7 +61,7 @@ func Example_isCompiled() {
func Example_compileAction_singlefile_main() {
sys("_test/precompile.sh", "hello.src", "1")
log, _ := ioutil.TempFile("", "log")
- ap := NewActionProxy("./action/1", "../core/gobuild", log)
+ ap := NewActionProxy("./action/1", "../common/gobuild.sh", log)
fmt.Println(ap.CompileAction("main", abs("_test/compile/1/exec"), ""))
sys("_test/postcompile.sh", "_test/compile/1/exec")
// Output:
@@ -74,7 +74,7 @@ func Example_compileAction_singlefile_main() {
func Example_compileAction_singlefile_main_out() {
sys("_test/precompile.sh", "hello.src", "1a")
log, _ := ioutil.TempFile("", "log")
- ap := NewActionProxy("./action/1a", "../core/gobuild", log)
+ ap := NewActionProxy("./action/1a", "../common/gobuild.sh", log)
fmt.Println(ap.CompileAction("main", abs("_test/compile/1a/exec"), abs("_test/output/1a")))
sys("_test/postcompile.sh", "_test/output/1a/main")
// Output:
@@ -87,7 +87,7 @@ func Example_compileAction_singlefile_main_out() {
func Example_compileAction_singlefile_hello() {
sys("_test/precompile.sh", "hello1.src", "2")
log, _ := ioutil.TempFile("", "log")
- ap := NewActionProxy("./action/2", "../core/gobuild", log)
+ ap := NewActionProxy("./action/2", "../common/gobuild.sh", log)
fmt.Println(ap.CompileAction("hello", "_test/compile/2/exec", ""))
sys("_test/postcompile.sh", "_test/compile/2/exec")
// Output:
@@ -100,7 +100,7 @@ func Example_compileAction_singlefile_hello() {
func Example_compileAction_singlefile_hello_out() {
sys("_test/precompile.sh", "hello1.src", "2a")
log, _ := ioutil.TempFile("", "log")
- ap := NewActionProxy("./action/2a", "../core/gobuild", log)
+ ap := NewActionProxy("./action/2a", "../common/gobuild.sh", log)
fmt.Println(ap.CompileAction("hello", "_test/compile/2a/exec", abs("_test/output/2a")))
sys("_test/postcompile.sh", "_test/output/2a/hello")
// Output:
@@ -113,7 +113,7 @@ func Example_compileAction_singlefile_hello_out() {
func Example_compileAction_multifile_main() {
sys("_test/precompile.sh", "action", "3")
log, _ := ioutil.TempFile("", "log")
- ap := NewActionProxy("./action/3", "../core/gobuild", log)
+ ap := NewActionProxy("./action/3", "../common/gobuild.sh", log)
fmt.Println(ap.CompileAction("main", "_test/compile/3/", ""))
sys("_test/postcompile.sh", "_test/compile/3/main")
// Output:
@@ -127,7 +127,7 @@ func Example_compileAction_multifile_main() {
func Example_compileAction_multifile_main_out() {
sys("_test/precompile.sh", "action", "3a")
log, _ := ioutil.TempFile("", "log")
- ap := NewActionProxy("./action/3a", "../core/gobuild", log)
+ ap := NewActionProxy("./action/3a", "../common/gobuild.sh", log)
fmt.Println(ap.CompileAction("main", "_test/compile/3a/", abs("_test/output/3a")))
sys("_test/postcompile.sh", "_test/output/3a/main")
// Output:
@@ -141,7 +141,7 @@ func Example_compileAction_multifile_main_out() {
func Example_compileAction_multifile_hello() {
sys("_test/precompile.sh", "action", "4")
log, _ := ioutil.TempFile("", "log")
- ap := NewActionProxy("./action/4", "../core/gobuild", log)
+ ap := NewActionProxy("./action/4", "../common/gobuild.sh", log)
fmt.Println(ap.CompileAction("hello", "_test/compile/4/", ""))
sys("_test/postcompile.sh", "_test/compile/4/hello")
// Output:
@@ -154,7 +154,7 @@ func Example_compileAction_multifile_hello() {
func Example_compileAction_multifile_hello_out() {
sys("_test/precompile.sh", "action", "4a")
log, _ := ioutil.TempFile("", "log")
- ap := NewActionProxy("./action/4a", "../core/gobuild", log)
+ ap := NewActionProxy("./action/4a", "../common/gobuild.sh", log)
fmt.Println(ap.CompileAction("hello", "_test/compile/4/", abs("_test/output/4a")))
sys("_test/postcompile.sh", "_test/output/4a/hello")
// Output:
diff --git a/openwhisk/initHandler_test.go b/openwhisk/initHandler_test.go
index aa76f77..0634dd4 100644
--- a/openwhisk/initHandler_test.go
+++ b/openwhisk/initHandler_test.go
@@ -158,7 +158,7 @@ func Example_main_zipinit_nocompiler() {
}
func Example_compile_simple() {
- comp, _ := filepath.Abs("../core/gobuild")
+ comp, _ := filepath.Abs("../common/gobuild.sh")
ts, cur, log := startTestServer(comp)
sys("_test/build.sh")
doRun(ts, "")
@@ -175,7 +175,7 @@ func Example_compile_simple() {
}
func Example_compile_withMain() {
- comp, _ := filepath.Abs("../core/gobuild")
+ comp, _ := filepath.Abs("../common/gobuild.sh")
ts, cur, log := startTestServer(comp)
sys("_test/build.sh")
doRun(ts, "")
@@ -195,7 +195,7 @@ func Example_compile_withMain() {
func Example_compile_withZipSrc() {
sys("_test/zips.sh")
- comp, _ := filepath.Abs("../core/gobuild")
+ comp, _ := filepath.Abs("../common/gobuild.sh")
ts, cur, log := startTestServer(comp)
doRun(ts, "")
doInit(ts, initBinary("_test/action.zip", ""))
@@ -221,7 +221,7 @@ func Example_compile_withZipSrc() {
/*
func Example_compile_withZipSrcDefault() {
sys("_test/zips.sh")
- comp, _ := filepath.Abs("../core/gobuild")
+ comp, _ := filepath.Abs("../common/gobuild.sh")
ts, cur := startTestServer(comp)
doRun(ts, "")
doInit(ts, initBinary("_test/action.zip", ""))
diff --git a/settings.gradle b/settings.gradle
index 4972eb7..b7aff17 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
-include 'core:actionloop'
-include 'core:actionloop-golang'
+include 'actionProxyLoop'
+include 'golang1.10'
rootProject.name = 'runtime-golang'
diff --git a/test/NOTES.md b/test/NOTES.md
index 1546b09..462b814 100644
--- a/test/NOTES.md
+++ b/test/NOTES.md
@@ -27,10 +27,10 @@ TO use it:
- you can run them with `cram test_actionloop.t`
- and `cram test_actionloop-golang`
-also you can start directy the binary without the images with
+also you can start directly the binary without the images with
- `./start.sh`
-- or `COMPILER=../core/goproxy ./start.sh`
+- or `COMPILER=../common/gobuild.sh ./start.sh`
If you start them, images won't be started by the test.
diff --git a/test/test_actionloop-golang.t b/test/test_actionloop-golang.t
index 91d8eef..e82b49f 100644
--- a/test/test_actionloop-golang.t
+++ b/test/test_actionloop-golang.t
@@ -16,7 +16,7 @@
#
$ export T=$TESTDIR
- $ $T/start.sh actionloop-golang-v1.9 2>$T/err.log >$T/out.log
+ $ $T/start.sh actionloop-golang-v1.10 2>$T/err.log >$T/out.log
$ $T/bin/run.sh
{"error":"no action defined yet"}
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index d6a0f0e..037256d 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -33,8 +33,10 @@ IMAGE_PREFIX="testing"
cd $UTILDIR
scancode/scanCode.py --config scancode/ASF-Release.cfg $ROOTDIR
-# Build runtime
cd $ROOTDIR
-TERM=dumb ./gradlew \
-distDocker \
--PdockerImagePrefix=${IMAGE_PREFIX}
+
+# Build/Compile go
+TERM=dumb ./gradlew build
+
+# Build runtime image
+TERM=dumb ./gradlew distDocker -PdockerImagePrefix=${IMAGE_PREFIX}
diff --git a/tools/travis/build.sh b/tools/travis/publish.sh
similarity index 64%
copy from tools/travis/build.sh
copy to tools/travis/publish.sh
index d6a0f0e..3bc31e3 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/publish.sh
@@ -16,25 +16,28 @@
# limitations under the License.
#
-set -ex
+set -eux
# Build script for Travis-CI.
-SCRIPTDIR=$(cd $(dirname "$0") && pwd)
-ROOTDIR="$SCRIPTDIR/../.."
-WHISKDIR="$ROOTDIR/../openwhisk"
-UTILDIR="$ROOTDIR/../incubator-openwhisk-utilities"
+IMAGE_PREFIX=$1
+RUNTIME_VERSION=$2
+IMAGE_TAG=$3
-export OPENWHISK_HOME=$WHISKDIR
+if [ ${RUNTIME_VERSION} == "1.10" ]; then
+ RUNTIME="golang1.10"
+elif [ ${RUNTIME_VERSION} == "1.11" ]; then
+ RUNTIME="golang1.11"
+fi
-IMAGE_PREFIX="testing"
+if [[ ! -z ${DOCKER_USER} ]] && [[ ! -z ${DOCKER_PASSWORD} ]]; then
+docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
+fi
-# run scancode using the ASF Release configuration
-cd $UTILDIR
-scancode/scanCode.py --config scancode/ASF-Release.cfg $ROOTDIR
-
-# Build runtime
-cd $ROOTDIR
+if [[ ! -z ${RUNTIME} ]]; then
TERM=dumb ./gradlew \
-distDocker \
--PdockerImagePrefix=${IMAGE_PREFIX}
+:${RUNTIME}:distDocker \
+-PdockerRegistry=docker.io \
+-PdockerImagePrefix=${IMAGE_PREFIX} \
+-PdockerImageTag=${IMAGE_TAG}
+fi
diff --git a/tools/travis/test.sh b/tools/travis/test.sh
index 5ff94f1..81ab042 100755
--- a/tools/travis/test.sh
+++ b/tools/travis/test.sh
@@ -22,12 +22,9 @@ set -ex
SCRIPTDIR=$(cd $(dirname "$0") && pwd)
ROOTDIR="$SCRIPTDIR/../.."
-WHISKDIR="$ROOTDIR/../openwhisk"
-
-export OPENWHISK_HOME=$WHISKDIR
cd ${ROOTDIR}
-TERM=dumb ./gradlew test
+TERM=dumb ./gradlew test --info
--
To stop receiving notification emails like this one, please contact
csantanapr@apache.org.