From a05b785d94aecb862dc5427760d32847e9674bca Mon Sep 17 00:00:00 2001
From: Kenneth Knowles <klk@google.com>
Date: Thu, 21 Jul 2016 14:54:17 -0700
Subject: [PATCH 1/2] Move local Flink integration tests to a profile

These tests can now be activated on the commandline
with -P local-runnable-on-service-tests and are
activated directly by Jenkins.
---
 runners/flink/runner/pom.xml | 57 +++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 23 deletions(-)

diff --git a/runners/flink/runner/pom.xml b/runners/flink/runner/pom.xml
index 1c522fc1abc6..33fcda008e3b 100644
--- a/runners/flink/runner/pom.xml
+++ b/runners/flink/runner/pom.xml
@@ -32,6 +32,40 @@
 
   <packaging>jar</packaging>
 
+  <profiles>
+    <profile>
+      <id>local-runnable-on-service-tests</id>
+      <activation><activeByDefault>false</activeByDefault></activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>runnable-on-service-tests</id>
+                <phase>integration-test</phase>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <configuration>
+                  <systemPropertyVariables>
+                    <beamTestPipelineOptions>
+                      [
+                        "--runner=TestFlinkRunner",
+                        "--streaming=false"
+                      ]
+                    </beamTestPipelineOptions>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
   <dependencies>
     <!-- Flink dependencies -->
     <dependency>
@@ -192,29 +226,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <executions>
-          <execution>
-            <id>runnable-on-service-tests</id>
-            <phase>integration-test</phase>
-            <goals>
-              <goal>test</goal>
-            </goals>
-            <configuration>
-              <groups>org.apache.beam.sdk.testing.RunnableOnService</groups>
-              <parallel>none</parallel>
-              <failIfNoTests>true</failIfNoTests>
-              <dependenciesToScan>
-                <dependency>org.apache.beam:beam-sdks-java-core</dependency>
-              </dependenciesToScan>
-              <systemPropertyVariables>
-                <beamTestPipelineOptions>
-                  [
-                    "--runner=TestFlinkRunner",
-                    "--streaming=false"
-                  ]
-                </beamTestPipelineOptions>
-              </systemPropertyVariables>
-            </configuration>
-          </execution>
           <execution>
             <id>streaming-runnable-on-service-tests</id>
             <phase>integration-test</phase>

From c5ff6b3bf102c2b3b6dc682dfbeb69bbef398967 Mon Sep 17 00:00:00 2001
From: Kenneth Knowles <klk@google.com>
Date: Wed, 27 Jul 2016 12:13:53 -0700
Subject: [PATCH 2/2] fixup! move streaming configuration to the profile too

---
 runners/flink/runner/pom.xml | 57 ++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/runners/flink/runner/pom.xml b/runners/flink/runner/pom.xml
index 33fcda008e3b..ec3f501ef4b9 100644
--- a/runners/flink/runner/pom.xml
+++ b/runners/flink/runner/pom.xml
@@ -42,6 +42,9 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
             <executions>
+
+              <!-- This configures the inherited runnable-on-service-tests
+                   execution to execute with a local Flink instance. -->
               <execution>
                 <id>runnable-on-service-tests</id>
                 <phase>integration-test</phase>
@@ -59,6 +62,32 @@
                   </systemPropertyVariables>
                 </configuration>
               </execution>
+
+              <!-- This second execution runs the tests in streaming mode -->
+              <execution>
+                <id>streaming-runnable-on-service-tests</id>
+                <phase>integration-test</phase>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <configuration>
+                  <skip>true</skip>
+                  <groups>org.apache.beam.sdk.testing.RunnableOnService</groups>
+                  <parallel>none</parallel>
+                  <failIfNoTests>true</failIfNoTests>
+                  <dependenciesToScan>
+                    <dependency>org.apache.beam:beam-sdks-java-core</dependency>
+                  </dependenciesToScan>
+                  <systemPropertyVariables>
+                    <beamTestPipelineOptions>
+                      [
+                        "--runner=TestFlinkRunner",
+                        "--streaming=true"
+                      ]
+                    </beamTestPipelineOptions>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
             </executions>
           </plugin>
         </plugins>
@@ -225,34 +254,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>streaming-runnable-on-service-tests</id>
-            <phase>integration-test</phase>
-            <goals>
-              <goal>test</goal>
-            </goals>
-            <configuration>
-              <skip>true</skip>
-              <groups>org.apache.beam.sdk.testing.RunnableOnService</groups>
-              <parallel>none</parallel>
-              <failIfNoTests>true</failIfNoTests>
-              <dependenciesToScan>
-                <dependency>org.apache.beam:beam-sdks-java-core</dependency>
-              </dependenciesToScan>
-              <systemPropertyVariables>
-                <beamTestPipelineOptions>
-                  [
-                    "--runner=TestFlinkRunner",
-                    "--streaming=true"
-                  ]
-                </beamTestPipelineOptions>
-              </systemPropertyVariables>
-              <excludes>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
       </plugin>
 
     </plugins>