Repository: incubator-predictionio Updated Branches: refs/heads/feature/xbuild 441f91236 -> 2bfe640ba
Fix tests Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/2bfe640b Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/2bfe640b Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/2bfe640b Branch: refs/heads/feature/xbuild Commit: 2bfe640ba93ac4441bc9a4cdbdbe0799e7c2dbd0 Parents: 441f912 Author: Donald Szeto <[email protected]> Authored: Thu Mar 16 22:54:52 2017 -0700 Committer: Donald Szeto <[email protected]> Committed: Thu Mar 16 22:54:52 2017 -0700 ---------------------------------------------------------------------- .travis.yml | 12 ++++++++++++ tests/docker-files/env-conf/pio-env.sh | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/2bfe640b/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index e45e8d3..8dcc2fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,47 +44,59 @@ env: - BUILD_TYPE=Unit METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL PIO_SCALA_VERSION=2.10.6 + PIO_SPARK_VERSION=1.6.3 - BUILD_TYPE=Integration METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL PIO_SCALA_VERSION=2.10.6 + PIO_SPARK_VERSION=1.6.3 - BUILD_TYPE=Integration METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS PIO_SCALA_VERSION=2.10.6 + PIO_SPARK_VERSION=1.6.3 PIO_ELASTICSEARCH_VERSION=5.2.2 - BUILD_TYPE=Integration METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS PIO_SCALA_VERSION=2.10.6 + PIO_SPARK_VERSION=1.6.3 PIO_ELASTICSEARCH_VERSION=5.2.2 - BUILD_TYPE=Integration METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS PIO_SCALA_VERSION=2.10.6 + PIO_SPARK_VERSION=1.6.3 PIO_ELASTICSEARCH_VERSION=1.7.3 - BUILD_TYPE=Integration METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS PIO_SCALA_VERSION=2.10.6 + PIO_SPARK_VERSION=1.6.3 PIO_ELASTICSEARCH_VERSION=1.7.3 - BUILD_TYPE=Unit METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL PIO_SCALA_VERSION=2.11.8 + PIO_SPARK_VERSION=2.1.0 - BUILD_TYPE=Integration METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL PIO_SCALA_VERSION=2.11.8 + PIO_SPARK_VERSION=2.1.0 - BUILD_TYPE=Integration METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS PIO_SCALA_VERSION=2.11.8 + PIO_SPARK_VERSION=2.1.0 PIO_ELASTICSEARCH_VERSION=5.2.2 - BUILD_TYPE=Integration METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS PIO_SCALA_VERSION=2.11.8 + PIO_SPARK_VERSION=2.1.0 PIO_ELASTICSEARCH_VERSION=5.2.2 - BUILD_TYPE=Integration METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS PIO_SCALA_VERSION=2.11.8 + PIO_SPARK_VERSION=2.1.0 PIO_ELASTICSEARCH_VERSION=1.7.3 - BUILD_TYPE=Integration METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS PIO_SCALA_VERSION=2.11.8 + PIO_SPARK_VERSION=2.1.0 PIO_ELASTICSEARCH_VERSION=1.7.3 before_install: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/2bfe640b/tests/docker-files/env-conf/pio-env.sh ---------------------------------------------------------------------- diff --git a/tests/docker-files/env-conf/pio-env.sh b/tests/docker-files/env-conf/pio-env.sh index 51d2e05..153c4ee 100644 --- a/tests/docker-files/env-conf/pio-env.sh +++ b/tests/docker-files/env-conf/pio-env.sh @@ -88,7 +88,7 @@ PIO_STORAGE_SOURCES_ELASTICSEARCH_TYPE=elasticsearch #PIO_STORAGE_SOURCES_ELASTICSEARCH_CLUSTERNAME=pio PIO_STORAGE_SOURCES_ELASTICSEARCH_HOSTS=elasticsearch PIO_STORAGE_SOURCES_ELASTICSEARCH_SCHEMES=http -if [ "$PIO_ELASTICSEARCH_VERSION" == "1" ]; then +if [ "$PIO_ELASTICSEARCH_VERSION" = "1" ]; then PIO_STORAGE_SOURCES_ELASTICSEARCH_PORTS=9300 else PIO_STORAGE_SOURCES_ELASTICSEARCH_PORTS=9200
