From 8971e201376af1e3037c0f2f3cfe517ae1729759 Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Tue, 3 Jun 2025 16:06:32 -0400 Subject: [PATCH 1/2] Fix tests affected by Java 8 container turn down --- .github/workflows/beam_PostCommit_Go_VR_Samza.yml | 2 -- runners/google-cloud-dataflow-java/build.gradle | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/beam_PostCommit_Go_VR_Samza.yml b/.github/workflows/beam_PostCommit_Go_VR_Samza.yml index 29a4f941adb4..ce7ce5b86001 100644 --- a/.github/workflows/beam_PostCommit_Go_VR_Samza.yml +++ b/.github/workflows/beam_PostCommit_Go_VR_Samza.yml @@ -73,8 +73,6 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action # TODO(https://github.com/apache/beam/issues/32208) move to Java11 after bump to Samza 1.8 - with: - java-version: 8 - name: run Go Samza ValidatesRunner script env: CLOUDSDK_CONFIG: ${{ env.KUBELET_GCLOUD_CONFIG_PATH}} diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle index 63125a68efb2..bc69bae4a942 100644 --- a/runners/google-cloud-dataflow-java/build.gradle +++ b/runners/google-cloud-dataflow-java/build.gradle @@ -346,10 +346,8 @@ tasks.register('buildAndPushDistrolessContainerImage', Task.class) { // task directly ('dependsOn buildAndPushDockerJavaContainer'). This ensures the correct // task ordering such that the registry doesn't get cleaned up prior to task completion. def buildAndPushDockerJavaContainer = tasks.register("buildAndPushDockerJavaContainer") { - def javaVer = getSupportedJavaVersion() - if(project.hasProperty('testJavaVersion')) { - javaVer = "java${project.getProperty('testJavaVersion')}" - } + def javaVer = getSupportedJavaVersion(project.findProperty('testJavaVersion') as String) + dependsOn ":sdks:java:container:${javaVer}:docker" def defaultDockerImageName = containerImageName( name: "${project.docker_image_default_repo_prefix}${javaVer}_sdk", From eb59efbe955c6c45218ca08b9bc88f2055d3eac8 Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Tue, 3 Jun 2025 16:36:43 -0400 Subject: [PATCH 2/2] still use Java 8 for Samza runner --- .github/workflows/beam_PostCommit_Go_VR_Samza.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/beam_PostCommit_Go_VR_Samza.yml b/.github/workflows/beam_PostCommit_Go_VR_Samza.yml index ce7ce5b86001..a056d13e3e8c 100644 --- a/.github/workflows/beam_PostCommit_Go_VR_Samza.yml +++ b/.github/workflows/beam_PostCommit_Go_VR_Samza.yml @@ -73,9 +73,13 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action # TODO(https://github.com/apache/beam/issues/32208) move to Java11 after bump to Samza 1.8 + with: + java-version: | + 11 + 8 - name: run Go Samza ValidatesRunner script env: CLOUDSDK_CONFIG: ${{ env.KUBELET_GCLOUD_CONFIG_PATH}} uses: ./.github/actions/gradle-command-self-hosted-action with: - gradle-command: :sdks:go:test:samzaValidatesRunner \ No newline at end of file + gradle-command: :sdks:go:test:samzaValidatesRunner -Pjava11Home=$JAVA_HOME_11_X64