You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by jo...@apache.org on 2015/11/26 06:44:35 UTC
incubator-zeppelin git commit: [Minor] Fix travis setting for testing
Spark 1.5.x
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master 86e2fd1e0 -> 4af49ca8e
[Minor] Fix travis setting for testing Spark 1.5.x
Zeppelin builds Spark 1.4 by default. For testing Spark 1.5.x, we should use `-Pspark-1.5`
Author: Jongyoul Lee <jo...@gmail.com>
Closes #462 from jongyoul/fix-travis-spark-1.5 and squashes the following commits:
3b68461 [Jongyoul Lee] [Minor] Fix travis setting for testing Spark 1.5.x
1c75c2c [Jongyoul Lee] [Minor] Fix travis setting for testing Spark 1.5.x
46a10e7 [Jongyoul Lee] [Minor] Fix travis setting for testing Spark 1.5.x
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/4af49ca8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/4af49ca8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/4af49ca8
Branch: refs/heads/master
Commit: 4af49ca8e088bb691884edd6440ba1654ea8d199
Parents: 86e2fd1
Author: Jongyoul Lee <jo...@gmail.com>
Authored: Wed Nov 25 10:09:35 2015 +0900
Committer: Jongyoul Lee <jl...@Jongyouls-MacBook-Pro.local>
Committed: Thu Nov 26 14:43:39 2015 +0900
----------------------------------------------------------------------
.travis.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/4af49ca8/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 213fc56..ad6ff56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,17 +22,17 @@ before_install:
- "sh -e /etc/init.d/xvfb start"
install:
- - mvn package -DskipTests -Phadoop-2.3 -Ppyspark -B
+ - mvn package -DskipTests -Pspark-1.5 -Phadoop-2.3 -Ppyspark -B
before_script:
-
script:
# spark 1.5
- - mvn package -Pbuild-distr -Phadoop-2.3 -Ppyspark -B
+ - mvn package -Pbuild-distr -Pspark-1.5 -Phadoop-2.3 -Ppyspark -B
- ./testing/startSparkCluster.sh 1.5.2 2.3
- echo "export SPARK_HOME=`pwd`/spark-1.5.2-bin-hadoop2.3" > conf/zeppelin-env.sh
- - mvn verify -Pusing-packaged-distr -Phadoop-2.3 -Ppyspark -B
+ - mvn verify -Pusing-packaged-distr -Pspark-1.5 -Phadoop-2.3 -Ppyspark -B
- ./testing/stopSparkCluster.sh 1.5.2 2.3
# spark 1.4
- rm -rf `pwd`/interpreter/spark