Repository: bigtop
Updated Branches:
  refs/heads/master 0e4ea1219 -> adfb877e7


BIGTOP-2860: Fix TestSpark.groovy syntax error

Closes @268

Signed-off-by: Konstantin Boudnik <konstantin_boud...@epam.com>


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/adfb877e
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/adfb877e
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/adfb877e

Branch: refs/heads/master
Commit: adfb877e7dbbe1fd6b83ce074ee49d54af8d6f26
Parents: 0e4ea12
Author: Yuqi Gu <yuqi...@arm.com>
Authored: Fri Jul 28 03:34:44 2017 +0000
Committer: Konstantin Boudnik <konstantin_boud...@epam.com>
Committed: Tue Aug 8 18:35:47 2017 -0700

----------------------------------------------------------------------
 bigtop-tests/smoke-tests/spark/TestSpark.groovy | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/adfb877e/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 b4a8c06..6d13ebf 100644
--- a/bigtop-tests/smoke-tests/spark/TestSpark.groovy
+++ b/bigtop-tests/smoke-tests/spark/TestSpark.groovy
@@ -40,6 +40,8 @@ class TestSpark {
 
   static Shell sh = new Shell("/bin/bash -s")
   static final String SPARK_HOME = System.getenv("SPARK_HOME")
+  static final String SPARK_MASTER_IP = System.getenv("SPARK_MASTER_IP")
+  static final String SPARK_MASTER_PORT = System.getenv("SPARK_MASTER_PORT")
   static final String TEST_SPARKSQL_LOG = "/tmp/TestSpark_testSparkSQL.log"
 
   @BeforeClass
@@ -72,8 +74,8 @@ class TestSpark {
     // If SPARK_MASTER_IP nor SPARK_MASTER_PORT are set, we'll assume
     // 'yarn-client' mode
     String masterMode = 'yarn-client'
-    if (System.env.SPARK_MASTER_IP != null && System.env.SPARK_MASTER_PORT != 
null)
-      masterMode = "spark://$MASTER_IP:$MASTER_PORT"
+    if (SPARK_MASTER_IP != null && SPARK_MASTER_PORT != null)
+      masterMode = "spark://$SPARK_MASTER_IP:$SPARK_MASTER_PORT"
     else
       println("SPARK_MASTER isn't set. yarn-client submission will be used. " +
           "Refer to smoke-tests/README If this isn't what you you expect.")

Reply via email to