From 7cf2e96bd8e19aa847f44b83e400da7643d5982e Mon Sep 17 00:00:00 2001 From: aibrahiim Date: Fri, 31 Jul 2026 17:22:51 +0300 Subject: [PATCH 1/2] use Java 17 harness --- .../beam_PostCommit_Python_Xlang_IO_Dataflow.json | 2 +- sdks/python/test-suites/dataflow/common.gradle | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Dataflow.json b/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Dataflow.json index b26833333238..c537844dc84a 100644 --- a/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Dataflow.json +++ b/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Dataflow.json @@ -1,4 +1,4 @@ { "comment": "Modify this file in a trivial way to cause this test suite to run", - "modification": 2 + "modification": 3 } diff --git a/sdks/python/test-suites/dataflow/common.gradle b/sdks/python/test-suites/dataflow/common.gradle index cbc79585a5f6..1589f0993c73 100644 --- a/sdks/python/test-suites/dataflow/common.gradle +++ b/sdks/python/test-suites/dataflow/common.gradle @@ -671,6 +671,8 @@ project.tasks.register("inferencePostCommitITPy312") { // Create cross-language tasks for running tests against Java expansion service(s) def gcpProject = project.findProperty('gcpProject') ?: 'apache-beam-testing' def gcpRegion = project.findProperty('gcpRegion') ?: 'us-central1' +// IcebergIO needs Java 17+ now; java11 here blows up the Dataflow harness. +def javaHarnessVersion = project.findProperty('testJavaVersion') ?: '17' project(":sdks:python:test-suites:xlang").ext.xlangTasks.each { taskMetadata -> createCrossLanguageUsingJavaExpansionTask( @@ -682,7 +684,7 @@ project(":sdks:python:test-suites:xlang").ext.xlangTasks.each { taskMetadata -> "--project=${gcpProject}", "--region=${gcpRegion}", "--sdk_container_image=gcr.io/apache-beam-testing/beam-sdk/beam_python${project.ext.pythonVersion}_sdk:latest", - "--sdk_harness_container_image_overrides=.*java.*,gcr.io/apache-beam-testing/beam-sdk/beam_java11_sdk:latest" + "--sdk_harness_container_image_overrides=.*java.*,gcr.io/apache-beam-testing/beam-sdk/beam_java${javaHarnessVersion}_sdk:latest" ], pytestOptions: basicPytestOpts, additionalDeps: taskMetadata.additionalDeps, From 9b9ec5561de5548a152396b9cb43db9d3aa82573 Mon Sep 17 00:00:00 2001 From: aibrahiim Date: Fri, 31 Jul 2026 17:39:07 +0300 Subject: [PATCH 2/2] update comment --- sdks/python/test-suites/dataflow/common.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/python/test-suites/dataflow/common.gradle b/sdks/python/test-suites/dataflow/common.gradle index 1589f0993c73..3bdbd4df41b6 100644 --- a/sdks/python/test-suites/dataflow/common.gradle +++ b/sdks/python/test-suites/dataflow/common.gradle @@ -671,7 +671,7 @@ project.tasks.register("inferencePostCommitITPy312") { // Create cross-language tasks for running tests against Java expansion service(s) def gcpProject = project.findProperty('gcpProject') ?: 'apache-beam-testing' def gcpRegion = project.findProperty('gcpRegion') ?: 'us-central1' -// IcebergIO needs Java 17+ now; java11 here blows up the Dataflow harness. +// Default to the minimum required Java version (currently bounded by IcebergIO which needs Java 17+) def javaHarnessVersion = project.findProperty('testJavaVersion') ?: '17' project(":sdks:python:test-suites:xlang").ext.xlangTasks.each { taskMetadata ->