This is an automated email from the ASF dual-hosted git repository.
Abacn 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 1fca1c2d371 prevent cloudML TFT extras from replacing the SDK under
test (#39884)
1fca1c2d371 is described below
commit 1fca1c2d371bda7a04cda38b0b0789669ef098d6
Author: Abdelrahman Ibrahim <[email protected]>
AuthorDate: Wed Aug 26 21:19:23 2026 +0300
prevent cloudML TFT extras from replacing the SDK under test (#39884)
---
.github/trigger_files/beam_CloudML_Benchmarks_Dataflow.json | 2 +-
sdks/python/test-suites/dataflow/common.gradle | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.github/trigger_files/beam_CloudML_Benchmarks_Dataflow.json
b/.github/trigger_files/beam_CloudML_Benchmarks_Dataflow.json
index 37dd25bf902..34a6e02150e 100644
--- a/.github/trigger_files/beam_CloudML_Benchmarks_Dataflow.json
+++ b/.github/trigger_files/beam_CloudML_Benchmarks_Dataflow.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/sdks/python/test-suites/dataflow/common.gradle
b/sdks/python/test-suites/dataflow/common.gradle
index 3bdbd4df41b..abe7867181e 100644
--- a/sdks/python/test-suites/dataflow/common.gradle
+++ b/sdks/python/test-suites/dataflow/common.gradle
@@ -592,10 +592,12 @@ task anthropicInferenceTest {
task installTFTRequirements {
dependsOn 'initializeForDataflowJob'
doLast {
+ // Keep the SDK under test: TFT requirements can pull a different Beam
from PyPI.
+ def sdk = project.ext.sdkLocation
exec {
workingDir
"$rootProject.projectDir/sdks/python/apache_beam/testing/benchmarks/cloudml/"
executable 'sh'
- args '-c', ". ${envdir}/bin/activate && pip install -r requirements.txt"
+ args '-c', ". ${envdir}/bin/activate && pip install -r requirements.txt
&& pip install --force-reinstall --no-deps '${sdk}[gcp]'"
}
}
}
@@ -607,6 +609,8 @@ task tftTests {
doLast {
def opts = project.findProperty('opts')
opts += " --sdk_location=${project.ext.sdkLocation}"
+ // Reinstall the staged SDK after requirements on workers (runs after
requirements install).
+ opts += " --extra_package=${project.ext.sdkLocation}"
def testOpts = basicPytestOpts + ["--numprocesses=8", "--dist=loadfile"]
def argMap = [
"test_opts": testOpts,
