This is an automated email from the ASF dual-hosted git repository. damccorm pushed a commit to branch users/damccorm/v2-cleanup in repository https://gitbox.apache.org/repos/asf/beam.git
commit 81c7a1dff69ec9cdd43aa4f28440c937af1d7062 Author: Danny McCormick <[email protected]> AuthorDate: Tue Jul 11 21:33:56 2023 -0400 Some more runner v2 cleanup --- build.gradle.kts | 1 - sdks/python/test-suites/dataflow/build.gradle | 7 ------- sdks/python/test-suites/dataflow/common.gradle | 19 +++++-------------- 3 files changed, 5 insertions(+), 22 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..17957a1aa06 100644 --- a/sdks/python/test-suites/dataflow/common.gradle +++ b/sdks/python/test-suites/dataflow/common.gradle @@ -69,8 +69,7 @@ def basicPytestOpts = [ "--log-cli-level=INFO", //log level ] -def preCommitIT(String runScriptsDir, String envdir, Boolean streaming, Boolean runnerV2, String pythonSuffix) { - def suffix = runnerV2 ? '_V2' : '' +def preCommitIT(String runScriptsDir, String envdir, Boolean streaming, String pythonSuffix) { suffix = streaming ? "_streaming$suffix" : "_batch$suffix" 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,16 @@ 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) +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'
