You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2018/10/26 08:23:39 UTC
[camel-k] branch master updated (f4397a6 -> 86d1a2e)
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from f4397a6 fix script
new 67d4613 use fail fast with travis
new 86d1a2e set the kotlin home
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 4 +---
.../{prepare_integration_tests_travis.sh => travis_build.sh} | 11 +++++++++++
2 files changed, 12 insertions(+), 3 deletions(-)
rename build/{prepare_integration_tests_travis.sh => travis_build.sh} (89%)
[camel-k] 01/02: use fail fast with travis
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 67d4613b761c75ca49cea3559263c1dbb64b6740
Author: nferraro <ni...@gmail.com>
AuthorDate: Fri Oct 26 09:46:49 2018 +0200
use fail fast with travis
---
.travis.yml | 4 +---
build/{prepare_integration_tests_travis.sh => travis_build.sh} | 7 +++++++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 13d1d39..9539e08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,4 @@ services:
- docker
script:
- - make
- - ./build/prepare_integration_tests_travis.sh
- - make test-integration
+ - ./build/travis_build.sh
diff --git a/build/prepare_integration_tests_travis.sh b/build/travis_build.sh
similarity index 94%
rename from build/prepare_integration_tests_travis.sh
rename to build/travis_build.sh
index 4b546dc..2910c3d 100755
--- a/build/prepare_integration_tests_travis.sh
+++ b/build/travis_build.sh
@@ -2,6 +2,9 @@
set -e
+# First build the whole project
+make
+
# set docker0 to promiscuous mode
sudo ip link set docker0 promisc on
@@ -59,3 +62,7 @@ echo "installing camel k cluster resources"
./kamel install --cluster-setup
oc login -u developer
+
+
+# Then run integration tests
+make test-integration
[camel-k] 02/02: set the kotlin home
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 86d1a2ec0cd4ab015ef94c487d425217001a9e32
Author: nferraro <ni...@gmail.com>
AuthorDate: Fri Oct 26 10:19:12 2018 +0200
set the kotlin home
---
build/travis_build.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/build/travis_build.sh b/build/travis_build.sh
index 2910c3d..83e5d12 100755
--- a/build/travis_build.sh
+++ b/build/travis_build.sh
@@ -2,6 +2,10 @@
set -e
+# Find the JAVA_HOME and set the KOTLIN_JDK_HOME
+echo "Java home: $JAVA_HOME"
+export KOTLIN_JDK_HOME=$JAVA_HOME
+
# First build the whole project
make