Skip to content

Commit ab83d6e

Browse files
akashorabekchangliiu
authored andcommitted
Fix PostCommit Java Examples Dataflow V2 workflow (apache#35015)
* Fix PostCommit Java Examples Dataflow V2 workflow * Remove unnecessary DOCKER_TAG declaration
1 parent bd45d10 commit ab83d6e

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,25 @@ jobs:
8383
uses: ./.github/actions/setup-environment-action
8484
with:
8585
java-version: 17
86+
- name: Set DOCKER_TAG unique variable based on timestamp
87+
run: echo "DOCKER_TAG=$(date +'%Y%m%d-%H%M%S%N')" >> $GITHUB_ENV
88+
- name: GCloud Docker credential helper
89+
run: |
90+
gcloud auth configure-docker us.gcr.io
8691
- name: run PostCommit Java Distroless Examples Dataflow V2 script
8792
uses: ./.github/actions/gradle-command-self-hosted-action
93+
env:
94+
USER: github-actions
8895
with:
8996
gradle-command: :runners:google-cloud-dataflow-java:examplesJavaRunnerV2IntegrationTestDistroless
9097
max-workers: 12
91-
arguments:
92-
-PskipCheckerFramework
93-
-PtestJavaVersion=17
94-
-Pjava17Home=$JAVA_HOME_17_X64
98+
arguments: |
99+
-PdisableSpotlessCheck=true \
100+
-PdisableCheckStyle=true \
101+
-PskipCheckerFramework \
102+
-PtestJavaVersion=java17 \
103+
-Pjava17Home=$JAVA_HOME_17_X64 \
104+
-PdockerTag=${{ env.DOCKER_TAG }} \
95105
- name: Archive JUnit Test Results
96106
uses: actions/upload-artifact@v4
97107
if: ${{ !success() }}

runners/google-cloud-dataflow-java/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ tasks.register('buildAndPushDistrolessContainerImage', Task.class) {
329329
'-t',
330330
imageURL,
331331
'-f',
332-
'sdks/java/container/Dockerfile-distroless',
332+
'sdks/java/container/distroless/Dockerfile',
333333
"--build-arg=BEAM_BASE=gcr.io/apache-beam-testing/beam-sdk/beam_${javaVer}_sdk",
334334
"--build-arg=DISTROLESS_BASE=gcr.io/distroless/${javaVer}-debian12",
335335
'.'

0 commit comments

Comments
 (0)