Skip to content

Commit

Permalink
This closes #173
Browse files Browse the repository at this point in the history
  • Loading branch information
@davorbonaci
davorbonaci committed Apr 13, 2016
2 parents bc483c8 + c2bc479 commit 243ae86
Show file tree
Hide file tree
Showing 14 changed files with 537 additions and 485 deletions.
11 changes: 0 additions & 11 deletions examples/java/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,6 @@

<packaging>jar</packaging>

<profiles>
<profile>
<id>DataflowPipelineTests</id>
<properties>
<runIntegrationTestOnService>true</runIntegrationTestOnService>
<testGroups>com.google.cloud.dataflow.sdk.testing.RunnableOnService</testGroups>
<testParallelValue>both</testParallelValue>
</properties>
</profile>
</profiles>

<build>
<plugins>
<plugin>
Expand Down
11 changes: 0 additions & 11 deletions examples/java8/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,6 @@

<packaging>jar</packaging>

<profiles>
<profile>
<id>DataflowPipelineTests</id>
<properties>
<runIntegrationTestOnService>true</runIntegrationTestOnService>
<testGroups>com.google.cloud.dataflow.sdk.testing.RunnableOnService</testGroups>
<testParallelValue>both</testParallelValue>
</properties>
</profile>
</profiles>

<build>
<plugins>
<plugin>
Expand Down
7 changes: 0 additions & 7 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,13 +290,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<configuration>
<parallel>${testParallelValue}</parallel>
<threadCount>4</threadCount>
<groups>${testGroups}</groups>
<systemPropertyVariables>
<runIntegrationTestOnService>${runIntegrationTestOnService}</runIntegrationTestOnService>
<projectName>${dataflowProjectName}</projectName>
</systemPropertyVariables>
<useManifestOnlyJar>false</useManifestOnlyJar>
<trimStackTrace>false</trimStackTrace>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
Expand Down
25 changes: 25 additions & 0 deletions runners/flink/examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,31 @@
<parallelism>1</parallelism>
</properties>

<profiles>
<profile>
<id>disable-runnable-on-service-tests</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
<id>runnable-on-service-tests</id>
<configuration>
<skip>true</skip>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<dependencies>

<dependency>
Expand Down
24 changes: 24 additions & 0 deletions runners/flink/runner/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,30 @@

<packaging>jar</packaging>

<profiles>
<profile>
<id>disable-runnable-on-service-tests</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
<id>runnable-on-service-tests</id>
<configuration>
<skip>true</skip>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<dependencies>
<!-- Flink dependencies -->
Expand Down
48 changes: 30 additions & 18 deletions runners/google-cloud-dataflow-java/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,11 @@

<modelVersion>4.0.0</modelVersion>

<!-- We use the Beam parent to allow for runners/flink, examples/java and
sdks/java/maven-archetypes to depend on the Dataflow runner. This is
until those modules can migrate off of the Dataflow runner classes. -->
<parent>
<groupId>org.apache.beam</groupId>
<artifactId>parent</artifactId>
<version>0.1.0-incubating-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<groupId>org.apache.beam</groupId>
<artifactId>runners-parent</artifactId>
<version>0.1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>google-cloud-dataflow-java-runner</artifactId>
Expand All @@ -41,21 +38,36 @@
<beam.version>0.1.0-incubating-SNAPSHOT</beam.version>
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
<dataflow>com.google.cloud.dataflow</dataflow>
<runIntegrationTestOnService>false</runIntegrationTestOnService>
<testParallelValue>none</testParallelValue>
<testGroups></testGroups>
<dataflowProjectName></dataflowProjectName>
</properties>

<profiles>
<profile>
<id>DataflowPipelineTests</id>
<properties>
<runIntegrationTestOnService>true</runIntegrationTestOnService>
<testGroups>com.google.cloud.dataflow.sdk.testing.RunnableOnService</testGroups>
<testParallelValue>both</testParallelValue>
</properties>
<!-- This profile disables automatic execution of RunnableOnService
integration tests on Google Cloud Dataflow service. However,
the tests will be executed if runnableOnServicePipelineOptions
is specified. -->
<id>disable-runnable-on-service-tests</id>
<activation>
<property>
<name>!runnableOnServicePipelineOptions</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
<id>runnable-on-service-tests</id>
<configuration>
<skip>true</skip>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

Expand Down
30 changes: 30 additions & 0 deletions runners/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,34 @@
<module>spark</module>
</modules>

<build>
<pluginManagement>
<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>
<groups>com.google.cloud.dataflow.sdk.testing.RunnableOnService</groups>
<parallel>all</parallel>
<threadCount>4</threadCount>
<dependenciesToScan>
<dependency>org.apache.beam:java-sdk-all</dependency>
</dependenciesToScan>
<systemPropertyVariables>
<beamTestPipelineOptions>${runnableOnServicePipelineOptions}</beamTestPipelineOptions>
</systemPropertyVariables>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>

0 comments on commit 243ae86

Please sign in to comment.