You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by am...@apache.org on 2020/03/09 17:37:07 UTC
[beam] branch release-2.20.0 updated: [BEAM-9413] fix
beam_PostCommit_Py_ValCon (#11023)
This is an automated email from the ASF dual-hosted git repository.
amaliujia pushed a commit to branch release-2.20.0
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/release-2.20.0 by this push:
new 3d6e516 [BEAM-9413] fix beam_PostCommit_Py_ValCon (#11023)
3d6e516 is described below
commit 3d6e516e93228d2733fd1dbbe7ea453b4163a435
Author: Hannah Jiang <Ha...@users.noreply.github.com>
AuthorDate: Tue Mar 3 16:01:24 2020 -0800
[BEAM-9413] fix beam_PostCommit_Py_ValCon (#11023)
---
sdks/python/container/run_validatescontainer.sh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/sdks/python/container/run_validatescontainer.sh b/sdks/python/container/run_validatescontainer.sh
index 216d617..39b1bc5 100755
--- a/sdks/python/container/run_validatescontainer.sh
+++ b/sdks/python/container/run_validatescontainer.sh
@@ -46,25 +46,26 @@ GCS_LOCATION=${GCS_LOCATION:-gs://temp-storage-for-end-to-end-tests}
# Project for the container and integration test
PROJECT=${PROJECT:-apache-beam-testing}
+IMAGE_PREFIX="$(grep 'docker_image_default_repo_prefix' gradle.properties | cut -d'=' -f2)"
# Other variables branched by Python version.
if [[ $1 == "python2" ]]; then
- IMAGE_NAME="python2.7_sdk" # Use this to create CONTAINER_IMAGE variable.
+ IMAGE_NAME="${IMAGE_PREFIX}python2.7_sdk" # Use this to create CONTAINER_IMAGE variable.
CONTAINER_PROJECT="sdks:python:container:py2" # Use this to build container by Gradle.
GRADLE_PY3_FLAG="" # Use this in Gradle command.
PY_INTERPRETER="python" # Use this in virtualenv command.
elif [[ $1 == "python35" ]]; then
- IMAGE_NAME="python3.5_sdk" # Use this to create CONTAINER_IMAGE variable.
+ IMAGE_NAME="${IMAGE_PREFIX}python3.5_sdk" # Use this to create CONTAINER_IMAGE variable.
CONTAINER_PROJECT="sdks:python:container:py35" # Use this to build container by Gradle.
GRADLE_PY3_FLAG="-Ppython3" # Use this in Gradle command.
PY_INTERPRETER="python3.5" # Use this in virtualenv command.
elif [[ $1 == "python36" ]]; then
- IMAGE_NAME="python3.6_sdk" # Use this to create CONTAINER_IMAGE variable.
+ IMAGE_NAME="${IMAGE_PREFIX}python3.6_sdk" # Use this to create CONTAINER_IMAGE variable.
CONTAINER_PROJECT="sdks:python:container:py36" # Use this to build container by Gradle.
GRADLE_PY3_FLAG="-Ppython3" # Use this in Gradle command.
PY_INTERPRETER="python3.6" # Use this in virtualenv command.
elif [[ $1 == "python37" ]]; then
- IMAGE_NAME="python3.7_sdk" # Use this to create CONTAINER_IMAGE variable.
+ IMAGE_NAME="${IMAGE_PREFIX}python3.7_sdk" # Use this to create CONTAINER_IMAGE variable.
CONTAINER_PROJECT="sdks:python:container:py37" # Use this to build container by Gradle.
GRADLE_PY3_FLAG="-Ppython3" # Use this in Gradle command.
PY_INTERPRETER="python3.7" # Use this in virtualenv command.