Repository: incubator-beam Updated Branches: refs/heads/master f17e7303a -> a87015bfe
Remove ParDoTest Suppression in Google Cloud Dataflow This reenables the lifecycle tests now that they are properly supported. Update the container image. Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/ddbfcdb6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/ddbfcdb6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/ddbfcdb6 Branch: refs/heads/master Commit: ddbfcdb6d36815e00c266be11d727135d75913f0 Parents: f17e730 Author: Thomas Groh <[email protected]> Authored: Tue Aug 23 14:44:53 2016 -0700 Committer: Dan Halperin <[email protected]> Committed: Wed Aug 24 09:58:46 2016 -0700 ---------------------------------------------------------------------- runners/google-cloud-dataflow-java/pom.xml | 11 ----------- .../org/apache/beam/runners/dataflow/DataflowRunner.java | 4 ++-- 2 files changed, 2 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ddbfcdb6/runners/google-cloud-dataflow-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml index 0044823..bf66f38 100644 --- a/runners/google-cloud-dataflow-java/pom.xml +++ b/runners/google-cloud-dataflow-java/pom.xml @@ -60,17 +60,6 @@ <beamUseDummyRunner>true</beamUseDummyRunner> </systemPropertyVariables> </configuration> - <executions> - <execution> - <id>runnable-on-service-tests</id> - <configuration> - <excludes> - <exclude>org/apache/beam/sdk/transforms/ParDoLifecycleTest.java</exclude> - <exclude>org/apache/beam/sdk/transforms/ParDoTest.java</exclude> - </excludes> - </configuration> - </execution> - </executions> </plugin> <!-- Run CheckStyle pass on transforms, as they are release in http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ddbfcdb6/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java index c4dd703..7f632a1 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java @@ -211,9 +211,9 @@ public class DataflowRunner extends PipelineRunner<DataflowPipelineJob> { // Default Docker container images that execute Dataflow worker harness, residing in Google // Container Registry, separately for Batch and Streaming. public static final String BATCH_WORKER_HARNESS_CONTAINER_IMAGE = - "dataflow.gcr.io/v1beta3/beam-java-batch:beam-master-20160810"; + "dataflow.gcr.io/v1beta3/beam-java-batch:beam-master-20160823"; public static final String STREAMING_WORKER_HARNESS_CONTAINER_IMAGE = - "dataflow.gcr.io/v1beta3/beam-java-streaming:beam-master-20160810"; + "dataflow.gcr.io/v1beta3/beam-java-streaming:beam-master-20160823"; // The limit of CreateJob request size. private static final int CREATE_JOB_REQUEST_LIMIT_BYTES = 10 * 1024 * 1024;
