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 106ea5c [BEAM-9200] fix portable jar test version property
new bba735f Merge pull request #10703 from ibzib/py-version
106ea5c is described below
commit 106ea5c189c9bba6da3b0bf3e6512ade8ea4fbd4
Author: Kyle Weaver <[email protected]>
AuthorDate: Mon Jan 27 15:57:18 2020 -0800
[BEAM-9200] fix portable jar test version property
---
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 12b4d65..c72ef20 100644
--- a/runners/flink/job-server/flink_job_server.gradle
+++ b/runners/flink/job-server/flink_job_server.gradle
@@ -195,7 +195,7 @@ def addTestJavaJarCreator(String pyVersion) {
"--env_dir
${project.rootProject.buildDir}/gradleenv/${project.path.hashCode()}",
"--python_root_dir ${project.rootDir}/sdks/python",
"--python_version ${pyVersion}",
- "--python_container_image
apachebeam/python${pyVersion}_sdk:${project['python_sdk_version']}",
+ "--python_container_image
apachebeam/python${pyVersion}_sdk:${project.sdk_version}",
]
args "-c", "../../job-server/test_pipeline_jar.sh ${options.join(' ')}"
}
@@ -237,7 +237,7 @@ def addTestFlinkUberJarPy(String pyVersion) {
"--env_dir
${project.rootProject.buildDir}/gradleenv/${project.path.hashCode()}",
"--python_root_dir ${project.rootDir}/sdks/python",
"--python_version ${pyVersion}",
- "--python_container_image
apachebeam/python${pyVersion}_sdk:${project['python_sdk_version']}",
+ "--python_container_image
apachebeam/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 30dc24d..ce3944c 100644
--- a/runners/spark/job-server/build.gradle
+++ b/runners/spark/job-server/build.gradle
@@ -138,7 +138,7 @@ def addTestJavaJarCreator(String pyVersion) {
"--env_dir
${project.rootProject.buildDir}/gradleenv/${project.path.hashCode()}",
"--python_root_dir ${project.rootDir}/sdks/python",
"--python_version ${pyVersion}",
- "--python_container_image
apachebeam/python${pyVersion}_sdk:${project['python_sdk_version']}",
+ "--python_container_image
apachebeam/python${pyVersion}_sdk:${project.sdk_version}",
]
args "-c", "./test_spark_pipeline_jar.sh ${options.join(' ')}"
}