Merge pull request cockroachdb#99893 from healthy-pod/acceptance-timeout

Merging as per CREQ-839
ajwerner · Mar 29, 2023 · 7b44120 · 7b44120
2 parents 7d796b1 + 977559b
commit 7b44120
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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