From 9701e5cb7c17ee922578e9dd62fa3f6d85a91800 Mon Sep 17 00:00:00 2001
From: Robert Burke <lostluck@users.noreply.github.com>
Date: Tue, 15 Aug 2023 14:18:16 -0700
Subject: [PATCH] Remove legacy path for Go Dataflow post commits. (#27994)
* Remove legacy path for Go Dataflow post commits.
* Fix typo.
* Observation: xlang tests aren't run in the Go Dataflow suite.
---------
Co-authored-by: lostluck <13907733+lostluck@users.noreply.github.com>
---
build.gradle.kts | 13 +------------
sdks/go/test/build.gradle | 7 -------
2 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index 47156bb0f4d..0d23861a495 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -448,18 +448,7 @@ tasks.register("goPostCommitDataflowARM") {
}
tasks.register("goPostCommit") {
- dependsOn(":goIntegrationTests")
-}
-
-tasks.register("goIntegrationTests") {
- doLast {
- exec {
- executable("sh")
- args("-c", "./sdks/go/test/run_validatesrunner_tests.sh --runner dataflow")
- }
- }
- dependsOn(":sdks:go:test:build")
- dependsOn(":runners:google-cloud-dataflow-java:worker:shadowJar")
+ dependsOn(":sdks:go:test:dataflowValidatesRunner")
}
tasks.register("playgroundPreCommit") {
diff --git a/sdks/go/test/build.gradle b/sdks/go/test/build.gradle
index 1ea0d67dbb3..d5349119475 100644
--- a/sdks/go/test/build.gradle
+++ b/sdks/go/test/build.gradle
@@ -28,15 +28,10 @@ task dataflowValidatesRunner() {
group = "Verification"
dependsOn ":sdks:go:test:goBuild"
- dependsOn ":sdks:java:testing:expansion-service:buildTestExpansionServiceJar"
doLast {
- def pipelineOptions = [ // Pipeline options piped directly to Go SDK flags.
- "--expansion_jar=test:${project(":sdks:java:testing:expansion-service").buildTestExpansionServiceJar.archivePath}",
- ]
def options = [
"--runner dataflow",
- "--pipeline_opts \"${pipelineOptions.join(' ')}\"",
]
exec {
executable "sh"
@@ -51,11 +46,9 @@ task dataflowValidatesRunnerARM64() {
group = "Verification"
dependsOn ":sdks:go:test:goBuild"
- dependsOn ":sdks:java:testing:expansion-service:buildTestExpansionServiceJar"
doLast {
def pipelineOptions = [ // Pipeline options piped directly to Go SDK flags.
- "--expansion_jar=test:${project(":sdks:java:testing:expansion-service").buildTestExpansionServiceJar.archivePath}",
"--machine_type=t2a-standard-1",
]
def options = [
--
GitLab