Repository: bigtop Updated Branches: refs/heads/master 11eb2d26f -> 2a6343ed3
BIGTOP-2676: Smoke test fails on Spark 2 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/2a6343ed Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/2a6343ed Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/2a6343ed Branch: refs/heads/master Commit: 2a6343ed3d16446d7521a636bb753603f2e5b459 Parents: 11eb2d2 Author: Kengo Seki <[email protected]> Authored: Mon Jan 23 08:40:18 2017 -0500 Committer: Kengo Seki <[email protected]> Committed: Mon Jan 23 08:40:18 2017 -0500 ---------------------------------------------------------------------- bigtop-tests/smoke-tests/spark/TestSpark.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/2a6343ed/bigtop-tests/smoke-tests/spark/TestSpark.groovy ---------------------------------------------------------------------- diff --git a/bigtop-tests/smoke-tests/spark/TestSpark.groovy b/bigtop-tests/smoke-tests/spark/TestSpark.groovy index 8908c3d..9250809 100644 --- a/bigtop-tests/smoke-tests/spark/TestSpark.groovy +++ b/bigtop-tests/smoke-tests/spark/TestSpark.groovy @@ -48,9 +48,9 @@ class TestSpark { // create HDFS examples/src/main/resources sh.exec("hdfs dfs -mkdir -p examples/src/main/resources") // extract people.txt file into it - String examplesJar = JarContent.getJarName("$SPARK_HOME/lib", 'spark-examples.*jar') + String examplesJar = JarContent.getJarName("$SPARK_HOME/examples/jars", 'spark-examples.*jar') assertNotNull(examplesJar, "spark-examples.jar file wasn't found") - ZipInputStream zipInputStream = new ZipInputStream(new FileInputStream("$SPARK_HOME/lib/$examplesJar")) + ZipInputStream zipInputStream = new ZipInputStream(new FileInputStream("$SPARK_HOME/examples/jars/$examplesJar")) File examplesDir = new File('examples') examplesDir.mkdirs() zipInputStream.unzip(examplesDir.getName(), 'people') @@ -81,8 +81,8 @@ class TestSpark { final String SPARK_SHELL = SPARK_HOME + "/bin/spark-shell --master $masterMode" // Let's use time, 'cause the test has one job sh.exec("timeout 120 " + SPARK_SHELL + - " --class org.apache.spark.examples.sql.JavaSparkSQL " + - " --jars " + SPARK_HOME + "/lib/spark-examples*.jar > " + + " --class org.apache.spark.examples.sql.JavaSparkSQLExample " + + " --jars " + SPARK_HOME + "/examples/jars/spark-examples*.jar > " + TEST_SPARKSQL_LOG + " 2>&1") logError(sh) assertTrue("Failed ...", sh.getRet() == 0);
