From 46649673b6f0736070022840bb9ee6ee12cb46ec Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Thu, 5 Jun 2025 14:17:20 -0400 Subject: [PATCH] Fix beam_PostCommit_Java_Examples_Dataflow_V2 --- .../beam_PostCommit_Java_Examples_Dataflow_V2.yml | 8 ++++---- runners/google-cloud-dataflow-java/build.gradle | 9 +++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml b/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml index 03f34e96c58e..ab7ea4063cf8 100644 --- a/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml +++ b/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml @@ -77,8 +77,8 @@ jobs: - name: run PostCommit Java Examples Dataflow V2 script uses: ./.github/actions/gradle-command-self-hosted-action with: - gradle-command: :runners:google-cloud-dataflow-java:examplesJavaRunnerV2IntegrationTest - max-workers: 12 + gradle-command: :runners:google-cloud-dataflow-java:examplesJavaRunnerV2IntegrationTest + max-workers: 12 - name: Setup Java 17 environment uses: ./.github/actions/setup-environment-action with: @@ -99,7 +99,7 @@ jobs: -PdisableSpotlessCheck=true \ -PdisableCheckStyle=true \ -PskipCheckerFramework \ - -PtestJavaVersion=java17 \ + -PtestJavaVersion=17 \ -Pjava17Home=$JAVA_HOME_17_X64 \ -PdockerTag=${{ env.DOCKER_TAG }} \ - name: Archive JUnit Test Results @@ -115,4 +115,4 @@ jobs: commit: '${{ env.prsha || env.GITHUB_SHA }}' comment_mode: ${{ github.event_name == 'issue_comment' && 'always' || 'off' }} files: '**/build/test-results/**/*.xml' - large_files: true \ No newline at end of file + large_files: true diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle index bc69bae4a942..912bf6c29439 100644 --- a/runners/google-cloud-dataflow-java/build.gradle +++ b/runners/google-cloud-dataflow-java/build.gradle @@ -281,7 +281,7 @@ def createRunnerV2ValidatesRunnerTest = { Map args -> tasks.register('examplesJavaRunnerV2IntegrationTestDistroless', Test.class) { group = "verification" dependsOn 'buildAndPushDistrolessContainerImage' - def javaVer = project.findProperty('testJavaVersion') + def javaVer = getSupportedJavaVersion(project.findProperty('testJavaVersion') as String) def repository = "us.gcr.io/apache-beam-testing/${System.getenv('USER')}" def tag = project.findProperty('dockerTag') def imageURL = "${repository}/beam_${javaVer}_sdk_distroless:${tag}" @@ -309,7 +309,7 @@ tasks.register('buildAndPushDistrolessContainerImage', Task.class) { // See https://github.com/GoogleContainerTools/distroless/tree/main/java#image-contents. def allowed = ["java17", "java21"] doLast { - def javaVer = project.findProperty('testJavaVersion') + def javaVer = getSupportedJavaVersion(project.findProperty('testJavaVersion') as String) if (!allowed.contains(javaVer)) { throw new GradleException("testJavaVersion must be one of ${allowed}, got: ${javaVer}") } @@ -837,10 +837,7 @@ task GCSUpload(type: JavaExec) { } def buildAndPushDistrolessDockerJavaContainer = tasks.register("buildAndPushDistrolessDockerJavaContainer") { - def javaVer = getSupportedJavaVersion() - if(project.hasProperty('testJavaVersion')) { - javaVer = "java${project.getProperty('testJavaVersion')}" - } + def javaVer = getSupportedJavaVersion(project.findProperty('testJavaVersion') as String) dependsOn ":sdks:java:container:distroless:${javaVer}:docker" def defaultDockerImageName = containerImageName( name: "${project.docker_image_default_repo_prefix}${javaVer}_sdk_distroless",