From c20abedefa76763a96c08f3cc1ecb25fe0790da0 Mon Sep 17 00:00:00 2001 From: Yuqi Gu Date: Fri, 28 Jul 2017 03:34:44 +0000 Subject: [PATCH 1/3] BIGTOP-2860:Fix TestSpark.groovy syntax error Change-Id: If3dba95133219dd16b9870b54f072c01328fbdaf Signed-off-by: Yuqi Gu --- bigtop-tests/smoke-tests/spark/TestSpark.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bigtop-tests/smoke-tests/spark/TestSpark.groovy b/bigtop-tests/smoke-tests/spark/TestSpark.groovy index 92508093c..59b9b46d7 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_PORT = System.getenv("SPARK_MASTER_PORT") static final String TEST_SPARKSQL_LOG = "/tmp/TestSpark_testSparkSQL.log" @BeforeClass @@ -73,7 +75,7 @@ class TestSpark { // '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" + 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.") From f180887c96b089741d5acd81de62f8e923a39bc7 Mon Sep 17 00:00:00 2001 From: guyuqi Date: Mon, 7 Aug 2017 09:17:32 +0800 Subject: [PATCH 2/3] Update TestSpark.groovy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixed. Thanks naresh！ --- bigtop-tests/smoke-tests/spark/TestSpark.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigtop-tests/smoke-tests/spark/TestSpark.groovy b/bigtop-tests/smoke-tests/spark/TestSpark.groovy index 59b9b46d7..1ac3b17b9 100644 --- a/bigtop-tests/smoke-tests/spark/TestSpark.groovy +++ b/bigtop-tests/smoke-tests/spark/TestSpark.groovy @@ -41,7 +41,7 @@ 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_PORT = System.getenv("SPARK_MASTER_PORT") + static final String SPARK_MASTER_PORT = System.getenv("SPARK_MASTER_PORT") static final String TEST_SPARKSQL_LOG = "/tmp/TestSpark_testSparkSQL.log" @BeforeClass From 26c028e101de631d77f4c5d8b3b2f8b5fde94423 Mon Sep 17 00:00:00 2001 From: guyuqi Date: Wed, 9 Aug 2017 09:27:35 +0800 Subject: [PATCH 3/3] Update TestSpark.groovy --- bigtop-tests/smoke-tests/spark/TestSpark.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigtop-tests/smoke-tests/spark/TestSpark.groovy b/bigtop-tests/smoke-tests/spark/TestSpark.groovy index 1ac3b17b9..0ad8207b3 100644 --- a/bigtop-tests/smoke-tests/spark/TestSpark.groovy +++ b/bigtop-tests/smoke-tests/spark/TestSpark.groovy @@ -74,7 +74,7 @@ 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) + 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. " +