This is an automated email from the ASF dual-hosted git repository. Amar3tto pushed a commit to branch test-python-arm-4-sep in repository https://gitbox.apache.org/repos/asf/beam.git
commit d6d11260a66fd3c40391a8e3fd4b0c2c8828add3 Author: Vitaly Terentyev <[email protected]> AuthorDate: Fri Sep 4 16:52:44 2026 +0400 SDK_CONTAINER_IMAGE --- .github/workflows/beam_PostCommit_Python_Arm.yml | 5 +---- sdks/python/test-suites/dataflow/common.gradle | 16 +++++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/beam_PostCommit_Python_Arm.yml b/.github/workflows/beam_PostCommit_Python_Arm.yml index acefdcc44a9..aa946dd797d 100644 --- a/.github/workflows/beam_PostCommit_Python_Arm.yml +++ b/.github/workflows/beam_PostCommit_Python_Arm.yml @@ -56,7 +56,7 @@ jobs: runs-on: [self-hosted, ubuntu-24.04, main] # Python ARM PostCommit uses prebuilt Snapshots SDK images, so it no longer # spends hours on multiarch container builds. Keep headroom for the IT suite. - timeout-minutes: 180 + timeout-minutes: 360 strategy: fail-fast: false matrix: @@ -105,12 +105,9 @@ jobs: with: gradle-command: :sdks:python:test-suites:dataflow:py${{steps.set_py_ver_clean.outputs.py_ver_clean}}:postCommitArmIT arguments: | - -PuseWheelDistribution \ -PpythonVersion=${{ matrix.python_version }} \ -PusePrebuiltSdkContainer \ env: - # Use multiarch images published by Publish Beam SDK Snapshots. - SDK_CONTAINER_IMAGE: gcr.io/apache-beam-testing/beam-sdk/beam_python${{ matrix.python_version }}_sdk:latest USER: github-actions - name: Archive Python Test Results uses: actions/upload-artifact@v7 diff --git a/sdks/python/test-suites/dataflow/common.gradle b/sdks/python/test-suites/dataflow/common.gradle index abe7867181e..e998ffe0699 100644 --- a/sdks/python/test-suites/dataflow/common.gradle +++ b/sdks/python/test-suites/dataflow/common.gradle @@ -145,20 +145,22 @@ task postCommitIT { task postCommitArmIT { def pyversion = "${project.ext.pythonVersion.replace('.', '')}" - dependsOn 'initializeForDataflowJob' // When -PusePrebuiltSdkContainer is set, skip building/pushing a multiarch - // SDK image and use SDK_CONTAINER_IMAGE from the environment instead (e.g. - // gcr.io/apache-beam-testing/beam-sdk/beam_python3.x_sdk:latest from Snapshots). + // SDK image and use SDK_CONTAINER_IMAGE from the environment instead. def usePrebuiltSdkContainer = project.rootProject.hasProperty(['usePrebuiltSdkContainer']) - if (!usePrebuiltSdkContainer) { + if (usePrebuiltSdkContainer) { + dependsOn 'installGcpTest' + } else { + dependsOn 'initializeForDataflowJob' dependsOn ":sdks:python:container:py${pyversion}:docker" } doLast { def testOpts = basicPytestOpts + ["--numprocesses=8", "--dist=loadfile"] + def sdkLocation = usePrebuiltSdkContainer ? 'container' : project.ext.sdkLocation def argMap = [ "test_opts": testOpts, - "sdk_location": project.ext.sdkLocation, + "sdk_location": sdkLocation, "suite": "postCommitIT-df${pythonVersionSuffix}", "collect": "it_postcommit", "py_version": project.ext.pythonVersion, @@ -167,6 +169,10 @@ task postCommitArmIT { def cmdArgs = mapToArgString(argMap) exec { executable 'sh' + if (usePrebuiltSdkContainer) { + environment 'SDK_CONTAINER_IMAGE', + "gcr.io/apache-beam-testing/beam-sdk/beam_python${project.ext.pythonVersion}_sdk:${project.sdk_version}" + } args '-c', ". ${envdir}/bin/activate && ${runScriptsDir}/run_integration_test.sh $cmdArgs" } }
