Fix XVR test fail python docker (#29256)

apache · Nov 2, 2023 · bc29b96 · bc29b96
1 parent 9aeb4fe
commit bc29b96
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/sdks/java/container/common.gradle b/sdks/java/container/common.gradle
@@ -137,8 +137,8 @@ docker {
     dockerfile project.file("../Dockerfile")
     files "./build/"
     buildArgs([
-            'pull_licenses': project.rootProject.hasProperty(["docker-pull-licenses"]) ||
-                    project.rootProject.hasProperty(["isRelease"]),
+            'pull_licenses': project.rootProject.hasProperty("docker-pull-licenses") ||
+                    project.rootProject.hasProperty("isRelease"),
             'base_image': javaBaseImage,
             'java_version': imageJavaVersion,
     ])
@@ -148,8 +148,8 @@ docker {
     push pushContainers
 }
 
-if (project.rootProject.hasProperty(["docker-pull-licenses"]) ||
-        project.rootProject.hasProperty(["isRelease"])) {
+if (project.rootProject.hasProperty("docker-pull-licenses") ||
+        project.rootProject.hasProperty("isRelease")) {
     project.logger.lifecycle('docker-pull-licenses set, creating go-licenses')
     dockerPrepare.dependsOn copyJavaThirdPartyLicenses
     dockerPrepare.dependsOn copyGolangLicenses

diff --git a/sdks/python/container/common.gradle b/sdks/python/container/common.gradle
@@ -61,6 +61,10 @@ def copyLicenseScripts = tasks.register("copyLicenseScripts", Copy){
 def copyLauncherDependencies = tasks.register("copyLauncherDependencies", Copy) {
   from configurations.pythonHarnessLauncher
   into "build/target/launcher"
+
+  // Avoid seemingly gradle bug stated in https://github.com/apache/beam/issues/29220
+  mustRunAfter "copyLicenses"
+
   if(configurations.pythonHarnessLauncher.isEmpty()) {
       throw new StopExecutionException();
   }
@@ -93,7 +97,7 @@ dockerPrepare.dependsOn copyLauncherDependencies
 dockerPrepare.dependsOn copyDockerfileDependencies
 dockerPrepare.dependsOn copyLicenseScripts
 
-if (project.rootProject.hasProperty(["docker-pull-licenses"])) {
+if (project.rootProject.hasProperty("docker-pull-licenses")) {
   def copyGolangLicenses = tasks.register("copyGolangLicenses", Copy) {
     from "${project(':release:go-licenses:py').buildDir}/output"
     into "build/target/go-licenses"