You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2019/04/20 07:29:09 UTC
[zeppelin] branch master updated: [HOTFIX] Fix spark integration
test fail
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 4fc7f08 [HOTFIX] Fix spark integration test fail
4fc7f08 is described below
commit 4fc7f0881ea1390d0b21da9fbd38fc2d9c3dac73
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Fri Apr 19 15:12:14 2019 +0800
[HOTFIX] Fix spark integration test fail
(cherry picked from commit 081d6d832caaf6e6d9e75a45a419db0d39f0e14b)
---
.travis.yml | 4 ++--
testing/downloadSpark.sh | 2 +-
.../java/org/apache/zeppelin/integration/SparkIntegrationTest.java | 3 +++
.../org/apache/zeppelin/integration/ZeppelinSparkClusterTest.java | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 5334760..7a9fedf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,12 +79,12 @@ matrix:
dist: trusty
env: PYTHON="3" SPARKR="true" PROFILE="-Pspark-2.2 -Phelium-dev -Pexamples -Pscala-2.11" BUILD_FLAG="install -Pbuild-distr -DskipRat" TEST_FLAG="verify -Pusing-packaged-distr -DskipRat" MODULES="-pl ${INTERPRETERS}" TEST_PROJECTS="-Dtests.to.exclude=**/JdbcIntegrationTest.java,**/SparkIntegrationTest.java,**/ZeppelinSparkClusterTest.java,**/org/apache/zeppelin/spark/*,**/HeliumApplicationFactoryTest.java -DfailIfNoTests=false"
- # Test selenium with spark module for 1.6.3
+ # Test selenium with spark module for spark 2.3
- jdk: "oraclejdk8"
dist: trusty
addons:
firefox: "31.0"
- env: BUILD_PLUGINS="true" CI="true" PYTHON="2" SCALA_VER="2.10" SPARK_VER="1.6.3" HADOOP_VER="2.6" PROFILE="-Pspark-1.6 -Phadoop2 -Phelium-dev -Pexamples -Pintegration -Pscala-2.10" BUILD_FLAG="install -DskipTests -DskipRat -pl ${INTERPRETERS}" TEST_FLAG="verify -DskipRat" TEST_PROJECTS="-pl zeppelin-integration -DfailIfNoTests=false"
+ env: BUILD_PLUGINS="true" CI="true" PYTHON="2" SCALA_VER="2.11" SPARK_VER="2.3.2" HADOOP_VER="2.6" PROFILE="-Pspark-2.3 -Phadoop2 -Phelium-dev -Pexamples -Pintegration -Pscala-2.11" BUILD_FLAG="install -DskipTests -DskipRat -pl ${INTERPRETERS}" TEST_FLAG="verify -DskipRat" TEST_PROJECTS="-pl zeppelin-integration -DfailIfNoTests=false"
# Test interpreter modules
- jdk: "oraclejdk8"
diff --git a/testing/downloadSpark.sh b/testing/downloadSpark.sh
index 8aad2d8..9c19e82 100755
--- a/testing/downloadSpark.sh
+++ b/testing/downloadSpark.sh
@@ -66,7 +66,7 @@ if [[ ! -d "${SPARK_HOME}" ]]; then
echo "${SPARK_VERSION} being downloaded from archives"
STARTTIME=`date +%s`
#timeout -s KILL "${MAX_DOWNLOAD_TIME_SEC}" wget "http://archive.apache.org/dist/spark/spark-${SPARK_VERSION}/${SPARK_ARCHIVE}.tgz"
- download_with_retry "http://d3kbcqa49mib13.cloudfront.net/${SPARK_ARCHIVE}.tgz"
+ download_with_retry "http://archive.apache.org/dist/spark/spark-${SPARK_VERSION}/${SPARK_ARCHIVE}.tgz"
ENDTIME=`date +%s`
DOWNLOADTIME="$((ENDTIME-STARTTIME))"
fi
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest.java
index 94a6a40..d5d07a0 100644
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest.java
+++ b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest.java
@@ -148,6 +148,7 @@ public abstract class SparkIntegrationTest {
sparkInterpreterSetting.setProperty("zeppelin.spark.useHiveContext", "false");
sparkInterpreterSetting.setProperty("zeppelin.pyspark.useIPython", "false");
sparkInterpreterSetting.setProperty("zeppelin.spark.scala.color", "false");
+ sparkInterpreterSetting.setProperty("zeppelin.spark.deprecatedMsg.show", "false");
testInterpreterBasics();
@@ -171,6 +172,7 @@ public abstract class SparkIntegrationTest {
sparkInterpreterSetting.setProperty("PYSPARK_PYTHON", getPythonExec());
sparkInterpreterSetting.setProperty("spark.driver.memory", "512m");
sparkInterpreterSetting.setProperty("zeppelin.spark.scala.color", "false");
+ sparkInterpreterSetting.setProperty("zeppelin.spark.deprecatedMsg.show", "false");
testInterpreterBasics();
@@ -194,6 +196,7 @@ public abstract class SparkIntegrationTest {
sparkInterpreterSetting.setProperty("PYSPARK_PYTHON", getPythonExec());
sparkInterpreterSetting.setProperty("spark.driver.memory", "512m");
sparkInterpreterSetting.setProperty("zeppelin.spark.scala.color", "false");
+ sparkInterpreterSetting.setProperty("zeppelin.spark.deprecatedMsg.show", "false");
testInterpreterBasics();
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest.java
index ac76d03..defd5ab 100644
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest.java
+++ b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest.java
@@ -113,7 +113,7 @@ public abstract class ZeppelinSparkClusterTest extends AbstractTestRestApi {
new InterpreterProperty("spark.serializer", "org.apache.spark.serializer.KryoSerializer"));
sparkProperties.put("zeppelin.spark.scala.color",
new InterpreterProperty("zeppelin.spark.scala.color", "false"));
- sparkProperties.put("zzeppelin.spark.deprecatedMsg.show",
+ sparkProperties.put("zeppelin.spark.deprecatedMsg.show",
new InterpreterProperty("zeppelin.spark.deprecatedMsg.show", "false"));
TestUtils.getInstance(Notebook.class).getInterpreterSettingManager().restart(sparkIntpSetting.getId());
}