Merge pull request #35181: Use staged SDK harness & Dataflow worker jar in JPMS tests

kennknowles · web-flow · commit c37785b18d5e · 2025-06-06T13:01:22.000-04:00
diff --git a/.github/trigger_files/beam_PostCommit_Java_Jpms_Dataflow_Java11.json b/.github/trigger_files/beam_PostCommit_Java_Jpms_Dataflow_Java11.json
@@ -0,0 +1,3 @@
+{
+  "0": "testing with staged SDK harness/worker jar"
+}
diff --git a/sdks/java/testing/jpms-tests/build.gradle b/sdks/java/testing/jpms-tests/build.gradle
@@ -64,6 +64,7 @@ dependencies {
   directRunnerIntegrationTest project(":runners:direct-java")
   flinkRunnerIntegrationTest project(":runners:flink:${project.ext.latestFlinkVersion}")
   dataflowRunnerIntegrationTest project(":runners:google-cloud-dataflow-java")
+  dataflowRunnerIntegrationTest project(":sdks:java:harness") // for staging locally built harness jar
   sparkRunnerIntegrationTest project(":runners:spark:3")
 }
 
@@ -84,6 +85,7 @@ for (String runner : testRunnerClass.keySet()) {
     ]
     if ("dataflowRunnerIntegrationTest".equals(runner)) {
       testPipelineOptions.add("--region=${gcpRegion}")
+      testPipelineOptions.add("--experiments=use_staged_dataflow_worker_jar")
     }
     classpath = configurations."${runner}"
     include "**/*IT.class"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "0": "testing with staged SDK harness/worker jar"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ dependencies {`
`64`	`64`	`directRunnerIntegrationTest project(":runners:direct-java")`
`65`	`65`	`flinkRunnerIntegrationTest project(":runners:flink:${project.ext.latestFlinkVersion}")`
`66`	`66`	`dataflowRunnerIntegrationTest project(":runners:google-cloud-dataflow-java")`
	`67`	`+ dataflowRunnerIntegrationTest project(":sdks:java:harness") // for staging locally built harness jar`
`67`	`68`	`sparkRunnerIntegrationTest project(":runners:spark:3")`
`68`	`69`	`}`
`69`	`70`
`@@ -84,6 +85,7 @@ for (String runner : testRunnerClass.keySet()) {`
`84`	`85`	`]`
`85`	`86`	`if ("dataflowRunnerIntegrationTest".equals(runner)) {`
`86`	`87`	`testPipelineOptions.add("--region=${gcpRegion}")`
	`88`	`+ testPipelineOptions.add("--experiments=use_staged_dataflow_worker_jar")`
`87`	`89`	`}`
`88`	`90`	`classpath = configurations."${runner}"`
`89`	`91`	`include "*/IT.class"`