[
https://issues.apache.org/jira/browse/PIO-188?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16665521#comment-16665521
]
ASF GitHub Bot commented on PIO-188:
------------------------------------
dszeto closed pull request #489: [PIO-188] Update the build matrix on travis
URL: https://github.com/apache/predictionio/pull/489
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 abd4ab05c..2a756e9b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,131 +47,60 @@ env:
matrix:
- BUILD_TYPE=Unit
METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
- PIO_SCALA_VERSION=2.11.8
- PIO_SPARK_VERSION=2.0.2
- PIO_HADOOP_VERSION=2.6.5
- BUILD_TYPE=Integration
- METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
- PIO_SCALA_VERSION=2.11.8
- PIO_SPARK_VERSION=2.0.2
- PIO_HADOOP_VERSION=2.6.5
+ METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=S3
+ PIO_ELASTICSEARCH_VERSION=1.7.3
- BUILD_TYPE=Integration
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
- PIO_SCALA_VERSION=2.11.8
- PIO_SPARK_VERSION=2.0.2
+ METADATA_REP=ELASTICSEARCH EVENTDATA_REP=ELASTICSEARCH MODELDATA_REP=S3
PIO_ELASTICSEARCH_VERSION=5.6.9
- PIO_HADOOP_VERSION=2.6.5
- BUILD_TYPE=Integration
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
- PIO_SCALA_VERSION=2.11.8
- PIO_SPARK_VERSION=2.0.2
- PIO_ELASTICSEARCH_VERSION=5.6.9
- PIO_HADOOP_VERSION=2.6.5
+ METADATA_REP=ELASTICSEARCH EVENTDATA_REP=ELASTICSEARCH MODELDATA_REP=S3
+ PIO_ELASTICSEARCH_VERSION=6.4.2
- BUILD_TYPE=Integration
METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
- PIO_SCALA_VERSION=2.11.8
- PIO_SPARK_VERSION=2.0.2
- PIO_ELASTICSEARCH_VERSION=1.7.3
- PIO_HADOOP_VERSION=2.6.5
+ PIO_HBASE_VERSION=1.2.6
+
- BUILD_TYPE=Integration
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
- PIO_SCALA_VERSION=2.11.8
+ METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
+ PIO_SCALA_VERSION=2.11.12
PIO_SPARK_VERSION=2.0.2
- PIO_ELASTICSEARCH_VERSION=1.7.3
PIO_HADOOP_VERSION=2.6.5
- BUILD_TYPE=Integration
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=ELASTICSEARCH MODELDATA_REP=S3
- PIO_SCALA_VERSION=2.11.8
- PIO_SPARK_VERSION=2.0.2
- PIO_ELASTICSEARCH_VERSION=5.6.9
- PIO_HADOOP_VERSION=2.6.5
-
- - BUILD_TYPE=Unit
METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
PIO_SCALA_VERSION=2.11.12
- PIO_SPARK_VERSION=2.1.1
+ PIO_SPARK_VERSION=2.1.3
+ PIO_HADOOP_VERSION=2.6.5
- BUILD_TYPE=Integration
METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
PIO_SCALA_VERSION=2.11.12
- PIO_SPARK_VERSION=2.1.1
- - BUILD_TYPE=Integration
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
- PIO_SCALA_VERSION=2.11.12
- PIO_SPARK_VERSION=2.1.1
- PIO_ELASTICSEARCH_VERSION=5.6.9
- - BUILD_TYPE=Integration
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
- PIO_SCALA_VERSION=2.11.12
- PIO_SPARK_VERSION=2.1.1
- PIO_ELASTICSEARCH_VERSION=5.6.9
- - BUILD_TYPE=Integration
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
- PIO_SCALA_VERSION=2.11.12
- PIO_SPARK_VERSION=2.1.1
- PIO_ELASTICSEARCH_VERSION=1.7.3
- - BUILD_TYPE=Integration
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
- PIO_SCALA_VERSION=2.11.12
- PIO_SPARK_VERSION=2.1.1
- PIO_ELASTICSEARCH_VERSION=1.7.3
+ PIO_SPARK_VERSION=2.2.2
+ PIO_HADOOP_VERSION=2.6.5
- BUILD_TYPE=Integration
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=ELASTICSEARCH MODELDATA_REP=S3
+ METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
PIO_SCALA_VERSION=2.11.12
- PIO_SPARK_VERSION=2.1.1
- PIO_ELASTICSEARCH_VERSION=5.6.9
+ PIO_SPARK_VERSION=2.3.2
+ PIO_HADOOP_VERSION=2.6.5
- - BUILD_TYPE=Unit
- METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
- PIO_SCALA_VERSION=2.11.12
- PIO_SPARK_VERSION=2.2.0
- BUILD_TYPE=Integration
METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
PIO_SCALA_VERSION=2.11.12
- PIO_SPARK_VERSION=2.2.0
- - BUILD_TYPE=Integration
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
- PIO_SCALA_VERSION=2.11.12
- PIO_SPARK_VERSION=2.2.0
- PIO_ELASTICSEARCH_VERSION=1.7.3
- - BUILD_TYPE=Integration
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
- PIO_SCALA_VERSION=2.11.12
- PIO_SPARK_VERSION=2.2.0
- PIO_ELASTICSEARCH_VERSION=5.6.9
+ PIO_SPARK_VERSION=2.0.2
+ PIO_HADOOP_VERSION=2.7.3
- BUILD_TYPE=Integration
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=ELASTICSEARCH MODELDATA_REP=S3
- PIO_SCALA_VERSION=2.11.12
- PIO_SPARK_VERSION=2.2.0
- PIO_ELASTICSEARCH_VERSION=5.6.9
-
- - BUILD_TYPE=Unit
METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
PIO_SCALA_VERSION=2.11.12
- PIO_SPARK_VERSION=2.3.1
- PIO_HADOOP_VERSION=2.7.7
+ PIO_SPARK_VERSION=2.1.3
+ PIO_HADOOP_VERSION=2.7.3
- BUILD_TYPE=Integration
METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
PIO_SCALA_VERSION=2.11.12
- PIO_SPARK_VERSION=2.3.1
- PIO_HADOOP_VERSION=2.7.7
+ PIO_SPARK_VERSION=2.2.2
+ PIO_HADOOP_VERSION=2.7.3
- BUILD_TYPE=Integration
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
+ METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
PIO_SCALA_VERSION=2.11.12
- PIO_SPARK_VERSION=2.3.1
- PIO_ELASTICSEARCH_VERSION=1.7.3
- PIO_HADOOP_VERSION=2.7.7
- - BUILD_TYPE=Integration
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
- PIO_SCALA_VERSION=2.11.12
- PIO_SPARK_VERSION=2.3.1
- PIO_ELASTICSEARCH_VERSION=5.6.9
- PIO_HADOOP_VERSION=2.7.7
- - BUILD_TYPE=Integration
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=ELASTICSEARCH MODELDATA_REP=S3
- PIO_SCALA_VERSION=2.11.12
- PIO_SPARK_VERSION=2.3.1
- PIO_ELASTICSEARCH_VERSION=5.6.9
- PIO_HADOOP_VERSION=2.7.7
+ PIO_SPARK_VERSION=2.3.2
+ PIO_HADOOP_VERSION=2.7.3
- BUILD_TYPE=LicenseCheck
diff --git a/build.sbt b/build.sbt
index 2a6204215..be9e9ad4d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -56,7 +56,7 @@ javacOptions in (ThisBuild, compile) ++= Seq("-source",
"1.8", "-target", "1.8",
"-Xlint:deprecation", "-Xlint:unchecked")
// Ignore differentiation of Spark patch levels
-sparkVersion in ThisBuild := sys.props.getOrElse("spark.version", "2.1.2")
+sparkVersion in ThisBuild := sys.props.getOrElse("spark.version", "2.1.3")
sparkBinaryVersion in ThisBuild := binaryVersion(sparkVersion.value)
@@ -314,6 +314,7 @@ testOptions in Test += Tests.Argument("-oDF")
printBuildInfo := {
println(s"PIO_SCALA_VERSION=${scalaVersion.value}")
println(s"PIO_SPARK_VERSION=${sparkVersion.value}")
- println(s"PIO_ELASTICSEARCH_VERSION=${elasticsearchVersion.value}")
println(s"PIO_HADOOP_VERSION=${hadoopVersion.value}")
+ println(s"PIO_ELASTICSEARCH_VERSION=${elasticsearchVersion.value}")
+ println(s"PIO_HBASE_VERSION=${hbaseVersion.value}")
}
diff --git a/conf/pio-vendors.sh b/conf/pio-vendors.sh
index 0489e855b..f657a7c0d 100644
--- a/conf/pio-vendors.sh
+++ b/conf/pio-vendors.sh
@@ -20,21 +20,25 @@
# `source conf/set_build_profile.sh $BUILD_PROFILE` to get the proper versions
if [ -z "$PIO_SCALA_VERSION" ]; then
- PIO_SCALA_VERSION="2.11.8"
+ PIO_SCALA_VERSION="2.11.12"
fi
if [ -z "$PIO_SPARK_VERSION" ]; then
- PIO_SPARK_VERSION="2.1.1"
+ PIO_SPARK_VERSION="2.1.3"
fi
if [ -z "$PIO_HADOOP_VERSION" ]; then
- PIO_HADOOP_VERSION="2.6.5"
+ PIO_HADOOP_VERSION="2.7.3"
fi
if [ -z "$PIO_ELASTICSEARCH_VERSION" ]; then
PIO_ELASTICSEARCH_VERSION="5.6.9"
fi
+if [ -z "$PIO_HBASE_VERSION" ]; then
+ PIO_HBASE_VERSION="1.2.6"
+fi
+
ES_MAJOR=`echo $PIO_ELASTICSEARCH_VERSION | awk -F. '{print $1}'`
if [ "$ES_MAJOR" = "1" ]; then
@@ -42,9 +46,12 @@ if [ "$ES_MAJOR" = "1" ]; then
export ES_TAG="1"
else
export ES_IMAGE="docker.elastic.co/elasticsearch/elasticsearch"
- export ES_TAG="5.6.9"
+ export ES_TAG="$PIO_ELASTICSEARCH_VERSION"
fi
+HBASE_MAJOR=`echo $PIO_HBASE_VERSION | awk -F. '{print $1 "." $2}'`
+export HBASE_TAG="$HBASE_MAJOR"
+
PGSQL_JAR=postgresql-9.4-1204.jdbc41.jar
PGSQL_DOWNLOAD=https://jdbc.postgresql.org/download/${PGSQL_JAR}
diff --git a/tests/build_docker.sh b/tests/build_docker.sh
index 5879a5889..0adf3b076 100755
--- a/tests/build_docker.sh
+++ b/tests/build_docker.sh
@@ -41,7 +41,8 @@ set -e
-Dscala.version=$PIO_SCALA_VERSION \
-Dspark.version=$PIO_SPARK_VERSION \
-Dhadoop.version=$PIO_HADOOP_VERSION \
- -Delasticsearch.version=$PIO_ELASTICSEARCH_VERSION
+ -Delasticsearch.version=$PIO_ELASTICSEARCH_VERSION \
+ -Dhbase.version=$PIO_HBASE_VERSION
sbt/sbt clean storage/clean
assembly_folder=assembly/src/universal/lib
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index e0eda3497..0c196f116 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -21,7 +21,7 @@ services:
- xpack.security.enabled=false
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
hbase:
- image: harisekhon/hbase:1.0
+ image: harisekhon/hbase:${HBASE_TAG}
postgres:
image: postgres:9
environment:
diff --git a/tests/unit.sh b/tests/unit.sh
index 1421dcea7..a9c84fcab 100755
--- a/tests/unit.sh
+++ b/tests/unit.sh
@@ -32,13 +32,15 @@ sbt/sbt scalastyle \
-Dscala.version=$PIO_SCALA_VERSION \
-Dspark.version=$PIO_SPARK_VERSION \
-Dhadoop.version=$PIO_HADOOP_VERSION \
- -Delasticsearch.version=$PIO_ELASTICSEARCH_VERSION
+ -Delasticsearch.version=$PIO_ELASTICSEARCH_VERSION \
+ -Dhbase.version=$PIO_HBASE_VERSION
# Run all unit tests
sbt/sbt dataJdbc/compile test storage/test \
-Dscala.version=$PIO_SCALA_VERSION \
-Dspark.version=$PIO_SPARK_VERSION \
-Dhadoop.version=$PIO_HADOOP_VERSION \
- -Delasticsearch.version=$PIO_ELASTICSEARCH_VERSION
+ -Delasticsearch.version=$PIO_ELASTICSEARCH_VERSION \
+ -Dhbase.version=$PIO_HBASE_VERSION
popd
----------------------------------------------------------------
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:
us...@infra.apache.org
> Update the build matrix to the latest supported versions
> --------------------------------------------------------
>
> Key: PIO-188
> URL: https://issues.apache.org/jira/browse/PIO-188
> Project: PredictionIO
> Issue Type: Improvement
> Components: Build, Documentation
> Affects Versions: 0.14.0
> Reporter: Takako Shimamoto
> Priority: Major
>
> At first glance, it looks like .travis.yml has covered every version, but
> there aren't tests for Elasticsearch 6.x or HBase 1.2 currently. Whereas that
> there are some unnecessary patterns in the build matrix.
> I put together the latest supported versions. Note that there is no change in
> the default version.
> h3. Core versions
> - Scala
> -- 2.11.12(default)
> - Spark
> -- 2.0.2
> -- 2.1.3(default)
> -- 2.2.2
> -- 2.3.2
> - Hadoop
> -- 2.6.5
> -- 2.7.3(default)
> h3. Storage versions
> - Elasticsearch
> -- 1.7.3(deprecated)
> -- 5.6.9(default)
> -- 6.4.2
> - HBase
> -- 1.2.6(default)
> - HDFS
> -- same as above Hadoop
> I will open a PR.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
