nicolaferraro closed pull request #192: Fix CI Job URL: https://github.com/apache/camel-k/pull/192
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): 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 89% rename from build/prepare_integration_tests_travis.sh rename to build/travis_build.sh index 4b546dc..83e5d12 100755 --- a/build/prepare_integration_tests_travis.sh +++ b/build/travis_build.sh @@ -2,6 +2,13 @@ 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 + # set docker0 to promiscuous mode sudo ip link set docker0 promisc on @@ -59,3 +66,7 @@ echo "installing camel k cluster resources" ./kamel install --cluster-setup oc login -u developer + + +# Then run integration tests +make test-integration ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
