From 1d447432c87c8b81739ccebad451804e6d41a463 Mon Sep 17 00:00:00 2001
From: Kimoon Kim <kimoon@pepperdata.com>
Date: Wed, 8 Feb 2017 14:42:03 -0800
Subject: [PATCH 1/2] Trigger scalatest plugin in the integration-test phase

---
 .../kubernetes/integration-tests/pom.xml      | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml
index f6a322f18cd7..6de7b58b717c 100644
--- a/resource-managers/kubernetes/integration-tests/pom.xml
+++ b/resource-managers/kubernetes/integration-tests/pom.xml
@@ -216,6 +216,35 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <!-- Triggers scalatest plugin in the integration-test phase instead of
+             the test phase, so that test jobs are copied over beforehand.
+             See copy-test-spark-jobs execution of maven-dependency-plugin above. -->
+        <groupId>org.scalatest</groupId>
+        <artifactId>scalatest-maven-plugin</artifactId>
+        <configuration>...</configuration>
+        <executions>
+          <execution>
+            <id>test</id>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <configuration>
+              <suffixes>(?&lt;!Suite)</suffixes>
+            </configuration>
+          </execution>
+          <execution>
+            <id>integration-test</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <configuration>
+              <suffixes>(?&lt;=Suite)</suffixes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
 
   </build>

From 57171eef8ead0fd15967e606800b0dbc509af9d0 Mon Sep 17 00:00:00 2001
From: Kimoon Kim <kimoon@pepperdata.com>
Date: Mon, 13 Feb 2017 09:24:24 -0800
Subject: [PATCH 2/2] Clean up unnecessary config section

---
 resource-managers/kubernetes/integration-tests/pom.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml
index 6de7b58b717c..3de10f94c4ac 100644
--- a/resource-managers/kubernetes/integration-tests/pom.xml
+++ b/resource-managers/kubernetes/integration-tests/pom.xml
@@ -222,7 +222,6 @@
              See copy-test-spark-jobs execution of maven-dependency-plugin above. -->
         <groupId>org.scalatest</groupId>
         <artifactId>scalatest-maven-plugin</artifactId>
-        <configuration>...</configuration>
         <executions>
           <execution>
             <id>test</id>
@@ -230,6 +229,8 @@
               <goal>test</goal>
             </goals>
             <configuration>
+              <!-- The negative pattern below prevents integration tests such as
+                   KubernetesSuite from running in the test phase. -->
               <suffixes>(?&lt;!Suite)</suffixes>
             </configuration>
           </execution>
@@ -239,9 +240,6 @@
             <goals>
               <goal>test</goal>
             </goals>
-            <configuration>
-              <suffixes>(?&lt;=Suite)</suffixes>
-            </configuration>
           </execution>
         </executions>
       </plugin>