From 822d57aa71d3d170bf543a712e76a2f06f898320 Mon Sep 17 00:00:00 2001 From: aIbrahiim Date: Thu, 11 Jun 2026 10:28:25 +0300 Subject: [PATCH 1/2] fix uv cache lock contention in parallel installGcpTest --- .../beam_PostCommit_Python_Xlang_Gcp_Dataflow.json | 2 +- .../trigger_files/beam_PostCommit_Python_Xlang_IO_Dataflow.json | 2 +- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/trigger_files/beam_PostCommit_Python_Xlang_Gcp_Dataflow.json b/.github/trigger_files/beam_PostCommit_Python_Xlang_Gcp_Dataflow.json index 83346d34aee0..c5309eebb070 100644 --- a/.github/trigger_files/beam_PostCommit_Python_Xlang_Gcp_Dataflow.json +++ b/.github/trigger_files/beam_PostCommit_Python_Xlang_Gcp_Dataflow.json @@ -1,4 +1,4 @@ { "comment": "Modify this file in a trivial way to cause this test suite to run", - "modification": 16 + "modification": 17 } diff --git a/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Dataflow.json b/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Dataflow.json index e3d6056a5de9..b26833333238 100644 --- a/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Dataflow.json +++ b/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Dataflow.json @@ -1,4 +1,4 @@ { "comment": "Modify this file in a trivial way to cause this test suite to run", - "modification": 1 + "modification": 2 } diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 0db2d1b27ab3..d6ffea3bae2e 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -3142,6 +3142,8 @@ class BeamModulePlugin implements Plugin { installTargets = "${distTarBall}[${packages},${extra}]" } project.exec { + // Per-project uv cache avoids sdist lock contention in parallel installGcpTest. + environment 'UV_CACHE_DIR', "${project.ext.envdir}/.uv-cache" executable 'sh' args '-c', ". ${project.ext.envdir}/bin/activate && pip install uv && uv pip install --pre ${installTargets}" } From e1002c24f034c174097f765a8c67fbf6e6d2cf7a Mon Sep 17 00:00:00 2001 From: aIbrahiim Date: Thu, 11 Jun 2026 14:10:45 +0300 Subject: [PATCH 2/2] use absolute path --- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index d6ffea3bae2e..c9b911747eac 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -3143,7 +3143,7 @@ class BeamModulePlugin implements Plugin { } project.exec { // Per-project uv cache avoids sdist lock contention in parallel installGcpTest. - environment 'UV_CACHE_DIR', "${project.ext.envdir}/.uv-cache" + environment 'UV_CACHE_DIR', project.file("${project.ext.envdir}/.uv-cache").absolutePath executable 'sh' args '-c', ". ${project.ext.envdir}/bin/activate && pip install uv && uv pip install --pre ${installTargets}" }