This is an automated email from the ASF dual-hosted git repository.

zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new e1cf3de  [ZEPPELIN-4628]. Run multiple spark version test against one 
zeppelin build
e1cf3de is described below

commit e1cf3de2aa97d3a27d598a427604b8f564f78e5b
Author: Jeff Zhang <zjf...@apache.org>
AuthorDate: Thu Feb 20 17:52:54 2020 +0800

    [ZEPPELIN-4628]. Run multiple spark version test against one zeppelin build
    
    ### What is this PR for?
    
    This PR change the `.travis.yaml` to run multiple spark version test 
against one zeppelin build to verify that one zeppelin instance can work with 
multiple spark versions. I just split them into 2 builds, because one build 
take too long time which will cause CI timeout.
    
    ### What type of PR is it?
    [ Improvement ]
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-4628
    
    ### How should this be tested?
    * CI pass
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Does the licenses files need update? No
    * Is there breaking changes for older versions? NO
    * Does this needs documentation? No
    
    Author: Jeff Zhang <zjf...@apache.org>
    
    Closes #3667 from zjffdu/ZEPPELIN-4628 and squashes the following commits:
    
    cd418d646 [Jeff Zhang] [ZEPPELIN-4628]. Run multiple spark version test 
against one zeppelin build
---
 .travis.yml | 46 +++++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ec5e027..076638c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -111,61 +111,73 @@ matrix:
       dist: xenial
       env: PYTHON="3" R="true" SCALA_VER="2.10" TENSORFLOW="1.13.1" 
PROFILE="-Pscala-2.10" BUILD_FLAG="install -DskipTests -DskipRat -am" 
TEST_FLAG="test -DskipRat" MODULES="-pl $(echo 
.,zeppelin-interpreter,zeppelin-interpreter-shaded,${INTERPRETERS} | sed 
's/!//g')" TEST_PROJECTS=""
 
-    # Run Spark integration test and unit test separately for each spark 
version
+    # Run Spark integration test and unit test
 
-    # ZeppelinSparkClusterTest24, SparkIntegrationTest24, JdbcIntegrationTest, 
Unit test of Spark 2.4 (Scala-2.11)
+    # Run spark integration of in one zeppelin instance (2.4, 2.3, 2.2)
     - sudo: required
       jdk: "openjdk8"
       dist: xenial
-      env: BUILD_PLUGINS="true" PYTHON="3" SCALA_VER="2.11" 
PROFILE="-Pspark-2.4 -Pspark-scala-2.11 -Phadoop2 -Pintegration" R="true" 
BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" 
MODULES="-pl 
zeppelin-interpreter-integration,jdbc,zeppelin-web,spark/spark-dependencies,markdown"
 
TEST_PROJECTS="-Dtest=ZeppelinSparkClusterTest24,SparkIntegrationTest24,JdbcIntegrationTest,org.apache.zeppelin.spark.*,org.apache.zeppelin.kotlin.*
 -DfailIfNoTests=false"
+      env: BUILD_PLUGINS="true" PYTHON="3" SCALA_VER="2.11" PROFILE="-Phadoop2 
-Pintegration" R="true" BUILD_FLAG="install -DskipTests -DskipRat" 
TEST_FLAG="test -DskipRat" MODULES="-pl 
zeppelin-interpreter-integration,zeppelin-web,spark/spark-dependencies,markdown 
-am" 
TEST_PROJECTS="-Dtest=ZeppelinSparkClusterTest24,SparkIntegrationTest24,ZeppelinSparkClusterTest23,SparkIntegrationTest23,ZeppelinSparkClusterTest22,SparkIntegrationTest22
 -DfailIfNoTests=false"
 
-    # ZeppelinSparkClusterTest24, SparkIntegrationTest24, JdbcIntegrationTest, 
Unit test of Spark 2.4 (Scala-2.12)
+    # Run spark integration of in one zeppelin instance (2.1, 2.0, 1.6)
     - sudo: required
       jdk: "openjdk8"
       dist: xenial
-      env: BUILD_PLUGINS="true" PYTHON="3" SCALA_VER="2.12" 
PROFILE="-Pspark-2.4 -Pspark-scala-2.12 -Phadoop2 -Pintegration" R="true" 
BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" 
MODULES="-pl 
zeppelin-interpreter-integration,jdbc,zeppelin-web,spark/spark-dependencies,markdown"
 
TEST_PROJECTS="-Dtest=ZeppelinSparkClusterTest24,SparkIntegrationTest24,JdbcIntegrationTest,org.apache.zeppelin.spark.*,org.apache.zeppelin.kotlin.*
 -DfailIfNoTests=false"
+      env: BUILD_PLUGINS="true" PYTHON="2" SCALA_VER="2.11" PROFILE="-Phadoop2 
-Pintegration" R="true" BUILD_FLAG="install -DskipTests -DskipRat" 
TEST_FLAG="test -DskipRat" MODULES="-pl 
zeppelin-interpreter-integration,zeppelin-web,spark/spark-dependencies,markdown 
-am" 
TEST_PROJECTS="-Dtest=ZeppelinSparkClusterTest21,SparkIntegrationTest21,ZeppelinSparkClusterTest20,SparkIntegrationTest20,ZeppelinSparkClusterTest16,SparkIntegrationTest16
 -DfailIfNoTests=false"
 
-    # ZeppelinSparkClusterTest23, SparkIntegrationTest23, Unit test of Spark 
2.3 (Scala-2.11) and Unit test python, jupyter and r interpreter under python2
+    # JdbcIntegrationTest, Unit test of Spark 2.4 (Scala-2.11)
     - sudo: required
       jdk: "openjdk8"
       dist: xenial
-      env: BUILD_PLUGINS="true" PYTHON="3" SCALA_VER="2.11" 
PROFILE="-Pspark-2.3 -Pspark-scala-2.11 -Phadoop2 -Pintegration" R="true" 
BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" 
MODULES="-pl 
zeppelin-interpreter-integration,zeppelin-web,spark/spark-dependencies,markdown"
 
TEST_PROJECTS="-Dtest=ZeppelinSparkClusterTest23,SparkIntegrationTest23,org.apache.zeppelin.spark.*,apache.zeppelin.python.*,apache.zeppelin.jupyter.*,apache.zeppelin.r.*
 -DfailIfNoTests=false"
+      env: BUILD_PLUGINS="true" PYTHON="3" SCALA_VER="2.11" 
PROFILE="-Pspark-2.4 -Pspark-scala-2.11 -Phadoop2 -Pintegration" R="true" 
BUILD_FLAG="install -DskipTests -DskipRat" TEST_FLAG="test -DskipRat" 
MODULES="-pl 
zeppelin-interpreter-integration,jdbc,zeppelin-web,spark/spark-dependencies,markdown
 -am" 
TEST_PROJECTS="-Dtest=JdbcIntegrationTest,org.apache.zeppelin.spark.*,org.apache.zeppelin.kotlin.*
 -DfailIfNoTests=false"
 
-    # ZeppelinSparkClusterTest22, SparkIntegrationTest22, Unit test of Spark 
2.2 (Scala-2.10) and Unit test python, jupyter and r interpreter under python3
+    # Unit test of Spark 2.4 (Scala-2.12)
     - sudo: required
       jdk: "openjdk8"
       dist: xenial
-      env: BUILD_PLUGINS="true" PYTHON="3" SCALA_VER="2.10" 
PROFILE="-Pspark-2.2 -Pspark-scala-2.10 -Phadoop2 -Pintegration" R="true" 
BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" 
MODULES="-pl 
zeppelin-interpreter-integration,zeppelin-web,spark/spark-dependencies,markdown"
 
TEST_PROJECTS="-Dtest=ZeppelinSparkClusterTest22,SparkIntegrationTest22,org.apache.zeppelin.spark.*,apache.zeppelin.python.*,apache.zeppelin.jupyter.*,apache.zeppelin.r.*
 -DfailIfNoTests=false"
+      env: BUILD_PLUGINS="false" PYTHON="3" SCALA_VER="2.12" 
PROFILE="-Pspark-2.4 -Pspark-scala-2.12 -Phadoop2" R="true" BUILD_FLAG="install 
-DskipTests -DskipRat" TEST_FLAG="test -DskipRat" MODULES="-pl 
spark/spark-dependencies -am" 
TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.*,org.apache.zeppelin.kotlin.* 
-DfailIfNoTests=false"
 
-    # ZeppelinSparkClusterTest21, SparkIntegrationTest21, Unit test of Spark 
2.1 (Scala-2.10)
+    # Unit test of Spark 2.3 (Scala-2.11) and Unit test python, jupyter and r 
interpreter under python2
     - sudo: required
       jdk: "openjdk8"
       dist: xenial
-      env: BUILD_PLUGINS="true" PYTHON="3" SCALA_VER="2.10" 
PROFILE="-Pspark-2.1 -Phadoop2 -Pspark-scala-2.10 -Pintegration" R="true" 
BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" 
MODULES="-pl 
zeppelin-interpreter-integration,zeppelin-web,spark/spark-dependencies,markdown"
 
TEST_PROJECTS="-Dtest=ZeppelinSparkClusterTest21,SparkIntegrationTest21,org.apache.zeppelin.spark.*
 -DfailIfNoTests=false"
+      env: BUILD_PLUGINS="false" PYTHON="3" SCALA_VER="2.11" 
PROFILE="-Pspark-2.3 -Pspark-scala-2.11 -Phadoop2" R="true" BUILD_FLAG="install 
-DskipTests -DskipRat" TEST_FLAG="test -DskipRat" MODULES="-pl 
spark/spark-dependencies -am" 
TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.*,apache.zeppelin.python.*,apache.zeppelin.jupyter.*,apache.zeppelin.r.*
 -DfailIfNoTests=false"
 
-    # ZeppelinSparkClusterTest20, SparkIntegrationTest20, Unit test of Spark 
2.0  (Scala-2.10), Use python 3.5 because spark 2.0 doesn't support python 3.6 +
+    # Unit test of Spark 2.2 (Scala-2.10) and Unit test python, jupyter and r 
interpreter under python3
     - sudo: required
       jdk: "openjdk8"
       dist: xenial
-      env: BUILD_PLUGINS="true" PYTHON="2" SCALA_VER="2.10" 
PROFILE="-Pspark-2.0 -Phadoop2 -Pspark-scala-2.10 -Pintegration" R="true" 
BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" 
MODULES="-pl 
zeppelin-interpreter-integration,zeppelin-web,spark/spark-dependencies,markdown"
 
TEST_PROJECTS="-Dtest=ZeppelinSparkClusterTest20,SparkIntegrationTest20,org.apache.zeppelin.spark.*
 -DfailIfNoTests=false"
+      env: BUILD_PLUGINS="false" PYTHON="3" SCALA_VER="2.10" 
PROFILE="-Pspark-2.2 -Pspark-scala-2.10 -Phadoop2" R="true" BUILD_FLAG="install 
-DskipTests -DskipRat" TEST_FLAG="test -DskipRat" MODULES="-pl 
spark/spark-dependencies -am" 
TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.*,apache.zeppelin.python.*,apache.zeppelin.jupyter.*,apache.zeppelin.r.*
 -DfailIfNoTests=false"
 
-    # ZeppelinSparkClusterTest16, SparkIntegrationTest16, Unit test of Spark 
1.6  (Scala-2.10)
+    # Unit test of Spark 2.1 (Scala-2.10)
     - sudo: required
       jdk: "openjdk8"
       dist: xenial
-      env: BUILD_PLUGINS="true" PYTHON="2" SCALA_VER="2.10" 
PROFILE="-Pspark-1.6 -Phadoop2 -Pspark-scala-2.10 -Pintegration" R="true" 
BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" 
MODULES="-pl 
zeppelin-interpreter-integration,zeppelin-web,spark/spark-dependencies,markdown"
 
TEST_PROJECTS="-Dtest=ZeppelinSparkClusterTest16,SparkIntegrationTest16,org.apache.zeppelin.spark.*
 -DfailIfNoTests=false"
+      env: BUILD_PLUGINS="false" PYTHON="3" SCALA_VER="2.10" 
PROFILE="-Pspark-2.1 -Phadoop2 -Pspark-scala-2.10 -Pintegration" R="true" 
BUILD_FLAG="install -DskipTests -DskipRat" TEST_FLAG="test -DskipRat" 
MODULES="-pl spark/spark-dependencies -am" 
TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.* -DfailIfNoTests=false"
+
+    # Unit test of Spark 2.0  (Scala-2.10), Use python 3.5 because spark 2.0 
doesn't support python 3.6 +
+    - sudo: required
+      jdk: "openjdk8"
+      dist: xenial
+      env: BUILD_PLUGINS="false" PYTHON="2" SCALA_VER="2.10" 
PROFILE="-Pspark-2.0 -Phadoop2 -Pspark-scala-2.10" R="true" BUILD_FLAG="install 
-DskipTests -DskipRat" TEST_FLAG="test -DskipRat" MODULES="-pl 
spark/spark-dependencies -am" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.* 
-DfailIfNoTests=false"
+
+    # Unit test of Spark 1.6  (Scala-2.10)
+    - sudo: required
+      jdk: "openjdk8"
+      dist: xenial
+      env: BUILD_PLUGINS="false" PYTHON="2" SCALA_VER="2.10" 
PROFILE="-Pspark-1.6 -Phadoop2 -Pspark-scala-2.10" R="true" BUILD_FLAG="install 
-DskipTests -DskipRat" TEST_FLAG="test -DskipRat" MODULES="-pl 
spark/spark-dependencies -am" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.* 
-DfailIfNoTests=false"
 
     # Test python/pyspark with python 2, livy 0.5
     - sudo: required
       dist: xenial
       jdk: "openjdk8"
-      env: PYTHON="2" SCALA_VER="2.10" SPARK_VER="1.6.3" HADOOP_VER="2.6" 
LIVY_VER="0.5.0-incubating" PROFILE="-Pspark-1.6 -Phadoop2 -Pscala-2.10" 
BUILD_FLAG="install -am -DskipTests -DskipRat" TEST_FLAG="verify -DskipRat" 
MODULES="-pl livy" TEST_PROJECTS=""
+      env: PYTHON="2" SCALA_VER="2.10" SPARK_VER="1.6.3" HADOOP_VER="2.6" 
LIVY_VER="0.5.0-incubating" PROFILE="-Pspark-1.6 -Phadoop2 -Pscala-2.10" 
BUILD_FLAG="install -DskipTests -DskipRat" TEST_FLAG="verify -DskipRat" 
MODULES="-pl livy -am" TEST_PROJECTS=""
 
     # Test livy 0.5 with spark 2.2.0 under python3
     - sudo: required
       dist: xenial
       jdk: "openjdk8"
-      env: PYTHON="3" SPARK_VER="2.2.0" HADOOP_VER="2.6" 
LIVY_VER="0.5.0-incubating" PROFILE="" BUILD_FLAG="install -am -DskipTests 
-DskipRat" TEST_FLAG="verify -DskipRat" MODULES="-pl livy" TEST_PROJECTS=""
+      env: PYTHON="3" SPARK_VER="2.2.0" HADOOP_VER="2.6" 
LIVY_VER="0.5.0-incubating" PROFILE="" BUILD_FLAG="install -DskipTests 
-DskipRat" TEST_FLAG="verify -DskipRat" MODULES="-pl livy -am" TEST_PROJECTS=""
 
 before_install:
   # check files included in commit range, clear bower_components if a 
bower.json file has changed.

Reply via email to