Add flags to build multiarch Python SDK containers and test

.github/workflows/beam_Python_ValidatesContainer_Dataflow_ARM.yml

@@ -117,7 +117,6 @@ jobs:
             -Ppush-containers
           env:
             MULTIARCH_TAG: ${{ env.MULTIARCH_TAG }}
-            ARCH: ARM
             USER: github-actions
       - name: Archive code coverage results
         uses: actions/upload-artifact@v3

sdks/python/container/run_validatescontainer.sh

@@ -34,8 +34,8 @@
 
 echo "This script must be executed in the root of beam project. Please set GCS_LOCATION, PROJECT and REGION as desired."
 
-if [[ $# != 2 ]]; then
-  printf "Usage: \n$> ./sdks/python/container/run_validatescontainer.sh <python_version> <sdk_location>"
+if [[ $# < 2 ]]; then
+  printf "Usage: \n$> ./sdks/python/container/run_validatescontainer.sh <python_version> <sdk_location> <optional_archtecture>"
   printf "\n\tpython_version: [required] Python version used for container build and run tests."
   printf " Sample value: 3.9"
   exit 1
@@ -53,6 +53,7 @@ REGION=${REGION:-us-central1}
 IMAGE_PREFIX="$(grep 'docker_image_default_repo_prefix' gradle.properties | cut -d'=' -f2)"
 SDK_VERSION="$(grep 'sdk_version' gradle.properties | cut -d'=' -f2)"
 PY_VERSION=$1
+ARCH=${3:-"x86"}
 IMAGE_NAME="${IMAGE_PREFIX}python${PY_VERSION}_sdk"
 CONTAINER_PROJECT="sdks:python:container:py${PY_VERSION//.}"  # Note: we substitute away the dot in the version.
 PY_INTERPRETER="python${PY_VERSION}"
@@ -74,7 +75,7 @@ CONTAINER=us.gcr.io/$PROJECT/$USER/$IMAGE_NAME
 PREBUILD_SDK_CONTAINER_REGISTRY_PATH=us.gcr.io/$PROJECT/$USER/prebuild_python${PY_VERSION//.}_sdk
 echo "Using container $CONTAINER"
 
-if [[ "$ARCH" != "ARM" ]]; then
+if [[ "$ARCH" == "x86" ]]; then
   # Verify docker image has been built.
   docker images | grep "apache/$IMAGE_NAME" | grep "$SDK_VERSION"
 

sdks/python/test-suites/dataflow/common.gradle

@@ -358,7 +358,8 @@ task validatesContainerARM() {
       executable 'sh'
       args '-c', ". ${envdir}/bin/activate && cd ${rootDir} && ${runScriptsPath} " +
               "${project.ext.pythonVersion} " +
-              "${project.ext.sdkLocation}"
+              "${project.ext.sdkLocation}" +
+              "ARM"
     }
   }
 }