Repository: beam Updated Branches: refs/heads/master dabad1ae5 -> 53dd0a529
Register the TestDataflowRunner via registrar Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/eb043d06 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/eb043d06 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/eb043d06 Branch: refs/heads/master Commit: eb043d06df0da4a47d16047f1f050e41114ac424 Parents: 019d300 Author: Kenneth Knowles <[email protected]> Authored: Sat May 6 05:13:34 2017 -0700 Committer: Kenneth Knowles <[email protected]> Committed: Sat May 6 13:49:51 2017 -0700 ---------------------------------------------------------------------- .test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall.groovy | 2 +- .../job_beam_PostCommit_Java_ValidatesRunner_Dataflow.groovy | 2 +- .test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy | 2 +- examples/java/pom.xml | 4 ++-- .../apache/beam/runners/dataflow/DataflowPipelineRegistrar.java | 3 ++- .../beam/runners/dataflow/DataflowPipelineRegistrarTest.java | 2 +- .../src/main/java/org/apache/beam/sdk/testing/TestPipeline.java | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/eb043d06/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall.groovy ---------------------------------------------------------------------- diff --git a/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall.groovy b/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall.groovy index 51aedc3..2f05c38 100644 --- a/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall.groovy +++ b/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall.groovy @@ -44,5 +44,5 @@ mavenJob('beam_PostCommit_Java_MavenInstall') { 'Run Java PostCommit') // Maven goals for this job. - goals('-B -e -P release,dataflow-runner clean install coveralls:report -DrepoToken=$COVERALLS_REPO_TOKEN -DskipITs=false -DintegrationTestPipelineOptions=\'[ "--project=apache-beam-testing", "--tempRoot=gs://temp-storage-for-end-to-end-tests", "--runner=org.apache.beam.runners.dataflow.testing.TestDataflowRunner" ]\'') + goals('-B -e -P release,dataflow-runner clean install coveralls:report -DrepoToken=$COVERALLS_REPO_TOKEN -DskipITs=false -DintegrationTestPipelineOptions=\'[ "--project=apache-beam-testing", "--tempRoot=gs://temp-storage-for-end-to-end-tests", "--runner=TestDataflowRunner" ]\'') } http://git-wip-us.apache.org/repos/asf/beam/blob/eb043d06/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Dataflow.groovy ---------------------------------------------------------------------- diff --git a/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Dataflow.groovy b/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Dataflow.groovy index 33235ff..2c739e3 100644 --- a/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Dataflow.groovy +++ b/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Dataflow.groovy @@ -41,5 +41,5 @@ mavenJob('beam_PostCommit_Java_ValidatesRunner_Dataflow') { 'Run Dataflow ValidatesRunner') // Maven goals for this job. - goals('-B -e clean verify -am -pl runners/google-cloud-dataflow-java -DforkCount=0 -DvalidatesRunnerPipelineOptions=\'[ "--runner=org.apache.beam.runners.dataflow.testing.TestDataflowRunner", "--project=apache-beam-testing", "--tempRoot=gs://temp-storage-for-validates-runner-tests/" ]\'') + goals('-B -e clean verify -am -pl runners/google-cloud-dataflow-java -DforkCount=0 -DvalidatesRunnerPipelineOptions=\'[ "--runner=TestDataflowRunner", "--project=apache-beam-testing", "--tempRoot=gs://temp-storage-for-validates-runner-tests/" ]\'') } http://git-wip-us.apache.org/repos/asf/beam/blob/eb043d06/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy ---------------------------------------------------------------------- diff --git a/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy b/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy index f2c3ff0..7284acd 100644 --- a/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy +++ b/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy @@ -41,5 +41,5 @@ mavenJob('beam_Release_NightlySnapshot') { '[email protected]') // Maven goals for this job. - goals('-B -e clean deploy -P release,dataflow-runner -DskipITs=false -DintegrationTestPipelineOptions=\'[ "--project=apache-beam-testing", "--tempRoot=gs://temp-storage-for-end-to-end-tests", "--runner=org.apache.beam.runners.dataflow.testing.TestDataflowRunner" ]\'') + goals('-B -e clean deploy -P release,dataflow-runner -DskipITs=false -DintegrationTestPipelineOptions=\'[ "--project=apache-beam-testing", "--tempRoot=gs://temp-storage-for-end-to-end-tests", "--runner=TestDataflowRunner" ]\'') } http://git-wip-us.apache.org/repos/asf/beam/blob/eb043d06/examples/java/pom.xml ---------------------------------------------------------------------- diff --git a/examples/java/pom.xml b/examples/java/pom.xml index a6ef5d1..21096f7 100644 --- a/examples/java/pom.xml +++ b/examples/java/pom.xml @@ -263,7 +263,7 @@ [ "--project=apache-beam-testing", "--tempRoot=gs://temp-storage-for-end-to-end-tests", - "--runner=org.apache.beam.runners.dataflow.testing.TestDataflowRunner" + "--runner=TestDataflowRunner" ] </beamTestPipelineOptions> </systemPropertyVariables> @@ -287,7 +287,7 @@ [ "--project=apache-beam-testing", "--tempRoot=gs://temp-storage-for-end-to-end-tests", - "--runner=org.apache.beam.runners.dataflow.testing.TestDataflowRunner", + "--runner=TestDataflowRunner", "--streaming=true" ] </beamTestPipelineOptions> http://git-wip-us.apache.org/repos/asf/beam/blob/eb043d06/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineRegistrar.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineRegistrar.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineRegistrar.java index b6802bb..f36930f 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineRegistrar.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineRegistrar.java @@ -20,6 +20,7 @@ package org.apache.beam.runners.dataflow; import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableList; import org.apache.beam.runners.dataflow.options.DataflowPipelineOptions; +import org.apache.beam.runners.dataflow.testing.TestDataflowRunner; import org.apache.beam.sdk.PipelineRunner; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsRegistrar; @@ -52,7 +53,7 @@ public class DataflowPipelineRegistrar { @Override public Iterable<Class<? extends PipelineRunner<?>>> getPipelineRunners() { return ImmutableList.<Class<? extends PipelineRunner<?>>>of( - DataflowRunner.class); + DataflowRunner.class, TestDataflowRunner.class); } } } http://git-wip-us.apache.org/repos/asf/beam/blob/eb043d06/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineRegistrarTest.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineRegistrarTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineRegistrarTest.java index 31f9281..728fc71 100644 --- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineRegistrarTest.java +++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineRegistrarTest.java @@ -41,7 +41,7 @@ public class DataflowPipelineRegistrarTest { @Test public void testCorrectRunnersAreReturned() { - assertEquals(ImmutableList.of(DataflowRunner.class), + assertEquals(ImmutableList.of(DataflowRunner.class, TestDataflowRunner.class), new DataflowPipelineRegistrar.Runner().getPipelineRunners()); } http://git-wip-us.apache.org/repos/asf/beam/blob/eb043d06/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/TestPipeline.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/TestPipeline.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/TestPipeline.java index 96cae51..e04c2f8 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/TestPipeline.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/TestPipeline.java @@ -72,7 +72,7 @@ import org.junit.runners.model.Statement; * <li>System property "beamTestPipelineOptions" must contain a JSON delimited list of pipeline * options. For example: * <pre>{@code [ - * "--runner=org.apache.beam.runners.dataflow.testing.TestDataflowRunner", + * "--runner=TestDataflowRunner", * "--project=mygcpproject", * "--stagingLocation=gs://mygcsbucket/path" * ]}</pre>
