Skip to content

Commit 0619156

Browse files
authored
use Java 17 harness (#39570)
* use Java 17 harness * update comment
1 parent 5c58b58 commit 0619156

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"comment": "Modify this file in a trivial way to cause this test suite to run",
3-
"modification": 2
3+
"modification": 3
44
}

sdks/python/test-suites/dataflow/common.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,8 @@ project.tasks.register("inferencePostCommitITPy312") {
671671
// Create cross-language tasks for running tests against Java expansion service(s)
672672
def gcpProject = project.findProperty('gcpProject') ?: 'apache-beam-testing'
673673
def gcpRegion = project.findProperty('gcpRegion') ?: 'us-central1'
674+
// Default to the minimum required Java version (currently bounded by IcebergIO which needs Java 17+)
675+
def javaHarnessVersion = project.findProperty('testJavaVersion') ?: '17'
674676

675677
project(":sdks:python:test-suites:xlang").ext.xlangTasks.each { taskMetadata ->
676678
createCrossLanguageUsingJavaExpansionTask(
@@ -682,7 +684,7 @@ project(":sdks:python:test-suites:xlang").ext.xlangTasks.each { taskMetadata ->
682684
"--project=${gcpProject}",
683685
"--region=${gcpRegion}",
684686
"--sdk_container_image=gcr.io/apache-beam-testing/beam-sdk/beam_python${project.ext.pythonVersion}_sdk:latest",
685-
"--sdk_harness_container_image_overrides=.*java.*,gcr.io/apache-beam-testing/beam-sdk/beam_java11_sdk:latest"
687+
"--sdk_harness_container_image_overrides=.*java.*,gcr.io/apache-beam-testing/beam-sdk/beam_java${javaHarnessVersion}_sdk:latest"
686688
],
687689
pytestOptions: basicPytestOpts,
688690
additionalDeps: taskMetadata.additionalDeps,

0 commit comments

Comments
 (0)