From 46acb13a9056ecbf6032ca4741bcd0d6cd356ece Mon Sep 17 00:00:00 2001 From: Damon Douglas Date: Thu, 16 Jan 2025 21:09:33 -0800 Subject: [PATCH 1/3] Fix validatesDistrolessContainer --- sdks/python/test-suites/dataflow/common.gradle | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/sdks/python/test-suites/dataflow/common.gradle b/sdks/python/test-suites/dataflow/common.gradle index 0b02baa53488..89567391a674 100644 --- a/sdks/python/test-suites/dataflow/common.gradle +++ b/sdks/python/test-suites/dataflow/common.gradle @@ -381,22 +381,7 @@ task validatesContainer() { } task validatesDistrolessContainer() { - def pyversion = "${project.ext.pythonVersion.replace('.', '')}" - dependsOn ":sdks:python:container:distroless:py${pyversion}:dockerPush" - - def name = project.docker_image_default_repo_prefix + "python${project.ext.pythonVersion}_sdk_distroless" - - def root = project.rootProject.hasProperty(["docker-repository-root"]) ? - project.rootProject["docker-repository-root"] : - project.docker_image_default_repo_root - - def tag = project.rootProject.hasProperty(["docker-tag"]) ? - project.rootProject["docker-tag"] : project.sdk_version - - def imageURL = containerImageName( - name: name, - root: root, - tag: tag) + def imageURL = "gcr.io/apache-beam-testing/beam-sdk/beam_python${project.ext.pythonVersion}_sdk_distroless:${project.sdk_version}" doLast { exec { From 3c0090b5727ff4c18adcbbb7f6925262e45615ba Mon Sep 17 00:00:00 2001 From: Damon Douglas Date: Thu, 16 Jan 2025 22:04:37 -0800 Subject: [PATCH 2/3] Set java version --- .../workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml b/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml index df87c8cf05ec..12057d1c635f 100644 --- a/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml +++ b/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml @@ -79,6 +79,10 @@ jobs: with: gradle-command: :runners:google-cloud-dataflow-java:examplesJavaRunnerV2IntegrationTest max-workers: 12 + - name: Setup Java 17 environment + uses: ./.github/actions/setup-environment-action + with: + java_version: 17 - name: run PostCommit Java Distroless Examples Dataflow V2 script uses: ./.github/actions/gradle-command-self-hosted-action with: From 46ce54fdb19405b8fc6d9dcf3c12227976880e7b Mon Sep 17 00:00:00 2001 From: Damon Douglas Date: Thu, 16 Jan 2025 23:19:05 -0800 Subject: [PATCH 3/3] fix java-version --- .github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml b/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml index 12057d1c635f..894fe7d1b510 100644 --- a/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml +++ b/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml @@ -82,7 +82,7 @@ jobs: - name: Setup Java 17 environment uses: ./.github/actions/setup-environment-action with: - java_version: 17 + java-version: 17 - name: run PostCommit Java Distroless Examples Dataflow V2 script uses: ./.github/actions/gradle-command-self-hosted-action with: