(beam) branch fix-distroless-workflows updated: Fix failed access to registry

[damondouglas]

This is an automated email from the ASF dual-hosted git repository.

damondouglas pushed a commit to branch fix-distroless-workflows
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/fix-distroless-workflows by 
this push:
     new 79fc349c74b Fix failed access to registry
79fc349c74b is described below

commit 79fc349c74b03aa5b55ac06ffee77e509fa65e11
Author: Damon Douglas <damondoug...@google.com>
AuthorDate: Thu Jan 16 18:10:05 2025 -0800

    Fix failed access to registry
---
 .../beam_PostCommit_Python_ValidatesContainer_Dataflow.yml     |  8 +++++++-
 sdks/python/container/distroless/common.gradle                 | 10 ++--------
 sdks/python/test-suites/dataflow/common.gradle                 |  7 +++++++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git 
a/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml 
b/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml
index 9077803aeb0..f5d78cdb95f 100644
--- a/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml
+++ b/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml
@@ -88,6 +88,7 @@ jobs:
           PY_VER_CLEAN=${PY_VER//.}
           echo "py_ver_clean=$PY_VER_CLEAN" >> $GITHUB_OUTPUT
       - name: Run validatesContainer script
+        if: false
         env:
           USER: github-actions
         uses: ./.github/actions/gradle-command-self-hosted-action
@@ -95,6 +96,10 @@ jobs:
           gradle-command: 
:sdks:python:test-suites:dataflow:py${{steps.set_py_ver_clean.outputs.py_ver_clean}}:validatesContainer
           arguments: |
             -PpythonVersion=${{ matrix.python_version }} \
+      - name: Find Beam Version
+        run: |
+          BEAM_VERSION_LINE=$(cat gradle.properties | grep "sdk_version")
+          echo "BEAM_VERSION=${BEAM_VERSION_LINE#*sdk_version=}" >> 
$GITHUB_ENV
       - name: Run validatesDistrolessContainer script
         env:
           USER: github-actions
@@ -102,7 +107,8 @@ jobs:
         with:
           gradle-command: 
:sdks:python:test-suites:dataflow:py${{steps.set_py_ver_clean.outputs.py_ver_clean}}:validatesDistrolessContainer
           arguments: |
-            -PpythonVersion=${{ matrix.python_version }}
+            -PpythonVersion=${{ matrix.python_version }} \
+            
-Pdocker-base-url=gcr.io/apache-beam-testing/beam-sdk/beam_python${{ 
matrix.python_version }}_sdk:${BEAM_VERSION}
       - name: Archive Python Test Results
         uses: actions/upload-artifact@v4
         if: failure()
diff --git a/sdks/python/container/distroless/common.gradle 
b/sdks/python/container/distroless/common.gradle
index 48dc9ab678d..d67696f3e18 100644
--- a/sdks/python/container/distroless/common.gradle
+++ b/sdks/python/container/distroless/common.gradle
@@ -29,10 +29,7 @@ def root = 
project.rootProject.hasProperty(["docker-repository-root"]) ?
 def tag = project.rootProject.hasProperty(["docker-tag"]) ?
                     project.rootProject["docker-tag"] : project.sdk_version
 
-def base = containerImageName(
-            name: base_name,
-            root: root,
-            tag: tag)
+def base = project.findProperty("docker-base-url")
 
 docker {
     name containerImageName(
@@ -47,7 +44,4 @@ docker {
     platform(*project.containerPlatforms())
     load project.useBuildx() && !pushContainers
     push pushContainers
-}
-
-dockerPrepare.dependsOn 
":sdks:python:container:py${pythonVersionSuffix}:docker"
-
+}
\ No newline at end of file
diff --git a/sdks/python/test-suites/dataflow/common.gradle 
b/sdks/python/test-suites/dataflow/common.gradle
index 0b02baa5348..9e0ea3e0310 100644
--- a/sdks/python/test-suites/dataflow/common.gradle
+++ b/sdks/python/test-suites/dataflow/common.gradle
@@ -380,8 +380,15 @@ task validatesContainer() {
   }
 }
 
+tasks.register("configureDocker") {
+  exec {
+    commandLine('gcloud', 'auth', 'configure-docker', 'us-docker.pkg.dev')
+  }
+}
+
 task validatesDistrolessContainer() {
   def pyversion = "${project.ext.pythonVersion.replace('.', '')}"
+  dependsOn ':configureDocker'
   dependsOn ":sdks:python:container:distroless:py${pyversion}:dockerPush"
 
   def name = project.docker_image_default_repo_prefix + 
"python${project.ext.pythonVersion}_sdk_distroless"