From 4c83dc96f16efc91e32ae49c03d9df7858191690 Mon Sep 17 00:00:00 2001 From: aIbrahiim Date: Tue, 9 Jun 2026 12:55:13 +0300 Subject: [PATCH 1/4] Fix Xlang IO Direct installGcpTest uv cache lock --- .../trigger_files/beam_PostCommit_Python_Xlang_IO_Direct.json | 2 +- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Direct.json b/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Direct.json index c537844dc84a..e0266d62f2e0 100644 --- a/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Direct.json +++ b/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Direct.json @@ -1,4 +1,4 @@ { "comment": "Modify this file in a trivial way to cause this test suite to run", - "modification": 3 + "modification": 4 } 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 bff5aee4f6a1..da3bbc84179b 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -3145,7 +3145,8 @@ class BeamModulePlugin implements Plugin { } project.exec { executable 'sh' - args '-c', ". ${project.ext.envdir}/bin/activate && pip install uv && uv pip install --pre ${installTargets}" + // uv times out on its cache lock when py310/py314 installGcpTest run in parallel. + args '-c', ". ${project.ext.envdir}/bin/activate && pip install --pre --retries 10 ${installTargets}" } } } From ef147156e073fac6cd60b093f05f46f998d9af42 Mon Sep 17 00:00:00 2001 From: aIbrahiim Date: Tue, 9 Jun 2026 14:26:46 +0300 Subject: [PATCH 2/4] use with per env cache dir --- .../beam_PostCommit_Python_Xlang_IO_Direct.json | 2 +- .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Direct.json b/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Direct.json index e0266d62f2e0..f1ba03a243ee 100644 --- a/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Direct.json +++ b/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Direct.json @@ -1,4 +1,4 @@ { "comment": "Modify this file in a trivial way to cause this test suite to run", - "modification": 4 + "modification": 5 } 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 da3bbc84179b..4494b1133016 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -3143,10 +3143,11 @@ class BeamModulePlugin implements Plugin { if (extra) { installTargets = "${distTarBall}[${packages},${extra}]" } + def uvCacheDir = "${project.ext.envdir}/.uv_cache" project.exec { executable 'sh' - // uv times out on its cache lock when py310/py314 installGcpTest run in parallel. - args '-c', ". ${project.ext.envdir}/bin/activate && pip install --pre --retries 10 ${installTargets}" + // Default uv cache is global; py310/py314 installGcpTest fight over the same lock. + args '-c', ". ${project.ext.envdir}/bin/activate && pip install uv && uv pip install --cache-dir ${uvCacheDir} --pre ${installTargets}" } } } From ea21f0d0a91a7283ead0437f83735dff750974ba Mon Sep 17 00:00:00 2001 From: aIbrahiim Date: Tue, 9 Jun 2026 20:55:51 +0300 Subject: [PATCH 3/4] Added quote paths --- .../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 4494b1133016..531bcf8eead2 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -3147,7 +3147,7 @@ class BeamModulePlugin implements Plugin { project.exec { executable 'sh' // Default uv cache is global; py310/py314 installGcpTest fight over the same lock. - args '-c', ". ${project.ext.envdir}/bin/activate && pip install uv && uv pip install --cache-dir ${uvCacheDir} --pre ${installTargets}" + args '-c', ". \"${project.ext.envdir}/bin/activate\" && pip install uv && uv pip install --cache-dir \"${uvCacheDir}\" --pre \"${installTargets}\"" } } } From 1edb558fd351c67db8aff7dbb2aa30c60cf2e8e2 Mon Sep 17 00:00:00 2001 From: aIbrahiim Date: Wed, 10 Jun 2026 11:30:30 +0300 Subject: [PATCH 4/4] test workflows --- .github/trigger_files/beam_PostCommit_Python.json | 2 +- .../trigger_files/beam_PostCommit_Python_Xlang_IO_Direct.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/trigger_files/beam_PostCommit_Python.json b/.github/trigger_files/beam_PostCommit_Python.json index 213813294758..def2ac984082 100644 --- a/.github/trigger_files/beam_PostCommit_Python.json +++ b/.github/trigger_files/beam_PostCommit_Python.json @@ -1,5 +1,5 @@ { "comment": "Modify this file in a trivial way to cause this test suite to run.", "pr": "38069", - "modification": 48 + "modification": 49 } diff --git a/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Direct.json b/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Direct.json index f1ba03a243ee..455144f02a35 100644 --- a/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Direct.json +++ b/.github/trigger_files/beam_PostCommit_Python_Xlang_IO_Direct.json @@ -1,4 +1,4 @@ { "comment": "Modify this file in a trivial way to cause this test suite to run", - "modification": 5 + "modification": 6 }