Merge branch 'use-git-rev-parse-for-root' into remote-jars-tests

Author: mccheah

integration-test/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala

@@ -41,9 +41,15 @@ private[spark] class KubernetesSuite extends FunSuite with BeforeAndAfterAll wit
   private var sparkAppConf: SparkAppConf = _
   private var remoteExamplesJarUri: URI = _
 
-  private val driverImage = System.getProperty("spark.docker.test.driverImage", "spark-driver:latest")
-  private val executorImage = System.getProperty("spark.docker.test.executorImage", "spark-executor:latest")
-  private val initContainerImage = System.getProperty("spark.docker.test.initContainerImage", "spark-init:latest")
+  private val driverImage = System.getProperty(
+    "spark.docker.test.driverImage",
+    "spark-driver:latest")
+  private val executorImage = System.getProperty(
+    "spark.docker.test.executorImage",
+    "spark-executor:latest")
+  private val initContainerImage = System.getProperty(
+    "spark.docker.test.initContainerImage",
+    "spark-init:latest")
 
   override def beforeAll(): Unit = {
     testBackend.initialize()
@@ -142,17 +148,30 @@ private[spark] class KubernetesSuite extends FunSuite with BeforeAndAfterAll wit
       })
   }
 
-  test("Run SparkPi using the remote example jar with a test secret mounted into the driver and " +
-    "executor pods") {
+  test("Run PageRank using remote data file") {
+    sparkAppConf
+      .set("spark.kubernetes.mountDependencies.filesDownloadDir",
+        CONTAINER_LOCAL_FILE_DOWNLOAD_PATH)
+      .set("spark.files", REMOTE_PAGE_RANK_DATA_FILE)
+      .set("spark.kubernetes.initContainer.image", initContainerImage)
+    runSparkPageRankAndVerifyCompletion(
+      appArgs = Array(CONTAINER_LOCAL_DOWNLOADED_PAGE_RANK_DATA_FILE))
+  }
+
+  test("Run PageRank using remote data file with test secret mounted into the driver and " +
+    "executors") {
     sparkAppConf
+      .set("spark.kubernetes.mountDependencies.filesDownloadDir",
+        CONTAINER_LOCAL_FILE_DOWNLOAD_PATH)
+      .set("spark.files", REMOTE_PAGE_RANK_DATA_FILE)
       .set(s"spark.kubernetes.driver.secrets.$TEST_SECRET_NAME", TEST_SECRET_MOUNT_PATH)
       .set(s"spark.kubernetes.executor.secrets.$TEST_SECRET_NAME", TEST_SECRET_MOUNT_PATH)
-    sparkAppConf.set("spark.kubernetes.initContainer.image", initContainerImage)
+      .set("spark.kubernetes.initContainer.image", initContainerImage)
 
     createTestSecret()
 
-    runSparkPiAndVerifyCompletion(
-      appResource = remoteExamplesJarUri.toString,
+    runSparkPageRankAndVerifyCompletion(
+      appArgs = Array(CONTAINER_LOCAL_DOWNLOADED_PAGE_RANK_DATA_FILE),
       driverPodChecker = (driverPod: Pod) => {
         doBasicDriverPodCheck(driverPod)
         checkTestSecret(driverPod, withInitContainer = true)
@@ -163,14 +182,6 @@ private[spark] class KubernetesSuite extends FunSuite with BeforeAndAfterAll wit
       })
   }
 
-  test("Run PageRank using remote data file") {
-    sparkAppConf
-      .set("spark.kubernetes.mountDependencies.filesDownloadDir", CONTAINER_LOCAL_FILE_DOWNLOAD_PATH)
-      .set("spark.files", REMOTE_PAGE_RANK_DATA_FILE)
-      .set("spark.kubernetes.initContainer.image", initContainerImage)
-    runSparkPageRankAndVerifyCompletion(appArgs = Array(CONTAINER_LOCAL_DOWNLOADED_PAGE_RANK_DATA_FILE))
-  }
-
   private def runSparkPiAndVerifyCompletion(
       appResource: String = CONTAINER_LOCAL_SPARK_DISTRO_EXAMPLES_JAR,
       driverPodChecker: Pod => Unit = doBasicDriverPodCheck,