This is an automated email from the ASF dual-hosted git repository.
yhu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new dbcb710fdff Fix PostCommit Java Examples Dataflow V2 workflow (#35015)
dbcb710fdff is described below
commit dbcb710fdff1820183640f6e3de00fefcb0347fa
Author: akashorabek <[email protected]>
AuthorDate: Wed May 21 19:24:59 2025 +0500
Fix PostCommit Java Examples Dataflow V2 workflow (#35015)
* Fix PostCommit Java Examples Dataflow V2 workflow
* Remove unnecessary DOCKER_TAG declaration
---
.../beam_PostCommit_Java_Examples_Dataflow_V2.yml | 18 ++++++++++++++----
runners/google-cloud-dataflow-java/build.gradle | 2 +-
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml
b/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml
index c657cd380a0..03f34e96c58 100644
--- a/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml
+++ b/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml
@@ -83,15 +83,25 @@ jobs:
uses: ./.github/actions/setup-environment-action
with:
java-version: 17
+ - name: Set DOCKER_TAG unique variable based on timestamp
+ run: echo "DOCKER_TAG=$(date +'%Y%m%d-%H%M%S%N')" >> $GITHUB_ENV
+ - name: GCloud Docker credential helper
+ run: |
+ gcloud auth configure-docker us.gcr.io
- name: run PostCommit Java Distroless Examples Dataflow V2 script
uses: ./.github/actions/gradle-command-self-hosted-action
+ env:
+ USER: github-actions
with:
gradle-command:
:runners:google-cloud-dataflow-java:examplesJavaRunnerV2IntegrationTestDistroless
max-workers: 12
- arguments:
- -PskipCheckerFramework
- -PtestJavaVersion=17
- -Pjava17Home=$JAVA_HOME_17_X64
+ arguments: |
+ -PdisableSpotlessCheck=true \
+ -PdisableCheckStyle=true \
+ -PskipCheckerFramework \
+ -PtestJavaVersion=java17 \
+ -Pjava17Home=$JAVA_HOME_17_X64 \
+ -PdockerTag=${{ env.DOCKER_TAG }} \
- name: Archive JUnit Test Results
uses: actions/upload-artifact@v4
if: ${{ !success() }}
diff --git a/runners/google-cloud-dataflow-java/build.gradle
b/runners/google-cloud-dataflow-java/build.gradle
index d4ce1aedf31..3aa1713fb6e 100644
--- a/runners/google-cloud-dataflow-java/build.gradle
+++ b/runners/google-cloud-dataflow-java/build.gradle
@@ -329,7 +329,7 @@ tasks.register('buildAndPushDistrolessContainerImage',
Task.class) {
'-t',
imageURL,
'-f',
- 'sdks/java/container/Dockerfile-distroless',
+ 'sdks/java/container/distroless/Dockerfile',
"--build-arg=BEAM_BASE=gcr.io/apache-beam-testing/beam-sdk/beam_${javaVer}_sdk",
"--build-arg=DISTROLESS_BASE=gcr.io/distroless/${javaVer}-debian12",
'.'
