[beam] branch master updated: [BEAM-8321] fix Flink portable jar test

[ib...@apache.org]

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

ibzib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 5cf2029  [BEAM-8321] fix Flink portable jar test
     new 2534330  Merge pull request #9680 from ibzib/pipeline-jar-test
5cf2029 is described below

commit 5cf2029305817c8c4813c7c12dc8626118115713
Author: Kyle Weaver <kc...@google.com>
AuthorDate: Fri Sep 27 14:37:36 2019 -0700

    [BEAM-8321] fix Flink portable jar test
---
 runners/flink/job-server/flink_job_server.gradle |  3 ++-
 runners/flink/job-server/test_pipeline_jar.sh    | 11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/runners/flink/job-server/flink_job_server.gradle b/runners/flink/job-server/flink_job_server.gradle
index 3789007..e1e0dae 100644
--- a/runners/flink/job-server/flink_job_server.gradle
+++ b/runners/flink/job-server/flink_job_server.gradle
@@ -188,7 +188,8 @@ task testPipelineJar() {
         "--flink_job_server_jar ${shadowJar.archivePath}",
         "--env_dir ${project.rootProject.buildDir}/gradleenv/${project.path.hashCode()}",
         "--python_root_dir ${project.rootDir}/sdks/python",
-        "--python_version 3.5"
+        "--python_version 3.5",
+        "--python_container_image apachebeam/python3.5_sdk:${project['python_sdk_version']}",
       ]
       args "-c", "../../job-server/test_pipeline_jar.sh ${options.join(' ')}"
     }
diff --git a/runners/flink/job-server/test_pipeline_jar.sh b/runners/flink/job-server/test_pipeline_jar.sh
index c59facf..9db6b79 100755
--- a/runners/flink/job-server/test_pipeline_jar.sh
+++ b/runners/flink/job-server/test_pipeline_jar.sh
@@ -43,6 +43,11 @@ case $key in
         shift # past argument
         shift # past value
         ;;
+    --python_container_image)
+        PYTHON_CONTAINER_IMAGE="$2"
+        shift # past argument
+        shift # past value
+        ;;
     *)    # unknown option
         echo "Unknown option: $1"
         exit 1
@@ -57,10 +62,8 @@ cd $(git rev-parse --show-toplevel)
 command -v docker
 docker -v
 
-CONTAINER=$USER-docker-apache.bintray.io/beam/python$PYTHON_VERSION
-TAG=latest
 # Verify container has already been built
-docker images $CONTAINER:$TAG | grep $TAG
+docker images --format "{{.Repository}}:{{.Tag}}" | grep $PYTHON_CONTAINER_IMAGE
 
 # Set up Python environment
 virtualenv -p python$PYTHON_VERSION $ENV_DIR
@@ -102,7 +105,7 @@ OUTPUT_JAR=flink-test-$(date +%Y%m%d-%H%M%S).jar
   --parallelism 1 \
   --sdk_worker_parallelism 1 \
   --environment_type DOCKER \
-  --environment_config=$CONTAINER:$TAG \
+  --environment_config=$PYTHON_CONTAINER_IMAGE \
 ) || TEST_EXIT_CODE=$? # don't fail fast here; clean up before exiting
 
 if [[ "$TEST_EXIT_CODE" -eq 0 ]]; then