Merge pull request apache#10378 [BEAM-8481] Fix a race condition in p…

…roto stubs generation.
mransley · Jan 10, 2020 · ba4dc72 · ba4dc72
2 parents 217afd5 + a9c2db2
commit ba4dc72
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -1807,15 +1807,17 @@ class BeamModulePlugin implements Plugin<Project> {
  // distribution tarball generated by :sdks:python:sdist.
  project.configurations { distTarBall }
 
- project.task('installGcpTest', dependsOn: 'setupVirtualenv') {
+ project.task('installGcpTest') {
+ dependsOn 'setupVirtualenv'
+ dependsOn ':sdks:python:sdist'
  doLast {
+ def distTarBall = "${pythonRootDir}/build/apache-beam.tar.gz"
  project.exec {
  executable 'sh'
- args '-c', ". ${project.ext.envdir}/bin/activate && pip install --retries 10 -e ${pythonRootDir}/[gcp,test]"
+ args '-c', ". ${project.ext.envdir}/bin/activate && pip install --retries 10 ${distTarBall}[gcp,test]"
  }
  }
  }
- project.installGcpTest.mustRunAfter project.configurations.distTarBall
 
  project.task('cleanPython') {
  doLast {
@@ -1938,6 +1940,8 @@ class BeamModulePlugin implements Plugin<Project> {
  "--parallelism=2",
  "--shutdown_sources_on_final_watermark",
  "--sdk_worker_parallelism=1",
+ "--flink_job_server_jar=${project.project(':runners:flink:1.9:job-server').shadowJar.archivePath}",
+ "--spark_job_server_jar=${project.project(':runners:spark:job-server').shadowJar.archivePath}",
  ]
  if (isStreaming)
  options += [