Skip to content

add test for spark 2.4 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HyukjinKwon merged 1 commit into from
Nov 9, 2018
Merged

add test for spark 2.4 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ sudo: false

before_cache:
- sudo chown -R travis:travis $HOME/.m2

cache:
apt: true
directories:
Expand Down Expand Up @@ -98,15 +98,15 @@ matrix:
dist: trusty
env: BUILD_PLUGINS="true" PYTHON="3" SCALA_VER="2.10" PROFILE="-Pspark-1.6 -Pscala-2.10" SPARKR="true" BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl zeppelin-zengine,spark/interpreter,spark/spark-dependencies" TEST_PROJECTS="-Dtest=SparkIntegrationTest,org.apache.zeppelin.spark.* -DfailIfNoTests=false"

# Test spark module for 2.1.0 with scala 2.11
# Test spark module for 2.4.0 with scala 2.11
- jdk: "oraclejdk8"
dist: trusty
env: BUILD_PLUGINS="false" PYTHON="2" SCALA_VER="2.11" PROFILE="-Pspark-2.1 -Phadoop2 -Pscala-2.11" SPARKR="true" BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl spark/interpreter,spark/spark-dependencies" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.*,org.apache.zeppelin.rinterpreter.*,org.apache.spark.api.r.* -DfailIfNoTests=false"
env: BUILD_PLUGINS="false" PYTHON="2" SCALA_VER="2.11" PROFILE="-Pspark-2.4 -Phadoop2 -Pscala-2.11" SPARKR="true" BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl spark/interpreter,spark/spark-dependencies" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.*,org.apache.zeppelin.rinterpreter.*,org.apache.spark.api.r.* -DfailIfNoTests=false"

# Test spark module for 2.0.2 with scala 2.11
# Test spark module for 2.3.2 with scala 2.11
- jdk: "oraclejdk8"
dist: trusty
env: BUILD_PLUGINS="false" PYTHON="2" SCALA_VER="2.11" PROFILE="-Pspark-2.0 -Phadoop3 -Pscala-2.11" SPARKR="true" BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl spark/interpreter,spark/spark-dependencies" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.*,org.apache.zeppelin.rinterpreter.*,org.apache.spark.api.r.* -DfailIfNoTests=false"
env: BUILD_PLUGINS="false" PYTHON="2" SCALA_VER="2.11" PROFILE="-Pspark-2.3 -Phadoop3 -Pscala-2.11" SPARKR="true" BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl spark/interpreter,spark/spark-dependencies" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.*,org.apache.zeppelin.rinterpreter.*,org.apache.spark.api.r.* -DfailIfNoTests=false"

# Test python/pyspark with python 2, livy 0.5
- sudo: required
Expand Down
55 changes: 48 additions & 7 deletions spark/interpreter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<pyspark.test.exclude>**/PySparkInterpreterMatplotlibTest.java</pyspark.test.exclude>
<pyspark.test.include>**/*Test.*</pyspark.test.include>


</properties>

<dependencies>
Expand All @@ -69,12 +69,6 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.zeppelin</groupId>
<artifactId>spark-scala-2.10</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-interpreter-api</artifactId>
Expand Down Expand Up @@ -609,4 +603,51 @@
</plugins>
</build>

<profiles>

<profile>
<id>spark-2.2</id>
<dependencies>
<dependency>
<groupId>org.apache.zeppelin</groupId>
<artifactId>spark-scala-2.10</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>

<profile>
<id>spark-2.1</id>
<dependencies>
<dependency>
<groupId>org.apache.zeppelin</groupId>
<artifactId>spark-scala-2.10</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>

<profile>
<id>spark-2.0</id>
<dependencies>
<dependency>
<groupId>org.apache.zeppelin</groupId>
<artifactId>spark-scala-2.10</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>

<profile>
<id>spark-1.6</id>
<dependencies>
<dependency>
<groupId>org.apache.zeppelin</groupId>
<artifactId>spark-scala-2.10</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>

</profiles>
</project>
35 changes: 23 additions & 12 deletions spark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,16 @@

<spark.archive>spark-${spark.version}</spark.archive>
<spark.src.download.url>
http://d3kbcqa49mib13.cloudfront.net/${spark.archive}.tgz
https://archive.apache.org/dist/spark/${spark.archive}/${spark.archive}.tgz
</spark.src.download.url>
<spark.bin.download.url>
http://d3kbcqa49mib13.cloudfront.net/${spark.archive}-bin-without-hadoop.tgz
https://archive.apache.org/dist/spark/${spark.archive}/${spark.archive}-bin-without-hadoop.tgz
</spark.bin.download.url>
</properties>

<modules>
<module>interpreter</module>
<module>spark-scala-parent</module>
<module>scala-2.10</module>
<module>scala-2.11</module>
<module>spark-dependencies</module>
<module>spark-shims</module>
Expand Down Expand Up @@ -197,36 +196,42 @@
<properties>
<spark.version>2.4.0</spark.version>
<protobuf.version>2.5.0</protobuf.version>
<spark.py4j.version>0.10.7</spark.py4j.version>
<py4j.version>0.10.7</py4j.version>
</properties>
</profile>

<profile>
<id>spark-2.3</id>
<properties>
<spark.version>2.3.0</spark.version>
<spark.version>2.3.2</spark.version>
<protobuf.version>2.5.0</protobuf.version>
<spark.py4j.version>0.10.6</spark.py4j.version>
<py4j.version>0.10.6</py4j.version>
</properties>
</profile>

<profile>
<id>spark-2.2</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<spark.version>2.2.0</spark.version>
<spark.version>2.2.1</spark.version>
<py4j.version>0.10.4</py4j.version>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>scala-2.10</module>
</modules>
</profile>

<profile>
<id>spark-2.1</id>
<properties>
<spark.version>2.1.0</spark.version>
<spark.version>2.1.2</spark.version>
<py4j.version>0.10.4</py4j.version>
</properties>
<modules>
<module>scala-2.10</module>
</modules>
</profile>

<profile>
Expand All @@ -235,6 +240,9 @@
<spark.version>2.0.2</spark.version>
<py4j.version>0.10.3</py4j.version>
</properties>
<modules>
<module>scala-2.10</module>
</modules>
</profile>

<profile>
Expand All @@ -243,7 +251,10 @@
<spark.version>1.6.3</spark.version>
<py4j.version>0.9</py4j.version>
</properties>
<modules>
<module>scala-2.10</module>
</modules>
</profile>

</profiles>
</project>
12 changes: 7 additions & 5 deletions zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
//ci timeout.
//TODO(zjffdu) remove this after we upgrade it to junit 4.13 (ZEPPELIN-3341)
private static Set<String> verifiedSparkVersions = new HashSet<>();


private String sparkVersion;
private AuthenticationInfo anonymous = new AuthenticationInfo("anonymous");
Expand All @@ -83,10 +83,12 @@ public ZeppelinSparkClusterTest(String sparkVersion) throws Exception {
@Parameterized.Parameters
public static List<Object[]> data() {
return Arrays.asList(new Object[][]{
{"2.2.1"},
{"2.1.2"},
{"2.0.2"},
{"1.6.3"}
{"2.4.0"},
{"2.3.2"},
{"2.2.1"},
{"2.1.2"},
{"2.0.2"},
{"1.6.3"}
});
}

Expand Down
10 changes: 6 additions & 4 deletions zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/SparkIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@ public SparkIntegrationTest(String sparkVersion) {
@Parameterized.Parameters
public static List<Object[]> data() {
return Arrays.asList(new Object[][]{
{"2.2.1"},
{"2.1.2"},
{"2.0.2"},
{"1.6.3"}
{"2.4.0"},
{"2.3.2"},
{"2.2.1"},
{"2.1.2"},
{"2.0.2"},
{"1.6.3"}
});
}

Expand Down