From 78e7fb20d18e1e0157a73033f4778fd26a6379ea Mon Sep 17 00:00:00 2001
From: Shuai Lin <linshuai2012@gmail.com>
Date: Thu, 26 Jan 2017 11:28:16 +0800
Subject: [PATCH 1/4] Use "extraTestArgLine" to pass extra options to
 scalatest.

Because the "argLine" option of scalatest is set in pom.xml and we can't
overwrite it from the command line.

Ref apache-spark-on-k8s/spark#37
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 74fb7ce064457..6d5c96151e5c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2096,7 +2096,7 @@
             <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
             <junitxml>.</junitxml>
             <filereports>SparkTestSuite.txt</filereports>
-            <argLine>-ea -Xmx3g -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=${CodeCacheSize}</argLine>
+            <argLine>-ea -Xmx3g -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=${CodeCacheSize} ${extraTestArgLine}</argLine>
             <stderr/>
             <environmentVariables>
               <!--

From e7f1f3eef00bc58070badb69a5b564effa9ef1c2 Mon Sep 17 00:00:00 2001
From: Shuai Lin <linshuai2012@gmail.com>
Date: Thu, 26 Jan 2017 11:40:26 +0800
Subject: [PATCH 2/4] Added a default value for extraTestArgLine

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 6d5c96151e5c7..de8f63d9858a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,6 +223,7 @@
     <PermGen>64m</PermGen>
     <MaxPermGen>512m</MaxPermGen>
     <CodeCacheSize>512m</CodeCacheSize>
+    <extraTestArgLine></extraTestArgLine>
   </properties>
   <repositories>
     <repository>

From b79f5d96a9bf9cd9a5fc49c2f648403bac4a82be Mon Sep 17 00:00:00 2001
From: Shuai Lin <linshuai2012@gmail.com>
Date: Thu, 26 Jan 2017 15:21:34 +0800
Subject: [PATCH 3/4] Use a better name.

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index de8f63d9858a3..810a2f42d2516 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,7 +223,7 @@
     <PermGen>64m</PermGen>
     <MaxPermGen>512m</MaxPermGen>
     <CodeCacheSize>512m</CodeCacheSize>
-    <extraTestArgLine></extraTestArgLine>
+    <extraScalaTestArgs></extraScalaTestArgs>
   </properties>
   <repositories>
     <repository>
@@ -2097,7 +2097,7 @@
             <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
             <junitxml>.</junitxml>
             <filereports>SparkTestSuite.txt</filereports>
-            <argLine>-ea -Xmx3g -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=${CodeCacheSize} ${extraTestArgLine}</argLine>
+            <argLine>-ea -Xmx3g -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=${CodeCacheSize} ${extraScalaTestArgs}</argLine>
             <stderr/>
             <environmentVariables>
               <!--

From 8a475ba63817a02e5fc317740b73df482381a0fb Mon Sep 17 00:00:00 2001
From: Shuai Lin <linshuai2012@gmail.com>
Date: Thu, 26 Jan 2017 15:34:58 +0800
Subject: [PATCH 4/4] Added a tip for this in the dev docs.

---
 resource-managers/kubernetes/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/resource-managers/kubernetes/README.md b/resource-managers/kubernetes/README.md
index 33aca58c256cf..5e4ffaa54cb55 100644
--- a/resource-managers/kubernetes/README.md
+++ b/resource-managers/kubernetes/README.md
@@ -51,6 +51,20 @@ Afterwards, the integration tests can be executed with Maven or your IDE. Note t
 `pre-integration-test` phase must be run every time the Spark main code changes. When running tests from the
 command line, the `pre-integration-test` phase should automatically be invoked if the `integration-test` phase is run.
 
+# Preserve the Minikube VM
+
+The integration tests make use of [Minikube](https://github.com/kubernetes/minikube), which fires up a virtual machine
+and setup a single-node kubernetes cluster within it. By default the vm is destroyed after the tests are finished.
+If you want to preserve the vm, e.g. to reduce the running time of tests during development, you can pass the property
+`spark.docker.test.persistMinikube` to the test process:
+
+```sh
+build/mvn integration-test \
+    -Pkubernetes -Pkubernetes-integration-tests \
+    -pl resource-managers/kubernetes/integration-tests -am \
+    -DextraScalaTestArgs=-Dspark.docker.test.persistMinikube=true
+```
+
 # Usage Guide
 
 See the [usage guide](../../docs/running-on-kubernetes.md) for more information.