You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by al...@apache.org on 2019/03/11 20:03:27 UTC
[beam] branch master updated: Running Dataflow examples on windmill
service
This is an automated email from the ASF dual-hosted git repository.
altay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new e5394a3 Running Dataflow examples on windmill service
new d184d0e Merge pull request #7986 from pabloem/wm-precommit
e5394a3 is described below
commit e5394a34ff0ab302d73b61d9511130716f6ddd30
Author: pabloem <pa...@apache.org>
AuthorDate: Mon Mar 4 17:02:54 2019 -0800
Running Dataflow examples on windmill service
Excluding WordCount
---
.../examples-streaming/build.gradle | 29 +++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/runners/google-cloud-dataflow-java/examples-streaming/build.gradle b/runners/google-cloud-dataflow-java/examples-streaming/build.gradle
index 3cbb71c..c6c9136 100644
--- a/runners/google-cloud-dataflow-java/examples-streaming/build.gradle
+++ b/runners/google-cloud-dataflow-java/examples-streaming/build.gradle
@@ -35,7 +35,29 @@ dependencies {
def gcpProject = project.findProperty('gcpProject') ?: 'apache-beam-testing'
def gcsTempRoot = project.findProperty('gcsTempRoot') ?: 'gs://temp-storage-for-end-to-end-tests/'
-task preCommit(type: Test) {
+task windmillPreCommit(type: Test) {
+ dependsOn ":beam-runners-google-cloud-dataflow-java-legacy-worker:shadowJar"
+ def dataflowWorkerJar = project.findProperty('dataflowWorkerJar') ?: project(":beam-runners-google-cloud-dataflow-java-legacy-worker").shadowJar.archivePath
+
+ // Set workerHarnessContainerImage to empty to make Dataflow pick up the non-versioned container
+ // image, which handles a staged worker jar.
+ def preCommitBeamTestPipelineOptions = [
+ "--project=${gcpProject}",
+ "--tempRoot=${gcsTempRoot}",
+ "--runner=TestDataflowRunner",
+ "--dataflowWorkerJar=${dataflowWorkerJar}",
+ "--workerHarnessContainerImage=",
+ "--streaming=true",
+ "--enableStreamingEngine",
+ ]
+ testClassesDirs = files(project(":beam-examples-java").sourceSets.test.output.classesDirs)
+ include "**/WordCountIT.class"
+ forkEvery 1
+ maxParallelForks 4
+ systemProperty "beamTestPipelineOptions", JsonOutput.toJson(preCommitBeamTestPipelineOptions)
+}
+
+task appliancePreCommit(type: Test) {
dependsOn ":beam-runners-google-cloud-dataflow-java-legacy-worker:shadowJar"
def dataflowWorkerJar = project.findProperty('dataflowWorkerJar') ?: project(":beam-runners-google-cloud-dataflow-java-legacy-worker").shadowJar.archivePath
@@ -59,3 +81,8 @@ task preCommit(type: Test) {
systemProperty "beamTestPipelineOptions", JsonOutput.toJson(preCommitBeamTestPipelineOptions)
}
+task preCommit(type: Test) {
+ dependsOn appliancePreCommit
+ dependsOn windmillPreCommit
+}
+