[beam] branch master updated: Some more runner v2 cleanup (#27464)

[damccorm]

This is an automated email from the ASF dual-hosted git repository.

damccorm 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 843e7fdb239 Some more runner v2 cleanup (#27464)
843e7fdb239 is described below

commit 843e7fdb239e0a61b47e39ce635c37221cd09f4e
Author: Danny McCormick <dannymccorm...@google.com>
AuthorDate: Wed Jul 12 12:03:55 2023 -0400

    Some more runner v2 cleanup (#27464)
    
    * Some more runner v2 cleanup
    
    * Fix suffix
    
    * Remove duplicate tasks
    
    * Remove duplicate tasks
    
    * Syntax
---
 build.gradle.kts                               |  1 -
 sdks/python/test-suites/dataflow/build.gradle  |  7 -------
 sdks/python/test-suites/dataflow/common.gradle | 19 ++++---------------
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2ffbc765a79..d202d9c76fb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -472,7 +472,6 @@ tasks.register("pythonPreCommit") {
 tasks.register("pythonPreCommitIT") {
   dependsOn(":sdks:python:test-suites:tox:pycommon:preCommitPyCommon")
   dependsOn(":sdks:python:test-suites:dataflow:preCommitIT")
-  dependsOn(":sdks:python:test-suites:dataflow:preCommitIT_V2")
 }
 
 tasks.register("pythonDocsPreCommit") {
diff --git a/sdks/python/test-suites/dataflow/build.gradle 
b/sdks/python/test-suites/dataflow/build.gradle
index 53f1f51dbdd..50d35774ffc 100644
--- a/sdks/python/test-suites/dataflow/build.gradle
+++ b/sdks/python/test-suites/dataflow/build.gradle
@@ -30,13 +30,6 @@ task preCommitIT {
   }
 }
 
-task preCommitIT_V2{
-  getVersionsAsList('dataflow_precommit_it_task_py_versions').each {
-    
dependsOn.add(":sdks:python:test-suites:dataflow:py${getVersionSuffix(it)}:preCommitIT_batch_V2")
-    
dependsOn.add(":sdks:python:test-suites:dataflow:py${getVersionSuffix(it)}:preCommitIT_streaming_V2")
-  }
-}
-
 task mongodbioIT {
   getVersionsAsList('dataflow_mongodbio_it_task_py_versions').each {
     
dependsOn.add(":sdks:python:test-suites:dataflow:py${getVersionSuffix(it)}:mongodbioIT")
diff --git a/sdks/python/test-suites/dataflow/common.gradle 
b/sdks/python/test-suites/dataflow/common.gradle
index 36fc75f2e41..44257b09c01 100644
--- a/sdks/python/test-suites/dataflow/common.gradle
+++ b/sdks/python/test-suites/dataflow/common.gradle
@@ -69,9 +69,8 @@ def basicPytestOpts = [
     "--log-cli-level=INFO", //log level
 ]
 
-def preCommitIT(String runScriptsDir, String envdir, Boolean streaming, 
Boolean runnerV2, String pythonSuffix) {
-  def suffix = runnerV2 ? '_V2' : ''
-  suffix = streaming ? "_streaming$suffix" : "_batch$suffix"
+def preCommitIT(String runScriptsDir, String envdir, Boolean streaming, String 
pythonSuffix) {
+  def suffix = streaming ? "_streaming" : "_batch"
   task "preCommitIT${suffix}" {
     dependsOn 'initializeForDataflowJob'
 
@@ -97,9 +96,6 @@ def preCommitIT(String runScriptsDir, String envdir, Boolean 
streaming, Boolean
 
       if (streaming){
         argMap.put("streaming", "true")
-        argMap.put("runner_v2", "true")
-      } else if (runnerV2) {
-        argMap.put("runner_v2", "true")
       }
 
       def cmdArgs = mapToArgString(argMap)
@@ -111,21 +107,14 @@ def preCommitIT(String runScriptsDir, String envdir, 
Boolean streaming, Boolean
   }
 }
 
-preCommitIT(runScriptsDir, envdir, false, false, pythonVersionSuffix)
-preCommitIT(runScriptsDir, envdir, true, false, pythonVersionSuffix)
-preCommitIT(runScriptsDir, envdir, false, true, pythonVersionSuffix)
-preCommitIT(runScriptsDir, envdir, true, true, pythonVersionSuffix)
+preCommitIT(runScriptsDir, envdir, false, pythonVersionSuffix)
+preCommitIT(runScriptsDir, envdir, true, pythonVersionSuffix)
 
 task preCommitIT{
   dependsOn preCommitIT_batch
   dependsOn preCommitIT_streaming
 }
 
-task preCommitIT_V2{
-  dependsOn preCommitIT_batch_V2
-  dependsOn preCommitIT_streaming_V2
-}
-
 task postCommitIT {
   dependsOn 'initializeForDataflowJob'