From dcab435bba9853e8dff53816e2e6535ed1b4a60f Mon Sep 17 00:00:00 2001 From: healthy-pod Date: Thu, 11 May 2023 08:30:27 -0700 Subject: [PATCH] generate-logic-test: fix incorrect timeout in logictests template In #102719, we changed the way we set `-test.timeout` but didn't update the logictests template. This code change updates the template. Release note: None Epic: none --- pkg/cmd/generate-logictest/templates.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/cmd/generate-logictest/templates.go b/pkg/cmd/generate-logictest/templates.go index e1e6d150b5cf..2178003399ca 100644 --- a/pkg/cmd/generate-logictest/templates.go +++ b/pkg/cmd/generate-logictest/templates.go @@ -257,7 +257,10 @@ go_test( size = "enormous", srcs = ["generated_test.go"],{{ if .SqliteLogicTest }} args = ["-test.timeout=7195s"],{{ else }} - args = ["-test.timeout=3595s"],{{ end }} + args = select({ + "//build/toolchains:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }),{{ end }} data = [ "//c-deps:libgeos", # keep{{ if .SqliteLogicTest }} "@com_github_cockroachdb_sqllogictest//:testfiles", # keep{{ end }}{{ if .CockroachGoTestserverTest }}