Merge pull request #28658: [release-2.51.0] Cherrypick #28571 to release branch.

kennknowles · web-flow · commit 34ff286c2b3b · 2023-09-26T11:54:41.000-04:00
diff --git a/sdks/python/apache_beam/ml/inference/vertex_ai_inference_it_test.py b/sdks/python/apache_beam/ml/inference/vertex_ai_inference_it_test.py
@@ -46,8 +46,7 @@
 
 
 class VertexAIInference(unittest.TestCase):
-  @pytest.mark.uses_vertex_ai
-  @pytest.mark.it_postcommit
+  @pytest.mark.vertex_ai_postcommit
   def test_vertex_ai_run_flower_image_classification(self):
     output_file = '/'.join([_OUTPUT_DIR, str(uuid.uuid4()), 'output.txt'])
 
diff --git a/sdks/python/pytest.ini b/sdks/python/pytest.ini
@@ -60,7 +60,7 @@ markers =
     uses_onnx: tests that utilizes onnx in some way.
     uses_tf: tests that utilize tensorflow.
     uses_transformers: tests that utilize transformers in some way.
-    uses_vertex_ai: tests that utilize vertex ai in some way.
+    vertex_ai_postcommit: vertex ai postcommits that need additional deps.
 
 # Default timeout intended for unit tests.
 # If certain tests need a different value, please see the docs on how to
diff --git a/sdks/python/test-suites/dataflow/common.gradle b/sdks/python/test-suites/dataflow/common.gradle
@@ -417,7 +417,7 @@ task vertexAIInferenceTest {
       def argMap = [
           "test_opts": testOpts,
           "suite": "VertexAITests-df-py${pythonVersionSuffix}",
-          "collect": "uses_vertex_ai and it_postcommit" ,
+          "collect": "vertex_ai_postcommit" ,
           "runner": "TestDataflowRunner",
           "requirements_file": "$requirementsFile"
       ]

Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ task vertexAIInferenceTest {`
`417`	`417`	`def argMap = [`
`418`	`418`	`"test_opts": testOpts,`
`419`	`419`	`"suite": "VertexAITests-df-py${pythonVersionSuffix}",`
`420`		`- "collect": "uses_vertex_ai and it_postcommit" ,`
	`420`	`+ "collect": "vertex_ai_postcommit" ,`
`421`	`421`	`"runner": "TestDataflowRunner",`
`422`	`422`	`"requirements_file": "$requirementsFile"`
`423`	`423`	`]`