Skip to content

Fix https://github.com/apache/beam/actions/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml #30065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
damccorm wants to merge 7 commits into from
Closed

Fix https://github.com/apache/beam/actions/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml #30065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3aa902a
Fix https://github.com/apache/beam/actions/workflows/beam_PostCommit_…
damccorm Jan 22, 2024
cf89228
Fix version vars
damccorm Jan 22, 2024
511b312
Remove .
damccorm Jan 22, 2024
d9003bc
Undo bad fix
damccorm Jan 22, 2024
641af56
Push containers for tagging
damccorm Jan 22, 2024
b84a213
Dont need to push
damccorm Jan 22, 2024
8e4a3d9
Try pushing
damccorm Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,20 @@ jobs:
- name: GCloud Docker credential helper
run: |
gcloud auth configure-docker us.gcr.io
- name: Generate TAG unique variable based on timestamp
id: set_tag
run: echo "TAG=$(date +'%Y%m%d-%H%M%S%N')" >> $GITHUB_OUTPUT
- name: run XVR GoUsingJava Dataflow script
env:
USER: github-actions
CLOUDSDK_CONFIG: ${{ env.KUBELET_GCLOUD_CONFIG_PATH}}
uses: ./.github/actions/gradle-command-self-hosted-action
with:
gradle-command: :runners:google-cloud-dataflow-java:validatesCrossLanguageRunnerGoUsingJava
arguments: |
-Pdocker-repository-root=us.gcr.io/apache-beam-testing/github-actions \
-Pdocker-tag=${{ steps.set_tag.outputs.TAG }} \
-Ppush-containers \
- name: Archive JUnit Test Results
uses: actions/upload-artifact@v4
if: ${{ !success() }}
Expand Down
16 changes: 11 additions & 5 deletions runners/google-cloud-dataflow-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,12 @@ def buildAndPushDockerJavaContainer = tasks.register("buildAndPushDockerJavaCont
}
dependsOn ":sdks:java:container:${javaVer}:docker"
def defaultDockerImageName = containerImageName(
name: "${project.docker_image_default_repo_prefix}${javaVer}_sdk",
root: "apache",
tag: project.sdk_version)
name: "${project.docker_image_default_repo_prefix}java${javaVer}_sdk",
root: project.rootProject.hasProperty(["docker-repository-root"]) ?
project.rootProject["docker-repository-root"] :
project.docker_image_default_repo_root,
tag: project.rootProject.hasProperty(["docker-tag"]) ?
project.rootProject["docker-tag"] : project.sdk_version)
doLast {
exec {
commandLine "docker", "tag", "${defaultDockerImageName}", "${dockerJavaImageName}"
Expand Down Expand Up @@ -328,8 +331,11 @@ def buildAndPushDockerPythonContainer = tasks.create("buildAndPushDockerPythonCo
dependsOn ":sdks:python:container:py"+pythonVer.replace('.', '')+":docker"
def defaultDockerImageName = containerImageName(
name: "${project.docker_image_default_repo_prefix}python${pythonVer}_sdk",
root: "apache",
tag: project.sdk_version)
root: project.rootProject.hasProperty(["docker-repository-root"]) ?
project.rootProject["docker-repository-root"] :
project.docker_image_default_repo_root,
tag: project.rootProject.hasProperty(["docker-tag"]) ?
project.rootProject["docker-tag"] : project.sdk_version)
doLast {
exec {
commandLine "docker", "tag", "${defaultDockerImageName}", "${dockerPythonImageName}"
Expand Down