From 0ec76af32f4b3ebe3644d06e2634ba44ea4d3be5 Mon Sep 17 00:00:00 2001 From: Damon Date: Mon, 2 Dec 2024 07:55:39 -0800 Subject: [PATCH] Fix java validatesdistrolesscontainer dataflow workflow (#33245) * Set testJavaVersion in each run * Modify trigger file * Add dockerTag --- ...ommit_Java_ValidatesDistrolessContainer_Dataflow.json | 2 +- ...Commit_Java_ValidatesDistrolessContainer_Dataflow.yml | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/trigger_files/beam_PostCommit_Java_ValidatesDistrolessContainer_Dataflow.json b/.github/trigger_files/beam_PostCommit_Java_ValidatesDistrolessContainer_Dataflow.json index e3d6056a5de9..b26833333238 100644 --- a/.github/trigger_files/beam_PostCommit_Java_ValidatesDistrolessContainer_Dataflow.json +++ b/.github/trigger_files/beam_PostCommit_Java_ValidatesDistrolessContainer_Dataflow.json @@ -1,4 +1,4 @@ { "comment": "Modify this file in a trivial way to cause this test suite to run", - "modification": 1 + "modification": 2 } diff --git a/.github/workflows/beam_PostCommit_Java_ValidatesDistrolessContainer_Dataflow.yml b/.github/workflows/beam_PostCommit_Java_ValidatesDistrolessContainer_Dataflow.yml index 98b604be00e8..4fb236c7c991 100644 --- a/.github/workflows/beam_PostCommit_Java_ValidatesDistrolessContainer_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_Java_ValidatesDistrolessContainer_Dataflow.yml @@ -88,10 +88,17 @@ jobs: gcloud auth configure-docker us.gcr.io --quiet gcloud auth configure-docker gcr.io --quiet gcloud auth configure-docker us-central1-docker.pkg.dev --quiet - - name: run validatesDistrolessContainer script + - name: run validatesDistrolessContainer script (Java 17) uses: ./.github/actions/gradle-command-self-hosted-action with: gradle-command: :runners:google-cloud-dataflow-java:examplesJavaRunnerV2IntegrationTestDistroless + arguments: '-PtestJavaVersion=java17 -PdockerTag=$(date +%s)' + max-workers: 12 + - name: run validatesDistrolessContainer script (Java 21) + uses: ./.github/actions/gradle-command-self-hosted-action + with: + gradle-command: :runners:google-cloud-dataflow-java:examplesJavaRunnerV2IntegrationTestDistroless + arguments: '-PtestJavaVersion=java21 -PdockerTag=$(date +%s)' max-workers: 12 - name: Archive JUnit Test Results uses: actions/upload-artifact@v4