From 09cad62932ce51cd505310644589b2a55860a5a7 Mon Sep 17 00:00:00 2001
From: Yi Hu <yathu@google.com>
Date: Thu, 17 Jul 2025 09:55:37 -0400
Subject: [PATCH] Fix Java version test for Legacy Dataflow

---
 ...mit_Java_ValidatesRunner_Dataflow_JavaVersions.json |  2 +-
 runners/google-cloud-dataflow-java/build.gradle        | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow_JavaVersions.json b/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow_JavaVersions.json
index b970762c8397..e3d6056a5de9 100644
--- a/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow_JavaVersions.json
+++ b/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow_JavaVersions.json
@@ -1,4 +1,4 @@
 {
   "comment": "Modify this file in a trivial way to cause this test suite to run",
-  "https://github.com/apache/beam/pull/31156": "noting that PR #31156 should run this test"
+  "modification": 1
 }
diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle
index 90d388b8bb68..3c2550be73ca 100644
--- a/runners/google-cloud-dataflow-java/build.gradle
+++ b/runners/google-cloud-dataflow-java/build.gradle
@@ -164,10 +164,16 @@ def legacyPipelineOptions = [
   "--region=${gcpRegion}",
   "--tempRoot=${dataflowValidatesTempRoot}",
   "--dataflowWorkerJar=${dataflowLegacyWorkerJar}",
-  "--workerHarnessContainerImage=",
   "--experiments=enable_lineage"
 ]
 
+// For the following test tasks using legacy worker, set workerHarnessContainerImage to empty to
+// make Dataflow pick up the non-versioned container image, which handles a staged worker jar,
+// unless testJavaVersion is specified, then the client picks up the current beam-master container.
+if (!project.hasProperty('testJavaVersion')) {
+  legacyPipelineOptions += ["--workerHarnessContainerImage="]
+}
+
 def runnerV2PipelineOptions = [
   "--runner=TestDataflowRunner",
   "--project=${gcpProject}",
@@ -209,8 +215,6 @@ def commonRunnerV2ExcludeCategories = [
         'org.apache.beam.sdk.testing.UsesBoundedTrieMetrics', // Dataflow QM as of now does not support returning back BoundedTrie in metric result.
 ]
 
-// For the following test tasks using legacy worker, set workerHarnessContainerImage to empty to
-// make Dataflow pick up the non-versioned container image, which handles a staged worker jar.
 def createLegacyWorkerValidatesRunnerTest = { Map args ->
   def name = args.name
   def pipelineOptions = args.pipelineOptions ?: legacyPipelineOptions