Repository: incubator-predictionio Updated Branches: refs/heads/develop c6c1ac3b2 -> d5105a493
[PIO-53] Fix Travis build scripts Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/d5105a49 Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/d5105a49 Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/d5105a49 Branch: refs/heads/develop Commit: d5105a4937fde2ba2d7cbd86388151f9887b404e Parents: c6c1ac3 Author: Donald Szeto <[email protected]> Authored: Fri Feb 17 09:59:13 2017 -0800 Committer: Donald Szeto <[email protected]> Committed: Fri Feb 17 09:59:13 2017 -0800 ---------------------------------------------------------------------- .travis.yml | 11 +++++++++++ tests/after_script.travis.sh | 8 +------- tests/before_script.travis.sh | 25 ++----------------------- 3 files changed, 14 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d5105a49/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 6a13b9a..8add3c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,14 @@ branches: except: - livedoc +language: scala + +scala: + - 2.10.5 + +jdk: + - oraclejdk8 + services: - docker @@ -41,6 +49,9 @@ env: - BUILD_TYPE=Integration METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS - BUILD_TYPE=Integration METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS +before_install: + - unset SBT_OPTS JVM_OPTS + before_script: - ./tests/before_script.travis.sh http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d5105a49/tests/after_script.travis.sh ---------------------------------------------------------------------- diff --git a/tests/after_script.travis.sh b/tests/after_script.travis.sh index f41e929..fad9bf4 100755 --- a/tests/after_script.travis.sh +++ b/tests/after_script.travis.sh @@ -16,10 +16,4 @@ # limitations under the License. # -set -e - -if [[ $BUILD_TYPE == Unit ]]; then - ./bin/travis/pio-stop-travis -else - docker-compose -f tests/docker-compose.yml down -fi +docker-compose -f tests/docker-compose.yml down http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d5105a49/tests/before_script.travis.sh ---------------------------------------------------------------------- diff --git a/tests/before_script.travis.sh b/tests/before_script.travis.sh index fbc6b0a..b68e68b 100755 --- a/tests/before_script.travis.sh +++ b/tests/before_script.travis.sh @@ -16,26 +16,5 @@ # limitations under the License. # -set -e - -if [[ $BUILD_TYPE == Unit ]]; then - # Download spark, hbase - mkdir vendors - wget http://d3kbcqa49mib13.cloudfront.net/spark-1.3.0-bin-hadoop2.4.tgz - tar zxfC spark-1.3.0-bin-hadoop2.4.tgz vendors - wget http://archive.apache.org/dist/hbase/hbase-1.0.0/hbase-1.0.0-bin.tar.gz - tar zxfC hbase-1.0.0-bin.tar.gz vendors - - # Prepare pio environment variables - set -a - source conf/pio-env.sh.travis - set +a - - # Create postgres database for PredictionIO - psql -c 'create database predictionio;' -U postgres - ./bin/travis/pio-start-travis - -else # Integration Tests - ./make-distribution.sh - tests/build-docker.sh -fi +./make-distribution.sh +tests/build-docker.sh
