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 41e9520 [BEAM-9373] Spark/Flink tests fix string concat
new b9ca34d Merge pull request #10954 from ibzib/BEAM-9373
41e9520 is described below
commit 41e9520a95be1315d452824078835985d6b81256
Author: Kyle Weaver <[email protected]>
AuthorDate: Mon Feb 24 13:39:01 2020 -0800
[BEAM-9373] Spark/Flink tests fix string concat
---
runners/flink/job-server/flink_job_server.gradle | 4 ++--
runners/spark/job-server/build.gradle | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/runners/flink/job-server/flink_job_server.gradle
b/runners/flink/job-server/flink_job_server.gradle
index 534a10a..ff2c81e 100644
--- a/runners/flink/job-server/flink_job_server.gradle
+++ b/runners/flink/job-server/flink_job_server.gradle
@@ -220,7 +220,7 @@ def addTestJavaJarCreator(String pyVersion) {
"--python_root_dir ${project.rootDir}/sdks/python",
"--python_version ${pyVersion}",
"--python_container_image
${project.docker_image_default_repo_root}/"
- + ${project.docker_image_default_repo_prefix}
+ + "${project.docker_image_default_repo_prefix}"
+ "python${pyVersion}_sdk:${project.sdk_version}",
]
args "-c", "../../../portability/test_pipeline_jar.sh ${options.join('
')}"
@@ -264,7 +264,7 @@ def addTestFlinkUberJarPy(String pyVersion) {
"--python_root_dir ${project.rootDir}/sdks/python",
"--python_version ${pyVersion}",
"--python_container_image
${project.docker_image_default_repo_root}/"
- + ${project.docker_image_default_repo_prefix}
+ + "${project.docker_image_default_repo_prefix}"
+ "python${pyVersion}_sdk:${project.sdk_version}",
]
args "-c", "../../job-server/test_flink_uber_jar.sh ${options.join('
')}"
diff --git a/runners/spark/job-server/build.gradle
b/runners/spark/job-server/build.gradle
index b85fb77..478e9f9 100644
--- a/runners/spark/job-server/build.gradle
+++ b/runners/spark/job-server/build.gradle
@@ -166,7 +166,7 @@ def addTestJavaJarCreator(String pyVersion) {
"--python_root_dir ${project.rootDir}/sdks/python",
"--python_version ${pyVersion}",
"--python_container_image
${project.docker_image_default_repo_root}/"
- + ${project.docker_image_default_repo_prefix}
+ + "${project.docker_image_default_repo_prefix}"
+ "python${pyVersion}_sdk:${project.sdk_version}",
]
args "-c", "../../portability/test_pipeline_jar.sh ${options.join('
')}"