From 977559bad139157bed109ce99aa97d46d926d3b9 Mon Sep 17 00:00:00 2001
From: healthy-pod <ahmad@cockroachlabs.com>
Date: Wed, 29 Mar 2023 00:58:48 -0400
Subject: [PATCH] acceptance: ensure `go test` timeout is less than `bazel`
 timeout

Release note: None
Epic: none
---
 pkg/acceptance/BUILD.bazel           | 3 ++-
 pkg/cmd/generate-bazel-extra/main.go | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/acceptance/BUILD.bazel b/pkg/acceptance/BUILD.bazel
index 4b093d3e23fb..b681989fcdd1 100644
--- a/pkg/acceptance/BUILD.bazel
+++ b/pkg/acceptance/BUILD.bazel
@@ -42,7 +42,8 @@ go_test(
         "debug_remote_test.go",
         "main_test.go",
     ],
-    args = ["-test.timeout=3595s"],
+    # Note: we overide bazel timeout to 1800s using test_timeout.
+    args = ["-test.timeout=1795s"],
     data = glob([
         "testdata/**",
         "compose/**",
diff --git a/pkg/cmd/generate-bazel-extra/main.go b/pkg/cmd/generate-bazel-extra/main.go
index 6357ca17290d..d5edbf3f1443 100644
--- a/pkg/cmd/generate-bazel-extra/main.go
+++ b/pkg/cmd/generate-bazel-extra/main.go
@@ -315,6 +315,8 @@ func excludeReallyEnormousTargets(targets []string) []string {
 		for _, toExclude := range []string{
 			"//pkg/ccl/sqlitelogictestccl",
 			"//pkg/sql/sqlitelogictest",
+			// acceptance is excluded because it's an integration test.
+			"//pkg/acceptance",
 		} {
 			if strings.HasPrefix(targets[i], toExclude) {
 				excluded = true