Repository: incubator-beam Updated Branches: refs/heads/master 119da4a82 -> 36720a62d
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. Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/ea8936b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/ea8936b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/ea8936b3 Branch: refs/heads/master Commit: ea8936b3365450ae323ce8358cc7645cdced54ad Parents: 07a313f Author: Kenneth Knowles <k...@google.com> Authored: Thu Jul 21 14:54:17 2016 -0700 Committer: Kenneth Knowles <k...@google.com> Committed: Thu Jul 28 21:10:43 2016 -0700 ---------------------------------------------------------------------- runners/flink/runner/pom.xml | 114 +++++++++++++++++++++----------------- 1 file changed, 63 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ea8936b3/runners/flink/runner/pom.xml ---------------------------------------------------------------------- diff --git a/runners/flink/runner/pom.xml b/runners/flink/runner/pom.xml index 1c522fc..ec3f501 100644 --- a/runners/flink/runner/pom.xml +++ b/runners/flink/runner/pom.xml @@ -32,6 +32,69 @@ <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> + + <!-- 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> + <goals> + <goal>test</goal> + </goals> + <configuration> + <systemPropertyVariables> + <beamTestPipelineOptions> + [ + "--runner=TestFlinkRunner", + "--streaming=false" + ] + </beamTestPipelineOptions> + </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> + </build> + </profile> + </profiles> + <dependencies> <!-- Flink dependencies --> <dependency> @@ -191,57 +254,6 @@ <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> - <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> - <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>