Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/trigger_files/beam_PostCommit_Python_Arm.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"comment": "Modify this file in a trivial way to cause this test suite to run",
"modification": 1
"modification": 4
}
3 changes: 0 additions & 3 deletions .github/workflows/beam_PostCommit_Python_Arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 11 additions & 5 deletions sdks/python/test-suites/dataflow/common.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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"
}
}
Expand Down
Loading