You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by vt...@apache.org on 2025/12/08 16:21:49 UTC
(beam) branch cherrypick-37018 created (now 1b7195ce695)
This is an automated email from the ASF dual-hosted git repository.
vterentev pushed a change to branch cherrypick-37018
in repository https://gitbox.apache.org/repos/asf/beam.git
at 1b7195ce695 Cherrypick #37018 to release-2.70
This branch includes the following new commits:
new 1b7195ce695 Cherrypick #37018 to release-2.70
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(beam) 01/01: Cherrypick #37018 to release-2.70
Posted by vt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vterentev pushed a commit to branch cherrypick-37018
in repository https://gitbox.apache.org/repos/asf/beam.git
commit 1b7195ce6959b73b342c348e2c9d25306963dd39
Author: Vitaly Terentyev <vi...@akvelon.com>
AuthorDate: Mon Dec 8 20:21:35 2025 +0400
Cherrypick #37018 to release-2.70
---
.github/trigger_files/beam_PostCommit_Python_Xlang_Gcp_Dataflow.json | 2 +-
.github/trigger_files/beam_PostCommit_Python_Xlang_Gcp_Direct.json | 2 +-
sdks/python/apache_beam/io/gcp/tests/xlang_spannerio_it_test.py | 5 +++++
sdks/python/apache_beam/ml/rag/ingestion/spanner_it_test.py | 5 +++++
4 files changed, 12 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 99a8fc8ff6d..bb5da04014e 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": 14
+ "modification": 15
}
diff --git a/.github/trigger_files/beam_PostCommit_Python_Xlang_Gcp_Direct.json b/.github/trigger_files/beam_PostCommit_Python_Xlang_Gcp_Direct.json
index 99a8fc8ff6d..bb5da04014e 100644
--- a/.github/trigger_files/beam_PostCommit_Python_Xlang_Gcp_Direct.json
+++ b/.github/trigger_files/beam_PostCommit_Python_Xlang_Gcp_Direct.json
@@ -1,4 +1,4 @@
{
"comment": "Modify this file in a trivial way to cause this test suite to run",
- "modification": 14
+ "modification": 15
}
diff --git a/sdks/python/apache_beam/io/gcp/tests/xlang_spannerio_it_test.py b/sdks/python/apache_beam/io/gcp/tests/xlang_spannerio_it_test.py
index b5d5304245c..3fe56540847 100644
--- a/sdks/python/apache_beam/io/gcp/tests/xlang_spannerio_it_test.py
+++ b/sdks/python/apache_beam/io/gcp/tests/xlang_spannerio_it_test.py
@@ -103,6 +103,11 @@ class CrossLanguageSpannerIOTest(unittest.TestCase):
)
pipeline = TestPipeline(is_integration_test=True)
+
+ runner_name = type(pipeline.runner).__name__
+ if 'DataflowRunner' in runner_name:
+ pytest.skip("Spanner emulator not compatible with dataflow runner.")
+
argv = pipeline.get_full_options_as_args()
known_args, _ = parser.parse_known_args(argv)
diff --git a/sdks/python/apache_beam/ml/rag/ingestion/spanner_it_test.py b/sdks/python/apache_beam/ml/rag/ingestion/spanner_it_test.py
index ab9a982a81f..c371d6fd96b 100644
--- a/sdks/python/apache_beam/ml/rag/ingestion/spanner_it_test.py
+++ b/sdks/python/apache_beam/ml/rag/ingestion/spanner_it_test.py
@@ -138,6 +138,11 @@ class SpannerVectorWriterTest(unittest.TestCase):
@classmethod
def setUpClass(cls):
"""Set up Spanner emulator for all tests."""
+ pipeline = TestPipeline(is_integration_test=True)
+ runner_name = type(pipeline.runner).__name__
+ if 'DataflowRunner' in runner_name:
+ pytest.skip("Spanner emulator not compatible with dataflow runner.")
+
cls.project_id = 'test-project'
cls.instance_id = 'test-instance'
cls.table_name = 'embeddings'