diff --git a/.bazelrc b/.bazelrc index cbffa3c2a726..99052ca79792 100644 --- a/.bazelrc +++ b/.bazelrc @@ -51,6 +51,8 @@ test:test --test_env=TZ= # If those values are updated, the script should be updated accordingly. test:race --test_timeout=1200,6000,18000,72000 +# CI uses a custom timeout for enormous targets. +test:use_ci_timeouts --test_timeout=60,300,900,900 --define=use_ci_timeouts=true # CI should always run with `--config=ci` or `--config=cinolint`. # Prefer the first to the second unless some other job will handle linting the # same code you're building. diff --git a/WORKSPACE b/WORKSPACE index 47102f1bcb67..7f25de7011a4 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -355,10 +355,10 @@ load( go_repository( name = "com_github_bazelbuild_buildtools", importpath = "github.com/bazelbuild/buildtools", - sha256 = "a9ef5103739dfb5ed2a5b47ab1654842a89695812e4af09e57d7015a5caf97e0", - strip_prefix = "buildtools", + sha256 = "d71a889e3bc50cc8b9d42c859e15a74f7c8d10b6786f8dd82f08f2bf24e5bdc6", + strip_prefix = "bazelbuild-buildtools-b182fc4", urls = [ - "https://storage.googleapis.com/public-bazel-artifacts/gomod/github.com/bazelbuild/buildtools/v0.0.0-20200718160251-b1667ff58f71/buildtools-v0.0.0-20200718160251-b1667ff58f71.tar.gz", + "https://storage.googleapis.com/public-bazel-artifacts/gomod/github.com/bazelbuild/buildtools/v6.1.2-0-gb182fc4/bazelbuild-buildtools-v6.1.2-0-gb182fc4.tar.gz", ], ) diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index 8b414e2200dc..6b22c174336a 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -1171,7 +1171,7 @@ DISTDIR_FILES = { "https://storage.googleapis.com/public-bazel-artifacts/go/20230214-214430/go1.19.4.linux-arm64.tar.gz": "6bb5752483c0d145b91199e5cc1352960d926850e75864dea16282337b0d92fe", "https://storage.googleapis.com/public-bazel-artifacts/go/20230214-214430/go1.19.4.windows-amd64.tar.gz": "0f37edf2a6663db33c8f67ee36e21a7eb391fbf35d494299f6a81a59e294f4a0", "https://storage.googleapis.com/public-bazel-artifacts/go/20230427-165819/go1.19.8fips.linux-amd64.tar.gz": "8170fd871cb61dc771ec1f309451b31a73d5aca3410dfa9d952672ae2be4ac9e", - "https://storage.googleapis.com/public-bazel-artifacts/gomod/github.com/bazelbuild/buildtools/v0.0.0-20200718160251-b1667ff58f71/buildtools-v0.0.0-20200718160251-b1667ff58f71.tar.gz": "a9ef5103739dfb5ed2a5b47ab1654842a89695812e4af09e57d7015a5caf97e0", + "https://storage.googleapis.com/public-bazel-artifacts/gomod/github.com/bazelbuild/buildtools/v6.1.2-0-gb182fc4/bazelbuild-buildtools-v6.1.2-0-gb182fc4.tar.gz": "d71a889e3bc50cc8b9d42c859e15a74f7c8d10b6786f8dd82f08f2bf24e5bdc6", "https://storage.googleapis.com/public-bazel-artifacts/java/railroad/rr-1.63-java8.zip": "d2791cd7a44ea5be862f33f5a9b3d40aaad9858455828ebade7007ad7113fb41", "https://storage.googleapis.com/public-bazel-artifacts/js/node/v16.13.0/node-v16.13.0-darwin-arm64.tar.gz": "46d83fc0bd971db5050ef1b15afc44a6665dee40bd6c1cbaec23e1b40fa49e6d", "https://storage.googleapis.com/public-bazel-artifacts/js/node/v16.13.0/node-v16.13.0-darwin-x64.tar.gz": "37e09a8cf2352f340d1204c6154058d81362fef4ec488b0197b2ce36b3f0367a", diff --git a/build/teamcity/cockroach/ci/tests/unit_tests_ccl_impl.sh b/build/teamcity/cockroach/ci/tests/unit_tests_ccl_impl.sh index 183d1734ca59..b54c8b5572ff 100755 --- a/build/teamcity/cockroach/ci/tests/unit_tests_ccl_impl.sh +++ b/build/teamcity/cockroach/ci/tests/unit_tests_ccl_impl.sh @@ -15,6 +15,6 @@ if tc_release_branch; then EXTRA_PARAMS=" --flaky_test_attempts=3" fi -$(bazel info bazel-bin --config=ci)/pkg/cmd/bazci/bazci_/bazci -- test --config=cinolint -c fastbuild \ +$(bazel info bazel-bin --config=ci)/pkg/cmd/bazci/bazci_/bazci -- test --config=cinolint --config=use_ci_timeouts -c fastbuild \ //pkg:ccl_tests \ --profile=/artifacts/profile.gz $EXTRA_PARAMS diff --git a/build/teamcity/cockroach/ci/tests/unit_tests_impl.sh b/build/teamcity/cockroach/ci/tests/unit_tests_impl.sh index d50b4065e386..efcc0e6bf47e 100755 --- a/build/teamcity/cockroach/ci/tests/unit_tests_impl.sh +++ b/build/teamcity/cockroach/ci/tests/unit_tests_impl.sh @@ -15,6 +15,6 @@ if tc_release_branch; then EXTRA_PARAMS=" --flaky_test_attempts=3" fi -$(bazel info bazel-bin --config=ci)/pkg/cmd/bazci/bazci_/bazci -- test --config=cinolint -c fastbuild \ +$(bazel info bazel-bin --config=ci)/pkg/cmd/bazci/bazci_/bazci -- test --config=cinolint --config=use_ci_timeouts -c fastbuild \ //pkg:small_non_ccl_tests //pkg:medium_non_ccl_tests //pkg:large_non_ccl_tests //pkg:enormous_non_ccl_tests \ --profile=/artifacts/profile.gz $EXTRA_PARAMS diff --git a/c-deps/BUILD.bazel b/c-deps/BUILD.bazel index 23bc0f026d5b..2bdeba638bbf 100644 --- a/c-deps/BUILD.bazel +++ b/c-deps/BUILD.bazel @@ -245,14 +245,14 @@ configure_make( }), lib_source = "@krb5//:all", out_static_libs = LIBKRB5_LIBS, - postfix_script = ("""mkdir -p libkrb5/lib + postfix_script = """mkdir -p libkrb5/lib cp lib/libcom_err.a libkrb5/lib cp lib/libgssapi_krb5.a libkrb5/lib cp lib/libkrb5.a libkrb5/lib cp lib/libkrb5support.a libkrb5/lib cp lib/libk5crypto.a libkrb5/lib mkdir -p libkrb5/include/gssapi -cp include/gssapi/gssapi.h libkrb5/include/gssapi"""), +cp include/gssapi/gssapi.h libkrb5/include/gssapi""", visibility = ["//visibility:public"], ) diff --git a/pkg/BUILD.bazel b/pkg/BUILD.bazel index a5ce75721742..2c4df3a00fac 100644 --- a/pkg/BUILD.bazel +++ b/pkg/BUILD.bazel @@ -3521,3 +3521,10 @@ test_suite( ) unused_checker(srcs = GET_X_DATA_TARGETS) + +config_setting( + name = "use_ci_timeouts", + values = { + "define": "use_ci_timeouts=true" + } +) diff --git a/pkg/base/BUILD.bazel b/pkg/base/BUILD.bazel index b9cc043c76be..b0bfbc1e2ad3 100644 --- a/pkg/base/BUILD.bazel +++ b/pkg/base/BUILD.bazel @@ -58,7 +58,10 @@ go_test( "node_id_test.go", "store_spec_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), deps = [ ":base", diff --git a/pkg/bench/BUILD.bazel b/pkg/bench/BUILD.bazel index b8d15a775ad4..cc7513d85e32 100644 --- a/pkg/bench/BUILD.bazel +++ b/pkg/bench/BUILD.bazel @@ -36,7 +36,10 @@ go_test( "main_test.go", "pgbench_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":bench"], deps = [ "//pkg/base", diff --git a/pkg/bench/rttanalysis/BUILD.bazel b/pkg/bench/rttanalysis/BUILD.bazel index 50c906bcdace..861e827ce30e 100644 --- a/pkg/bench/rttanalysis/BUILD.bazel +++ b/pkg/bench/rttanalysis/BUILD.bazel @@ -51,7 +51,10 @@ go_test( "validate_benchmark_data_test.go", "virtual_table_bench_test.go", ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), data = glob(["testdata/**"]), embed = [":rttanalysis"], shard_count = 16, diff --git a/pkg/bench/tpcc/BUILD.bazel b/pkg/bench/tpcc/BUILD.bazel index f3380ce1d95f..593b93e6a81a 100644 --- a/pkg/bench/tpcc/BUILD.bazel +++ b/pkg/bench/tpcc/BUILD.bazel @@ -18,7 +18,10 @@ go_test( "tpcc_bench_options_test.go", "tpcc_bench_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":tpcc"], deps = [ "//pkg/base", diff --git a/pkg/blobs/BUILD.bazel b/pkg/blobs/BUILD.bazel index 1bee54a3b413..e5276f8f2206 100644 --- a/pkg/blobs/BUILD.bazel +++ b/pkg/blobs/BUILD.bazel @@ -38,7 +38,10 @@ go_test( "local_storage_test.go", "service_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":blobs"], deps = [ "//pkg/base", diff --git a/pkg/build/BUILD.bazel b/pkg/build/BUILD.bazel index db1d660daa0b..08db379bc6cb 100644 --- a/pkg/build/BUILD.bazel +++ b/pkg/build/BUILD.bazel @@ -49,7 +49,10 @@ go_proto_library( go_test( name = "build_test", srcs = ["info_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":build"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/build/starlarkutil/BUILD.bazel b/pkg/build/starlarkutil/BUILD.bazel index bb6633ee6143..65a763ef9816 100644 --- a/pkg/build/starlarkutil/BUILD.bazel +++ b/pkg/build/starlarkutil/BUILD.bazel @@ -12,7 +12,10 @@ go_library( go_test( name = "starlarkutil_test", srcs = ["starlarkutil_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":starlarkutil"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/build/util/BUILD.bazel b/pkg/build/util/BUILD.bazel index 822a2bb0ea98..8ba216c921fd 100644 --- a/pkg/build/util/BUILD.bazel +++ b/pkg/build/util/BUILD.bazel @@ -11,7 +11,10 @@ go_library( go_test( name = "util_test", srcs = ["util_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":util"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/ccl/backupccl/BUILD.bazel b/pkg/ccl/backupccl/BUILD.bazel index a0b563611871..71af70c70264 100644 --- a/pkg/ccl/backupccl/BUILD.bazel +++ b/pkg/ccl/backupccl/BUILD.bazel @@ -193,7 +193,10 @@ go_test( "tenant_backup_nemesis_test.go", "utils_test.go", ], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = glob(["testdata/**"]) + ["//c-deps:libgeos"], embed = [":backupccl"], shard_count = 48, diff --git a/pkg/ccl/backupccl/backupdest/BUILD.bazel b/pkg/ccl/backupccl/backupdest/BUILD.bazel index 332402af9cab..b7f0be11b384 100644 --- a/pkg/ccl/backupccl/backupdest/BUILD.bazel +++ b/pkg/ccl/backupccl/backupdest/BUILD.bazel @@ -41,7 +41,10 @@ go_test( "incrementals_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), tags = ["ccl_test"], deps = [ ":backupdest", diff --git a/pkg/ccl/backupccl/backupinfo/BUILD.bazel b/pkg/ccl/backupccl/backupinfo/BUILD.bazel index 99531a718739..2bf45f659864 100644 --- a/pkg/ccl/backupccl/backupinfo/BUILD.bazel +++ b/pkg/ccl/backupccl/backupinfo/BUILD.bazel @@ -64,7 +64,10 @@ go_test( "main_test.go", "manifest_handling_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), tags = ["ccl_test"], deps = [ ":backupinfo", diff --git a/pkg/ccl/backupccl/backuprand/BUILD.bazel b/pkg/ccl/backupccl/backuprand/BUILD.bazel index 7a1597d20f90..283b27bc570a 100644 --- a/pkg/ccl/backupccl/backuprand/BUILD.bazel +++ b/pkg/ccl/backupccl/backuprand/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "backup_rand_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = ["//c-deps:libgeos"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/backupccl/backupresolver/BUILD.bazel b/pkg/ccl/backupccl/backupresolver/BUILD.bazel index 145c685ca7bf..d2164c18246b 100644 --- a/pkg/ccl/backupccl/backupresolver/BUILD.bazel +++ b/pkg/ccl/backupccl/backupresolver/BUILD.bazel @@ -30,7 +30,10 @@ go_test( "main_test.go", "targets_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":backupresolver"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/baseccl/BUILD.bazel b/pkg/ccl/baseccl/BUILD.bazel index e48d1ad4da21..c59a8e5206fb 100644 --- a/pkg/ccl/baseccl/BUILD.bazel +++ b/pkg/ccl/baseccl/BUILD.bazel @@ -22,7 +22,10 @@ go_test( name = "baseccl_test", size = "small", srcs = ["encryption_spec_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":baseccl"], tags = ["ccl_test"], deps = ["//pkg/util/leaktest"], diff --git a/pkg/ccl/benchccl/rttanalysisccl/BUILD.bazel b/pkg/ccl/benchccl/rttanalysisccl/BUILD.bazel index 6a09069d4c56..7d90f8c22525 100644 --- a/pkg/ccl/benchccl/rttanalysisccl/BUILD.bazel +++ b/pkg/ccl/benchccl/rttanalysisccl/BUILD.bazel @@ -8,7 +8,10 @@ go_test( "bench_test.go", "multi_region_bench_test.go", ], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = glob(["testdata/**"]), shard_count = 16, tags = ["ccl_test"], diff --git a/pkg/ccl/changefeedccl/BUILD.bazel b/pkg/ccl/changefeedccl/BUILD.bazel index 7481cd56eac6..079fd978ff55 100644 --- a/pkg/ccl/changefeedccl/BUILD.bazel +++ b/pkg/ccl/changefeedccl/BUILD.bazel @@ -203,7 +203,10 @@ go_test( "testfeed_test.go", "validations_test.go", ], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), embed = [":changefeedccl"], shard_count = 16, tags = ["ccl_test"], diff --git a/pkg/ccl/changefeedccl/cdceval/BUILD.bazel b/pkg/ccl/changefeedccl/cdceval/BUILD.bazel index 72befe8f722a..d5df4ff9e031 100644 --- a/pkg/ccl/changefeedccl/cdceval/BUILD.bazel +++ b/pkg/ccl/changefeedccl/cdceval/BUILD.bazel @@ -62,7 +62,10 @@ go_test( "plan_test.go", "validation_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":cdceval"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/changefeedccl/cdcevent/BUILD.bazel b/pkg/ccl/changefeedccl/cdcevent/BUILD.bazel index 1df7bda82454..dcb6b78b262a 100644 --- a/pkg/ccl/changefeedccl/cdcevent/BUILD.bazel +++ b/pkg/ccl/changefeedccl/cdcevent/BUILD.bazel @@ -50,7 +50,10 @@ go_test( "projection_test.go", "rowfetcher_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":cdcevent"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/changefeedccl/cdctest/BUILD.bazel b/pkg/ccl/changefeedccl/cdctest/BUILD.bazel index 2de0e932bccc..e686e4670427 100644 --- a/pkg/ccl/changefeedccl/cdctest/BUILD.bazel +++ b/pkg/ccl/changefeedccl/cdctest/BUILD.bazel @@ -48,7 +48,10 @@ go_test( "main_test.go", "validator_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":cdctest"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/changefeedccl/cdcutils/BUILD.bazel b/pkg/ccl/changefeedccl/cdcutils/BUILD.bazel index fc7f6943f9fc..c4214d687cbf 100644 --- a/pkg/ccl/changefeedccl/cdcutils/BUILD.bazel +++ b/pkg/ccl/changefeedccl/cdcutils/BUILD.bazel @@ -20,7 +20,10 @@ go_library( go_test( name = "cdcutils_test", srcs = ["throttle_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":cdcutils"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/changefeedccl/changefeedbase/BUILD.bazel b/pkg/ccl/changefeedccl/changefeedbase/BUILD.bazel index d7f1d4b79079..32ee7d4d49ef 100644 --- a/pkg/ccl/changefeedccl/changefeedbase/BUILD.bazel +++ b/pkg/ccl/changefeedccl/changefeedbase/BUILD.bazel @@ -29,7 +29,10 @@ go_library( go_test( name = "changefeedbase_test", srcs = ["options_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":changefeedbase"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/changefeedccl/kvevent/BUILD.bazel b/pkg/ccl/changefeedccl/kvevent/BUILD.bazel index 05515ce23440..3cfc6859af7b 100644 --- a/pkg/ccl/changefeedccl/kvevent/BUILD.bazel +++ b/pkg/ccl/changefeedccl/kvevent/BUILD.bazel @@ -41,7 +41,10 @@ go_test( "blocking_buffer_test.go", "chunked_event_queue_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":kvevent"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/changefeedccl/kvfeed/BUILD.bazel b/pkg/ccl/changefeedccl/kvfeed/BUILD.bazel index 8afe1f034dda..58ff9e3cde4b 100644 --- a/pkg/ccl/changefeedccl/kvfeed/BUILD.bazel +++ b/pkg/ccl/changefeedccl/kvfeed/BUILD.bazel @@ -48,7 +48,10 @@ go_test( "main_test.go", "scanner_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":kvfeed"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/changefeedccl/schemafeed/BUILD.bazel b/pkg/ccl/changefeedccl/schemafeed/BUILD.bazel index 94ceb155b3b1..ce250653c72e 100644 --- a/pkg/ccl/changefeedccl/schemafeed/BUILD.bazel +++ b/pkg/ccl/changefeedccl/schemafeed/BUILD.bazel @@ -52,7 +52,10 @@ go_test( "table_event_filter_datadriven_test.go", "table_event_filter_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":schemafeed"], tags = ["ccl_test"], diff --git a/pkg/ccl/cliccl/BUILD.bazel b/pkg/ccl/cliccl/BUILD.bazel index 861d7047a769..6c4c6c78e843 100644 --- a/pkg/ccl/cliccl/BUILD.bazel +++ b/pkg/ccl/cliccl/BUILD.bazel @@ -53,7 +53,10 @@ go_test( "ear_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":cliccl"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/cloudccl/amazon/BUILD.bazel b/pkg/ccl/cloudccl/amazon/BUILD.bazel index 8f33b11799ea..4eac8023b7d7 100644 --- a/pkg/ccl/cloudccl/amazon/BUILD.bazel +++ b/pkg/ccl/cloudccl/amazon/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "main_test.go", "s3_connection_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), tags = ["ccl_test"], deps = [ "//pkg/base", diff --git a/pkg/ccl/cloudccl/azure/BUILD.bazel b/pkg/ccl/cloudccl/azure/BUILD.bazel index 961943337e3e..e21bbc20207e 100644 --- a/pkg/ccl/cloudccl/azure/BUILD.bazel +++ b/pkg/ccl/cloudccl/azure/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "azure_connection_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), tags = ["ccl_test"], deps = [ "//pkg/base", diff --git a/pkg/ccl/cloudccl/cloudprivilege/BUILD.bazel b/pkg/ccl/cloudccl/cloudprivilege/BUILD.bazel index 04c8952a9f98..5a8d27556a9a 100644 --- a/pkg/ccl/cloudccl/cloudprivilege/BUILD.bazel +++ b/pkg/ccl/cloudccl/cloudprivilege/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "main_test.go", "privileges_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), tags = ["ccl_test"], deps = [ "//pkg/base", diff --git a/pkg/ccl/cloudccl/externalconn/BUILD.bazel b/pkg/ccl/cloudccl/externalconn/BUILD.bazel index 0e029f93a2a6..8b1f3b470131 100644 --- a/pkg/ccl/cloudccl/externalconn/BUILD.bazel +++ b/pkg/ccl/cloudccl/externalconn/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "datadriven_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/cloudccl/gcp/BUILD.bazel b/pkg/ccl/cloudccl/gcp/BUILD.bazel index b130aeb48b01..d6d8b9800f6f 100644 --- a/pkg/ccl/cloudccl/gcp/BUILD.bazel +++ b/pkg/ccl/cloudccl/gcp/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "gcp_connection_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), tags = ["ccl_test"], deps = [ "//pkg/base", diff --git a/pkg/ccl/gssapiccl/BUILD.bazel b/pkg/ccl/gssapiccl/BUILD.bazel index b5f0a1c8f790..06be51ac65fa 100644 --- a/pkg/ccl/gssapiccl/BUILD.bazel +++ b/pkg/ccl/gssapiccl/BUILD.bazel @@ -6,8 +6,8 @@ go_library( name = "gssapiccl", srcs = select({ "@io_bazel_rules_go//go/platform:linux": [ - "gssapi.go", "get_user.go", + "gssapi.go", ], "//conditions:default": ["empty.go"], }), @@ -31,10 +31,10 @@ go_library( "//pkg/security/username", "//pkg/settings", "//pkg/sql", - "//pkg/sql/sem/tree", "//pkg/sql/pgwire", "//pkg/sql/pgwire/hba", "//pkg/sql/pgwire/identmap", + "//pkg/sql/sem/tree", "@com_github_cockroachdb_errors//:errors", ], "//conditions:default": [], diff --git a/pkg/ccl/importerccl/BUILD.bazel b/pkg/ccl/importerccl/BUILD.bazel index 4f557db40407..56650056cd5a 100644 --- a/pkg/ccl/importerccl/BUILD.bazel +++ b/pkg/ccl/importerccl/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "ccl_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = [ "//c-deps:libgeos", "//pkg/sql/importer:testdata", diff --git a/pkg/ccl/jobsccl/jobsprotectedtsccl/BUILD.bazel b/pkg/ccl/jobsccl/jobsprotectedtsccl/BUILD.bazel index 427ce5193682..73a47355b685 100644 --- a/pkg/ccl/jobsccl/jobsprotectedtsccl/BUILD.bazel +++ b/pkg/ccl/jobsccl/jobsprotectedtsccl/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "jobs_protected_ts_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), tags = ["ccl_test"], deps = [ "//pkg/base", diff --git a/pkg/ccl/jwtauthccl/BUILD.bazel b/pkg/ccl/jwtauthccl/BUILD.bazel index f6a9fc96b814..132f6af0374d 100644 --- a/pkg/ccl/jwtauthccl/BUILD.bazel +++ b/pkg/ccl/jwtauthccl/BUILD.bazel @@ -34,7 +34,10 @@ go_test( "main_test.go", "settings_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":jwtauthccl"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/kvccl/kvfollowerreadsccl/BUILD.bazel b/pkg/ccl/kvccl/kvfollowerreadsccl/BUILD.bazel index 61cda2abf741..5a7c09467829 100644 --- a/pkg/ccl/kvccl/kvfollowerreadsccl/BUILD.bazel +++ b/pkg/ccl/kvccl/kvfollowerreadsccl/BUILD.bazel @@ -42,7 +42,10 @@ go_test( "followerreads_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":kvfollowerreadsccl"], tags = ["ccl_test"], diff --git a/pkg/ccl/kvccl/kvtenantccl/upgradeccl/BUILD.bazel b/pkg/ccl/kvccl/kvtenantccl/upgradeccl/BUILD.bazel index 491e6a9ab7cc..3cb05fcdd50d 100644 --- a/pkg/ccl/kvccl/kvtenantccl/upgradeccl/BUILD.bazel +++ b/pkg/ccl/kvccl/kvtenantccl/upgradeccl/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "main_test.go", "tenant_upgrade_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), tags = ["ccl_test"], deps = [ "//pkg/base", diff --git a/pkg/ccl/kvccl/kvtenantccl/upgradeinterlockccl/BUILD.bazel b/pkg/ccl/kvccl/kvtenantccl/upgradeinterlockccl/BUILD.bazel index c8c2f0cc410c..9e1be9d80c83 100644 --- a/pkg/ccl/kvccl/kvtenantccl/upgradeinterlockccl/BUILD.bazel +++ b/pkg/ccl/kvccl/kvtenantccl/upgradeinterlockccl/BUILD.bazel @@ -8,7 +8,10 @@ go_test( "main_test.go", "tenant_upgrade_test.go", ], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), tags = ["ccl_test"], deps = [ "//pkg/base", diff --git a/pkg/ccl/logictestccl/tests/3node-tenant-multiregion/BUILD.bazel b/pkg/ccl/logictestccl/tests/3node-tenant-multiregion/BUILD.bazel index 80cb37977e3e..3e5bd7f3bfca 100644 --- a/pkg/ccl/logictestccl/tests/3node-tenant-multiregion/BUILD.bazel +++ b/pkg/ccl/logictestccl/tests/3node-tenant-multiregion/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "3node-tenant-multiregion_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/ccl/logictestccl:testdata", # keep diff --git a/pkg/ccl/logictestccl/tests/3node-tenant/BUILD.bazel b/pkg/ccl/logictestccl/tests/3node-tenant/BUILD.bazel index ecd3bbb29850..fbdc9294c569 100644 --- a/pkg/ccl/logictestccl/tests/3node-tenant/BUILD.bazel +++ b/pkg/ccl/logictestccl/tests/3node-tenant/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "3node-tenant_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/ccl/logictestccl:testdata", # keep diff --git a/pkg/ccl/logictestccl/tests/5node/BUILD.bazel b/pkg/ccl/logictestccl/tests/5node/BUILD.bazel index 885f84eb07a8..a0c409e3552c 100644 --- a/pkg/ccl/logictestccl/tests/5node/BUILD.bazel +++ b/pkg/ccl/logictestccl/tests/5node/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "5node_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/ccl/logictestccl:testdata", # keep diff --git a/pkg/ccl/logictestccl/tests/fakedist-disk/BUILD.bazel b/pkg/ccl/logictestccl/tests/fakedist-disk/BUILD.bazel index eee050b5204f..0a1a9702e430 100644 --- a/pkg/ccl/logictestccl/tests/fakedist-disk/BUILD.bazel +++ b/pkg/ccl/logictestccl/tests/fakedist-disk/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "fakedist-disk_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/ccl/logictestccl:testdata", # keep diff --git a/pkg/ccl/logictestccl/tests/fakedist-vec-off/BUILD.bazel b/pkg/ccl/logictestccl/tests/fakedist-vec-off/BUILD.bazel index 39ef42dcef94..9ca30a3abf6f 100644 --- a/pkg/ccl/logictestccl/tests/fakedist-vec-off/BUILD.bazel +++ b/pkg/ccl/logictestccl/tests/fakedist-vec-off/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "fakedist-vec-off_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/ccl/logictestccl:testdata", # keep diff --git a/pkg/ccl/logictestccl/tests/fakedist/BUILD.bazel b/pkg/ccl/logictestccl/tests/fakedist/BUILD.bazel index a02979d3a275..1a2e3864ea6a 100644 --- a/pkg/ccl/logictestccl/tests/fakedist/BUILD.bazel +++ b/pkg/ccl/logictestccl/tests/fakedist/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "fakedist_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/ccl/logictestccl:testdata", # keep diff --git a/pkg/ccl/logictestccl/tests/local-legacy-schema-changer/BUILD.bazel b/pkg/ccl/logictestccl/tests/local-legacy-schema-changer/BUILD.bazel index 4ce47bc18892..e72ea4de7a94 100644 --- a/pkg/ccl/logictestccl/tests/local-legacy-schema-changer/BUILD.bazel +++ b/pkg/ccl/logictestccl/tests/local-legacy-schema-changer/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "local-legacy-schema-changer_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/ccl/logictestccl:testdata", # keep diff --git a/pkg/ccl/logictestccl/tests/local-mixed-22.2-23.1/BUILD.bazel b/pkg/ccl/logictestccl/tests/local-mixed-22.2-23.1/BUILD.bazel index 6fad997c0141..8880134eebeb 100644 --- a/pkg/ccl/logictestccl/tests/local-mixed-22.2-23.1/BUILD.bazel +++ b/pkg/ccl/logictestccl/tests/local-mixed-22.2-23.1/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "local-mixed-22_2-23_1_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/ccl/logictestccl:testdata", # keep diff --git a/pkg/ccl/logictestccl/tests/local-vec-off/BUILD.bazel b/pkg/ccl/logictestccl/tests/local-vec-off/BUILD.bazel index 4f3f5e8ac34c..a492cc98846e 100644 --- a/pkg/ccl/logictestccl/tests/local-vec-off/BUILD.bazel +++ b/pkg/ccl/logictestccl/tests/local-vec-off/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "local-vec-off_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/ccl/logictestccl:testdata", # keep diff --git a/pkg/ccl/logictestccl/tests/local/BUILD.bazel b/pkg/ccl/logictestccl/tests/local/BUILD.bazel index 3c29f5b28b9a..bd3ffe4d7dcc 100644 --- a/pkg/ccl/logictestccl/tests/local/BUILD.bazel +++ b/pkg/ccl/logictestccl/tests/local/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "local_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/ccl/logictestccl:testdata", # keep diff --git a/pkg/ccl/logictestccl/tests/multiregion-15node-5region-3azs/BUILD.bazel b/pkg/ccl/logictestccl/tests/multiregion-15node-5region-3azs/BUILD.bazel index d1a4dd5c53d2..29f6410f9074 100644 --- a/pkg/ccl/logictestccl/tests/multiregion-15node-5region-3azs/BUILD.bazel +++ b/pkg/ccl/logictestccl/tests/multiregion-15node-5region-3azs/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "multiregion-15node-5region-3azs_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/ccl/logictestccl:testdata", # keep diff --git a/pkg/ccl/logictestccl/tests/multiregion-3node-3superlongregions/BUILD.bazel b/pkg/ccl/logictestccl/tests/multiregion-3node-3superlongregions/BUILD.bazel index 83f194c5308e..aa004e4b063a 100644 --- a/pkg/ccl/logictestccl/tests/multiregion-3node-3superlongregions/BUILD.bazel +++ b/pkg/ccl/logictestccl/tests/multiregion-3node-3superlongregions/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "multiregion-3node-3superlongregions_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/ccl/logictestccl:testdata", # keep diff --git a/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-no-los/BUILD.bazel b/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-no-los/BUILD.bazel index 376adba6da67..53dbe1fc9fb3 100644 --- a/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-no-los/BUILD.bazel +++ b/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-no-los/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "multiregion-9node-3region-3azs-no-los_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/ccl/logictestccl:testdata", # keep diff --git a/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-tenant/BUILD.bazel b/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-tenant/BUILD.bazel index 714f78cace8a..07095ef79d98 100644 --- a/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-tenant/BUILD.bazel +++ b/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-tenant/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "multiregion-9node-3region-3azs-tenant_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/ccl/logictestccl:testdata", # keep diff --git a/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-vec-off/BUILD.bazel b/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-vec-off/BUILD.bazel index afe9959a2e24..bfad124d1d24 100644 --- a/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-vec-off/BUILD.bazel +++ b/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-vec-off/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "multiregion-9node-3region-3azs-vec-off_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/ccl/logictestccl:testdata", # keep diff --git a/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs/BUILD.bazel b/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs/BUILD.bazel index e37032e2327e..5a768562d1ec 100644 --- a/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs/BUILD.bazel +++ b/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "multiregion-9node-3region-3azs_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/ccl/logictestccl:testdata", # keep diff --git a/pkg/ccl/multiregionccl/BUILD.bazel b/pkg/ccl/multiregionccl/BUILD.bazel index 813f8d9fad50..861f1537e537 100644 --- a/pkg/ccl/multiregionccl/BUILD.bazel +++ b/pkg/ccl/multiregionccl/BUILD.bazel @@ -39,7 +39,10 @@ go_test( "show_test.go", "unique_test.go", ], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = glob(["testdata/**"]), embed = [":multiregionccl"], shard_count = 16, diff --git a/pkg/ccl/multitenantccl/tenantcapabilitiesccl/BUILD.bazel b/pkg/ccl/multitenantccl/tenantcapabilitiesccl/BUILD.bazel index 7b72a0ee3da9..3cef7ca98f7f 100644 --- a/pkg/ccl/multitenantccl/tenantcapabilitiesccl/BUILD.bazel +++ b/pkg/ccl/multitenantccl/tenantcapabilitiesccl/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "capabilities_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/multitenantccl/tenantcostclient/BUILD.bazel b/pkg/ccl/multitenantccl/tenantcostclient/BUILD.bazel index 0af3f9fa3924..019cfeb2a883 100644 --- a/pkg/ccl/multitenantccl/tenantcostclient/BUILD.bazel +++ b/pkg/ccl/multitenantccl/tenantcostclient/BUILD.bazel @@ -43,7 +43,10 @@ go_test( "tenant_side_test.go", "token_bucket_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":tenantcostclient"], tags = [ diff --git a/pkg/ccl/multitenantccl/tenantcostserver/BUILD.bazel b/pkg/ccl/multitenantccl/tenantcostserver/BUILD.bazel index b1f2ea3fc465..803278b7bd29 100644 --- a/pkg/ccl/multitenantccl/tenantcostserver/BUILD.bazel +++ b/pkg/ccl/multitenantccl/tenantcostserver/BUILD.bazel @@ -44,7 +44,10 @@ go_test( "main_test.go", "server_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":tenantcostserver"], tags = ["ccl_test"], diff --git a/pkg/ccl/multitenantccl/tenantcostserver/tenanttokenbucket/BUILD.bazel b/pkg/ccl/multitenantccl/tenantcostserver/tenanttokenbucket/BUILD.bazel index e0959a2db560..015fc4e6a3ed 100644 --- a/pkg/ccl/multitenantccl/tenantcostserver/tenanttokenbucket/BUILD.bazel +++ b/pkg/ccl/multitenantccl/tenantcostserver/tenanttokenbucket/BUILD.bazel @@ -16,7 +16,10 @@ go_library( go_test( name = "tenanttokenbucket_test", srcs = ["tenant_token_bucket_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":tenanttokenbucket"], tags = ["ccl_test"], diff --git a/pkg/ccl/oidcccl/BUILD.bazel b/pkg/ccl/oidcccl/BUILD.bazel index 6ea239af1410..53dade3d76b0 100644 --- a/pkg/ccl/oidcccl/BUILD.bazel +++ b/pkg/ccl/oidcccl/BUILD.bazel @@ -38,7 +38,10 @@ go_test( "main_test.go", "settings_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":oidcccl"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/partitionccl/BUILD.bazel b/pkg/ccl/partitionccl/BUILD.bazel index 19f27e678b1a..5f258769f4d3 100644 --- a/pkg/ccl/partitionccl/BUILD.bazel +++ b/pkg/ccl/partitionccl/BUILD.bazel @@ -40,7 +40,10 @@ go_test( "scrub_test.go", "zone_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":partitionccl"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/schemachangerccl/BUILD.bazel b/pkg/ccl/schemachangerccl/BUILD.bazel index 6d461d49550c..5a82bfe79aef 100644 --- a/pkg/ccl/schemachangerccl/BUILD.bazel +++ b/pkg/ccl/schemachangerccl/BUILD.bazel @@ -12,7 +12,10 @@ go_test( ":test_gen_backup_non_ccl", # keep ":test_gen_ccl", # keep ], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = glob(["testdata/**"]) + [ "//pkg/sql/schemachanger:testdata", ], diff --git a/pkg/ccl/serverccl/BUILD.bazel b/pkg/ccl/serverccl/BUILD.bazel index 2a097ba8e15f..7d41013a0888 100644 --- a/pkg/ccl/serverccl/BUILD.bazel +++ b/pkg/ccl/serverccl/BUILD.bazel @@ -44,7 +44,10 @@ go_test( "tenant_migration_test.go", "tenant_vars_test.go", ], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = glob(["testdata/**"]), embed = [":serverccl"], tags = ["ccl_test"], diff --git a/pkg/ccl/serverccl/adminccl/BUILD.bazel b/pkg/ccl/serverccl/adminccl/BUILD.bazel index ed87cca8df37..449e22290033 100644 --- a/pkg/ccl/serverccl/adminccl/BUILD.bazel +++ b/pkg/ccl/serverccl/adminccl/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "main_test.go", "tenant_admin_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), tags = ["ccl_test"], deps = [ "//pkg/ccl", diff --git a/pkg/ccl/serverccl/diagnosticsccl/BUILD.bazel b/pkg/ccl/serverccl/diagnosticsccl/BUILD.bazel index 039e6f6a8e2c..f2e89252e68a 100644 --- a/pkg/ccl/serverccl/diagnosticsccl/BUILD.bazel +++ b/pkg/ccl/serverccl/diagnosticsccl/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "main_test.go", "reporter_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), tags = ["ccl_test"], deps = [ "//pkg/base", diff --git a/pkg/ccl/serverccl/statusccl/BUILD.bazel b/pkg/ccl/serverccl/statusccl/BUILD.bazel index cd963670ea93..afe111b2d3de 100644 --- a/pkg/ccl/serverccl/statusccl/BUILD.bazel +++ b/pkg/ccl/serverccl/statusccl/BUILD.bazel @@ -8,7 +8,10 @@ go_test( "tenant_grpc_test.go", "tenant_status_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), tags = ["ccl_test"], deps = [ "//pkg/base", diff --git a/pkg/ccl/spanconfigccl/spanconfigkvaccessorccl/BUILD.bazel b/pkg/ccl/spanconfigccl/spanconfigkvaccessorccl/BUILD.bazel index 64249e7e64da..1c896108e597 100644 --- a/pkg/ccl/spanconfigccl/spanconfigkvaccessorccl/BUILD.bazel +++ b/pkg/ccl/spanconfigccl/spanconfigkvaccessorccl/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "kvaccessor_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), tags = ["ccl_test"], deps = [ "//pkg/base", diff --git a/pkg/ccl/spanconfigccl/spanconfiglimiterccl/BUILD.bazel b/pkg/ccl/spanconfigccl/spanconfiglimiterccl/BUILD.bazel index 8af29a56e44d..74d25b751723 100644 --- a/pkg/ccl/spanconfigccl/spanconfiglimiterccl/BUILD.bazel +++ b/pkg/ccl/spanconfigccl/spanconfiglimiterccl/BUILD.bazel @@ -8,7 +8,10 @@ go_test( "drop_table_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/spanconfigccl/spanconfigreconcilerccl/BUILD.bazel b/pkg/ccl/spanconfigccl/spanconfigreconcilerccl/BUILD.bazel index 899788343732..851f5ceda850 100644 --- a/pkg/ccl/spanconfigccl/spanconfigreconcilerccl/BUILD.bazel +++ b/pkg/ccl/spanconfigccl/spanconfigreconcilerccl/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "datadriven_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/spanconfigccl/spanconfigsplitterccl/BUILD.bazel b/pkg/ccl/spanconfigccl/spanconfigsplitterccl/BUILD.bazel index 0df97faae20a..6a7c7a2c1a22 100644 --- a/pkg/ccl/spanconfigccl/spanconfigsplitterccl/BUILD.bazel +++ b/pkg/ccl/spanconfigccl/spanconfigsplitterccl/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "datadriven_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/spanconfigccl/spanconfigsqltranslatorccl/BUILD.bazel b/pkg/ccl/spanconfigccl/spanconfigsqltranslatorccl/BUILD.bazel index a1978198e613..e4e111cd58ef 100644 --- a/pkg/ccl/spanconfigccl/spanconfigsqltranslatorccl/BUILD.bazel +++ b/pkg/ccl/spanconfigccl/spanconfigsqltranslatorccl/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "datadriven_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/spanconfigccl/spanconfigsqlwatcherccl/BUILD.bazel b/pkg/ccl/spanconfigccl/spanconfigsqlwatcherccl/BUILD.bazel index bb1430ea6617..edbb6fc37480 100644 --- a/pkg/ccl/spanconfigccl/spanconfigsqlwatcherccl/BUILD.bazel +++ b/pkg/ccl/spanconfigccl/spanconfigsqlwatcherccl/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "main_test.go", "sqlwatcher_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), tags = ["ccl_test"], deps = [ "//pkg/base", diff --git a/pkg/ccl/sqlitelogictestccl/BUILD.bazel b/pkg/ccl/sqlitelogictestccl/BUILD.bazel index c0526c7ad3c9..b83e3a9dc198 100644 --- a/pkg/ccl/sqlitelogictestccl/BUILD.bazel +++ b/pkg/ccl/sqlitelogictestccl/BUILD.bazel @@ -12,7 +12,10 @@ go_test( name = "sqlitelogictestccl_test", size = "small", srcs = ["doc_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = [ "@com_github_cockroachdb_sqllogictest//:testfiles", ], diff --git a/pkg/ccl/sqlproxyccl/BUILD.bazel b/pkg/ccl/sqlproxyccl/BUILD.bazel index 89e77abe4ab4..1419354ad0de 100644 --- a/pkg/ccl/sqlproxyccl/BUILD.bazel +++ b/pkg/ccl/sqlproxyccl/BUILD.bazel @@ -74,7 +74,10 @@ go_test( "proxy_handler_test.go", "server_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":sqlproxyccl"], tags = ["ccl_test"], diff --git a/pkg/ccl/sqlproxyccl/acl/BUILD.bazel b/pkg/ccl/sqlproxyccl/acl/BUILD.bazel index d001250e9fd1..49aa0ae78728 100644 --- a/pkg/ccl/sqlproxyccl/acl/BUILD.bazel +++ b/pkg/ccl/sqlproxyccl/acl/BUILD.bazel @@ -29,7 +29,10 @@ go_test( "file_test.go", "watcher_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":acl"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/sqlproxyccl/balancer/BUILD.bazel b/pkg/ccl/sqlproxyccl/balancer/BUILD.bazel index 8d896e33641a..e2241da9a5f6 100644 --- a/pkg/ccl/sqlproxyccl/balancer/BUILD.bazel +++ b/pkg/ccl/sqlproxyccl/balancer/BUILD.bazel @@ -36,7 +36,10 @@ go_test( "conn_tracker_test.go", "pod_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":balancer"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/sqlproxyccl/interceptor/BUILD.bazel b/pkg/ccl/sqlproxyccl/interceptor/BUILD.bazel index a45ac50dfe42..decaeba1723d 100644 --- a/pkg/ccl/sqlproxyccl/interceptor/BUILD.bazel +++ b/pkg/ccl/sqlproxyccl/interceptor/BUILD.bazel @@ -30,7 +30,10 @@ go_test( "interceptor_test.go", "pg_conn_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":interceptor"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/sqlproxyccl/tenant/BUILD.bazel b/pkg/ccl/sqlproxyccl/tenant/BUILD.bazel index 37b2620c054a..2f08a89e9248 100644 --- a/pkg/ccl/sqlproxyccl/tenant/BUILD.bazel +++ b/pkg/ccl/sqlproxyccl/tenant/BUILD.bazel @@ -53,7 +53,10 @@ go_test( "entry_test.go", "main_test.go", ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), embed = [":tenant"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/sqlproxyccl/throttler/BUILD.bazel b/pkg/ccl/sqlproxyccl/throttler/BUILD.bazel index ea4eb23774d0..186e5bffe7ad 100644 --- a/pkg/ccl/sqlproxyccl/throttler/BUILD.bazel +++ b/pkg/ccl/sqlproxyccl/throttler/BUILD.bazel @@ -24,7 +24,10 @@ go_test( "local_test.go", "throttle_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":throttler"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/storageccl/BUILD.bazel b/pkg/ccl/storageccl/BUILD.bazel index 75de3b6a0fa3..949065a38902 100644 --- a/pkg/ccl/storageccl/BUILD.bazel +++ b/pkg/ccl/storageccl/BUILD.bazel @@ -33,7 +33,10 @@ go_test( "external_sst_reader_test.go", "main_test.go", ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), embed = [":storageccl"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/storageccl/engineccl/BUILD.bazel b/pkg/ccl/storageccl/engineccl/BUILD.bazel index fddb73b09496..71b74defd25d 100644 --- a/pkg/ccl/storageccl/engineccl/BUILD.bazel +++ b/pkg/ccl/storageccl/engineccl/BUILD.bazel @@ -36,7 +36,10 @@ go_test( "main_test.go", "pebble_key_manager_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":engineccl"], tags = ["ccl_test"], diff --git a/pkg/ccl/streamingccl/replicationutils/BUILD.bazel b/pkg/ccl/streamingccl/replicationutils/BUILD.bazel index 245998559a6d..47cc4cc48408 100644 --- a/pkg/ccl/streamingccl/replicationutils/BUILD.bazel +++ b/pkg/ccl/streamingccl/replicationutils/BUILD.bazel @@ -26,7 +26,10 @@ go_library( go_test( name = "replicationutils_test", srcs = ["utils_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":replicationutils"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/streamingccl/streamclient/BUILD.bazel b/pkg/ccl/streamingccl/streamclient/BUILD.bazel index 5b28719d6cc5..30a2889c8c20 100644 --- a/pkg/ccl/streamingccl/streamclient/BUILD.bazel +++ b/pkg/ccl/streamingccl/streamclient/BUILD.bazel @@ -49,7 +49,10 @@ go_test( "main_test.go", "partitioned_stream_client_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":streamclient"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/streamingccl/streamingest/BUILD.bazel b/pkg/ccl/streamingccl/streamingest/BUILD.bazel index c4306a2229a8..5b274e22d585 100644 --- a/pkg/ccl/streamingccl/streamingest/BUILD.bazel +++ b/pkg/ccl/streamingccl/streamingest/BUILD.bazel @@ -93,7 +93,10 @@ go_test( "stream_ingestion_job_test.go", "stream_ingestion_processor_test.go", ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), data = glob(["testdata/**"]), embed = [":streamingest"], tags = ["ccl_test"], diff --git a/pkg/ccl/streamingccl/streamproducer/BUILD.bazel b/pkg/ccl/streamingccl/streamproducer/BUILD.bazel index 5e075382158b..97fca0d6afbb 100644 --- a/pkg/ccl/streamingccl/streamproducer/BUILD.bazel +++ b/pkg/ccl/streamingccl/streamproducer/BUILD.bazel @@ -64,7 +64,10 @@ go_test( "replication_manager_test.go", "replication_stream_test.go", ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), embed = [":streamproducer"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/telemetryccl/BUILD.bazel b/pkg/ccl/telemetryccl/BUILD.bazel index 1d9319e103e7..bd4ea563f893 100644 --- a/pkg/ccl/telemetryccl/BUILD.bazel +++ b/pkg/ccl/telemetryccl/BUILD.bazel @@ -8,7 +8,10 @@ go_test( "telemetry_logging_test.go", "telemetry_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), shard_count = 16, tags = ["ccl_test"], diff --git a/pkg/ccl/testccl/authccl/BUILD.bazel b/pkg/ccl/testccl/authccl/BUILD.bazel index 8f9b8512979f..66bc4cb8c504 100644 --- a/pkg/ccl/testccl/authccl/BUILD.bazel +++ b/pkg/ccl/testccl/authccl/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "auth_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/testccl/sqlccl/BUILD.bazel b/pkg/ccl/testccl/sqlccl/BUILD.bazel index 328f6e91de8a..6bcfbc4018e3 100644 --- a/pkg/ccl/testccl/sqlccl/BUILD.bazel +++ b/pkg/ccl/testccl/sqlccl/BUILD.bazel @@ -14,7 +14,10 @@ go_test( "temp_table_clean_test.go", "tenant_gc_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = [ "//c-deps:libgeos", # keep ], diff --git a/pkg/ccl/testccl/sqlstatsccl/BUILD.bazel b/pkg/ccl/testccl/sqlstatsccl/BUILD.bazel index b6539481c6a2..f45ae2e242bd 100644 --- a/pkg/ccl/testccl/sqlstatsccl/BUILD.bazel +++ b/pkg/ccl/testccl/sqlstatsccl/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "main_test.go", "sql_stats_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), tags = ["ccl_test"], deps = [ "//pkg/base", diff --git a/pkg/ccl/testccl/workload/schemachange/BUILD.bazel b/pkg/ccl/testccl/workload/schemachange/BUILD.bazel index 4730bd30bed5..ccaba132b022 100644 --- a/pkg/ccl/testccl/workload/schemachange/BUILD.bazel +++ b/pkg/ccl/testccl/workload/schemachange/BUILD.bazel @@ -8,7 +8,10 @@ go_test( "main_test.go", "schema_change_external_test.go", ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), data = [ "//c-deps:libgeos", ], diff --git a/pkg/ccl/utilccl/BUILD.bazel b/pkg/ccl/utilccl/BUILD.bazel index 5309ba159a30..d685df1f8881 100644 --- a/pkg/ccl/utilccl/BUILD.bazel +++ b/pkg/ccl/utilccl/BUILD.bazel @@ -37,7 +37,10 @@ go_test( "license_test.go", "main_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":utilccl"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/utilccl/sampledataccl/BUILD.bazel b/pkg/ccl/utilccl/sampledataccl/BUILD.bazel index 66cc68c40608..7071d705632a 100644 --- a/pkg/ccl/utilccl/sampledataccl/BUILD.bazel +++ b/pkg/ccl/utilccl/sampledataccl/BUILD.bazel @@ -18,7 +18,10 @@ go_test( name = "sampledataccl_test", size = "small", srcs = ["main_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":sampledataccl"], tags = ["ccl_test"], deps = [ diff --git a/pkg/ccl/workloadccl/BUILD.bazel b/pkg/ccl/workloadccl/BUILD.bazel index f8006349a743..5e13f2efceac 100644 --- a/pkg/ccl/workloadccl/BUILD.bazel +++ b/pkg/ccl/workloadccl/BUILD.bazel @@ -36,7 +36,10 @@ go_test( "fixture_test.go", "main_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), tags = ["ccl_test"], deps = [ ":workloadccl", diff --git a/pkg/ccl/workloadccl/allccl/BUILD.bazel b/pkg/ccl/workloadccl/allccl/BUILD.bazel index 357fa0714e5e..a92a79e7d9f1 100644 --- a/pkg/ccl/workloadccl/allccl/BUILD.bazel +++ b/pkg/ccl/workloadccl/allccl/BUILD.bazel @@ -43,7 +43,10 @@ go_test( "all_test.go", "main_test.go", ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), embed = [":allccl"], shard_count = 16, tags = ["ccl_test"], diff --git a/pkg/cli/BUILD.bazel b/pkg/cli/BUILD.bazel index d4d519eb20a8..9774833c22f4 100644 --- a/pkg/cli/BUILD.bazel +++ b/pkg/cli/BUILD.bazel @@ -345,7 +345,10 @@ go_test( "zip_tenant_test.go", "zip_test.go", ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), data = glob(["testdata/**"]), embed = [":cli"], shard_count = 16, diff --git a/pkg/cli/clierror/BUILD.bazel b/pkg/cli/clierror/BUILD.bazel index 41da312deba9..69947b0a529b 100644 --- a/pkg/cli/clierror/BUILD.bazel +++ b/pkg/cli/clierror/BUILD.bazel @@ -31,7 +31,10 @@ go_test( "main_test.go", "syntax_error_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":clierror"], deps = [ "//pkg/build", diff --git a/pkg/cli/clisqlclient/BUILD.bazel b/pkg/cli/clisqlclient/BUILD.bazel index b664819361ef..de374e13f516 100644 --- a/pkg/cli/clisqlclient/BUILD.bazel +++ b/pkg/cli/clisqlclient/BUILD.bazel @@ -46,7 +46,10 @@ go_test( "parse_bool_test.go", "string_to_duration_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":clisqlclient"], deps = [ "//pkg/build", diff --git a/pkg/cli/clisqlexec/BUILD.bazel b/pkg/cli/clisqlexec/BUILD.bazel index bd1dcb92ef1b..b5dd5ef639aa 100644 --- a/pkg/cli/clisqlexec/BUILD.bazel +++ b/pkg/cli/clisqlexec/BUILD.bazel @@ -38,7 +38,10 @@ go_test( "main_test.go", "run_query_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":clisqlexec"], deps = [ "//pkg/build", diff --git a/pkg/cli/clisqlshell/BUILD.bazel b/pkg/cli/clisqlshell/BUILD.bazel index f5cceb24007f..c34c569f3a35 100644 --- a/pkg/cli/clisqlshell/BUILD.bazel +++ b/pkg/cli/clisqlshell/BUILD.bazel @@ -59,7 +59,10 @@ go_test( "sql_internal_test.go", "sql_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":clisqlshell"], deps = [ diff --git a/pkg/cli/democluster/BUILD.bazel b/pkg/cli/democluster/BUILD.bazel index 445c7058a842..e660baff2068 100644 --- a/pkg/cli/democluster/BUILD.bazel +++ b/pkg/cli/democluster/BUILD.bazel @@ -65,7 +65,10 @@ go_library( go_test( name = "democluster_test", srcs = ["demo_cluster_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":democluster"], shard_count = 16, deps = [ diff --git a/pkg/cli/exit/BUILD.bazel b/pkg/cli/exit/BUILD.bazel index 1cf8f32fd070..c88e039b8ca1 100644 --- a/pkg/cli/exit/BUILD.bazel +++ b/pkg/cli/exit/BUILD.bazel @@ -17,7 +17,10 @@ go_test( name = "exit_test", size = "small", srcs = ["codes_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":exit"], ) diff --git a/pkg/cloud/amazon/BUILD.bazel b/pkg/cloud/amazon/BUILD.bazel index e94123da7ad3..345e2a3213bf 100644 --- a/pkg/cloud/amazon/BUILD.bazel +++ b/pkg/cloud/amazon/BUILD.bazel @@ -51,7 +51,10 @@ go_test( "aws_kms_test.go", "s3_storage_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":amazon"], deps = [ "//pkg/base", diff --git a/pkg/cloud/azure/BUILD.bazel b/pkg/cloud/azure/BUILD.bazel index eaaaaf01a3a9..edef611fffc9 100644 --- a/pkg/cloud/azure/BUILD.bazel +++ b/pkg/cloud/azure/BUILD.bazel @@ -44,7 +44,10 @@ go_test( "azure_kms_test.go", "azure_storage_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":azure"], deps = [ "//pkg/base", diff --git a/pkg/cloud/gcp/BUILD.bazel b/pkg/cloud/gcp/BUILD.bazel index 6158b88a13e8..ddec977eb568 100644 --- a/pkg/cloud/gcp/BUILD.bazel +++ b/pkg/cloud/gcp/BUILD.bazel @@ -49,7 +49,10 @@ go_test( "gcp_kms_test.go", "gcs_storage_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":gcp"], deps = [ "//pkg/base", diff --git a/pkg/cloud/httpsink/BUILD.bazel b/pkg/cloud/httpsink/BUILD.bazel index 036d425276ef..d8bf3a445882 100644 --- a/pkg/cloud/httpsink/BUILD.bazel +++ b/pkg/cloud/httpsink/BUILD.bazel @@ -23,7 +23,10 @@ go_library( go_test( name = "httpsink_test", srcs = ["http_storage_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":httpsink"], deps = [ "//pkg/base", diff --git a/pkg/cloud/impl/cloudimpltests/BUILD.bazel b/pkg/cloud/impl/cloudimpltests/BUILD.bazel index 176083af849c..b749cebc9b37 100644 --- a/pkg/cloud/impl/cloudimpltests/BUILD.bazel +++ b/pkg/cloud/impl/cloudimpltests/BUILD.bazel @@ -4,7 +4,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test") go_test( name = "cloudimpltests_test", srcs = ["main_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ "//pkg/security/securityassets", "//pkg/security/securitytest", diff --git a/pkg/cloud/nodelocal/BUILD.bazel b/pkg/cloud/nodelocal/BUILD.bazel index 6a5634ad663c..d189c4d8bb01 100644 --- a/pkg/cloud/nodelocal/BUILD.bazel +++ b/pkg/cloud/nodelocal/BUILD.bazel @@ -31,7 +31,10 @@ go_library( go_test( name = "nodelocal_test", srcs = ["nodelocal_storage_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":nodelocal"], deps = [ "//pkg/cloud/cloudtestutils", diff --git a/pkg/cloud/nullsink/BUILD.bazel b/pkg/cloud/nullsink/BUILD.bazel index a5d1d229f18d..e4526bbab520 100644 --- a/pkg/cloud/nullsink/BUILD.bazel +++ b/pkg/cloud/nullsink/BUILD.bazel @@ -19,7 +19,10 @@ go_library( go_test( name = "nullsink_test", srcs = ["nullsink_storage_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":nullsink"], deps = [ "//pkg/base", diff --git a/pkg/cloud/userfile/BUILD.bazel b/pkg/cloud/userfile/BUILD.bazel index ec5912d68ec2..fa6a191ce082 100644 --- a/pkg/cloud/userfile/BUILD.bazel +++ b/pkg/cloud/userfile/BUILD.bazel @@ -32,7 +32,10 @@ go_test( "file_table_storage_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":userfile"], deps = [ "//pkg/base", diff --git a/pkg/cloud/userfile/filetable/filetabletest/BUILD.bazel b/pkg/cloud/userfile/filetable/filetabletest/BUILD.bazel index 422ea496e8b2..e754ab248d28 100644 --- a/pkg/cloud/userfile/filetable/filetabletest/BUILD.bazel +++ b/pkg/cloud/userfile/filetable/filetabletest/BUILD.bazel @@ -8,7 +8,10 @@ go_test( "file_table_read_writer_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ "//pkg/cloud/userfile/filetable", "//pkg/kv", diff --git a/pkg/clusterversion/BUILD.bazel b/pkg/clusterversion/BUILD.bazel index 62c901b701b3..d6e10b47914a 100644 --- a/pkg/clusterversion/BUILD.bazel +++ b/pkg/clusterversion/BUILD.bazel @@ -38,7 +38,10 @@ go_test( "cockroach_versions_test.go", "setting_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":clusterversion"], deps = [ "//pkg/roachpb", diff --git a/pkg/cmd/bazci/githubpost/BUILD.bazel b/pkg/cmd/bazci/githubpost/BUILD.bazel index b6fbc699f880..649ae29aec51 100644 --- a/pkg/cmd/bazci/githubpost/BUILD.bazel +++ b/pkg/cmd/bazci/githubpost/BUILD.bazel @@ -20,7 +20,10 @@ go_test( name = "githubpost_test", size = "small", srcs = ["githubpost_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]) + [ "//:TEAMS.yaml", "//.github:CODEOWNERS", diff --git a/pkg/cmd/bazci/testfilter/BUILD.bazel b/pkg/cmd/bazci/testfilter/BUILD.bazel index 5a8e74d85fa3..bf120ad37e17 100644 --- a/pkg/cmd/bazci/testfilter/BUILD.bazel +++ b/pkg/cmd/bazci/testfilter/BUILD.bazel @@ -12,7 +12,10 @@ go_library( go_test( name = "testfilter_test", srcs = ["testfilter_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":testfilter"], deps = [ diff --git a/pkg/cmd/cmpconn/BUILD.bazel b/pkg/cmd/cmpconn/BUILD.bazel index e1a09babad90..1510200fc3d8 100644 --- a/pkg/cmd/cmpconn/BUILD.bazel +++ b/pkg/cmd/cmpconn/BUILD.bazel @@ -27,7 +27,10 @@ go_test( name = "cmpconn_test", size = "small", srcs = ["compare_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":cmpconn"], deps = [ "@com_github_cockroachdb_apd_v3//:apd", diff --git a/pkg/cmd/dev/BUILD.bazel b/pkg/cmd/dev/BUILD.bazel index 3bb5284a60fa..769dca8f6f39 100644 --- a/pkg/cmd/dev/BUILD.bazel +++ b/pkg/cmd/dev/BUILD.bazel @@ -51,7 +51,10 @@ go_test( "datadriven_test.go", "recorderdriven_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":dev_lib"], deps = [ diff --git a/pkg/cmd/docgen/extract/BUILD.bazel b/pkg/cmd/docgen/extract/BUILD.bazel index 9588426c7513..69703f0722fd 100644 --- a/pkg/cmd/docgen/extract/BUILD.bazel +++ b/pkg/cmd/docgen/extract/BUILD.bazel @@ -22,7 +22,10 @@ go_test( name = "extract_test", size = "small", srcs = ["extract_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":extract"], ) diff --git a/pkg/cmd/docs-issue-generation/BUILD.bazel b/pkg/cmd/docs-issue-generation/BUILD.bazel index 8277e2bdcba1..e6e2cbe84b4b 100644 --- a/pkg/cmd/docs-issue-generation/BUILD.bazel +++ b/pkg/cmd/docs-issue-generation/BUILD.bazel @@ -25,7 +25,10 @@ go_test( name = "docs-issue-generation_test", size = "small", srcs = ["docs_issue_generation_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":docs-issue-generation_lib"], deps = [ diff --git a/pkg/cmd/generate-bazel-extra/BUILD.bazel b/pkg/cmd/generate-bazel-extra/BUILD.bazel index 2e936ed0c80e..607d14028312 100644 --- a/pkg/cmd/generate-bazel-extra/BUILD.bazel +++ b/pkg/cmd/generate-bazel-extra/BUILD.bazel @@ -19,7 +19,10 @@ go_test( name = "generate-bazel-extra_test", size = "small", srcs = ["main_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":generate-bazel-extra_lib"], deps = [ diff --git a/pkg/cmd/generate-bazel-extra/main.go b/pkg/cmd/generate-bazel-extra/main.go index d5edbf3f1443..f2c33fcabbe6 100644 --- a/pkg/cmd/generate-bazel-extra/main.go +++ b/pkg/cmd/generate-bazel-extra/main.go @@ -32,6 +32,12 @@ var ( "large": 900, "enormous": 3600, } + testSizeToCiTimeout = map[string]int{ + "small": 60, + "medium": 300, + "large": 900, + "enormous": 900, + } ) func runBuildozer(args []string) { @@ -262,6 +268,14 @@ test_suite( fmt.Fprintln(w, ` unused_checker(srcs = GET_X_DATA_TARGETS)`) + fmt.Fprintln(w, ` +config_setting( + name = "use_ci_timeouts", + values = { + "define": "use_ci_timeouts=true" + } +)`) + // Use buildozer to add the get_x_data target wherever it is relevant. // NB: We expect buildozer to have been built by build/bazelutil/bazel-generate.sh. @@ -338,7 +352,7 @@ func generateTestsTimeouts() { if err != nil { log.Fatal(err) } - for size, timeout := range testSizeToDefaultTimeout { + for size, defaultTimeout := range testSizeToDefaultTimeout { if size == "enormous" { // Exclude really enormous targets since they have a custom timeout that // exceeds the default 1h. @@ -350,7 +364,7 @@ func generateTestsTimeouts() { // to the next size because it shouldn't be passing at the edge of its deadline // anyways to avoid flakiness. runBuildozer(append([]string{ - fmt.Sprintf(`set args "-test.timeout=%ds"`, timeout-5)}, + fmt.Sprintf(`set_select args //pkg:use_ci_timeouts "-test.timeout=%ds" //conditions:default "-test.timeout=%ds"`, testSizeToCiTimeout[size]-5, defaultTimeout-5)}, targets[size]..., )) } diff --git a/pkg/cmd/github-pull-request-make/BUILD.bazel b/pkg/cmd/github-pull-request-make/BUILD.bazel index 55cb867f01a0..f8bc486ef8e2 100644 --- a/pkg/cmd/github-pull-request-make/BUILD.bazel +++ b/pkg/cmd/github-pull-request-make/BUILD.bazel @@ -23,7 +23,10 @@ go_test( name = "github-pull-request-make_test", size = "small", srcs = ["main_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":github-pull-request-make_lib"], deps = [ diff --git a/pkg/cmd/internal/issues/BUILD.bazel b/pkg/cmd/internal/issues/BUILD.bazel index 1e667cdc4016..82c352ce77ee 100644 --- a/pkg/cmd/internal/issues/BUILD.bazel +++ b/pkg/cmd/internal/issues/BUILD.bazel @@ -28,7 +28,10 @@ go_test( "issues_test.go", "render_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":issues"], deps = [ diff --git a/pkg/cmd/label-merged-pr/BUILD.bazel b/pkg/cmd/label-merged-pr/BUILD.bazel index 3458d05044f7..1c13bd2c3664 100644 --- a/pkg/cmd/label-merged-pr/BUILD.bazel +++ b/pkg/cmd/label-merged-pr/BUILD.bazel @@ -17,7 +17,10 @@ go_binary( go_test( name = "label-merged-pr_test", srcs = ["main_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":label-merged-pr_lib"], deps = [ "//pkg/testutils/skip", diff --git a/pkg/cmd/mirror/go/BUILD.bazel b/pkg/cmd/mirror/go/BUILD.bazel index ee2d69aac4c9..584b3ad8266e 100644 --- a/pkg/cmd/mirror/go/BUILD.bazel +++ b/pkg/cmd/mirror/go/BUILD.bazel @@ -32,7 +32,10 @@ go_binary( go_test( name = "mirror_test", srcs = ["mirror_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":mirror_lib"], deps = ["@com_github_stretchr_testify//require"], ) @@ -55,7 +58,10 @@ go_library( go_test( name = "go_test", srcs = ["mirror_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":go_lib"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/cmd/prereqs/BUILD.bazel b/pkg/cmd/prereqs/BUILD.bazel index d1c49e5368cb..349a6f44abf5 100644 --- a/pkg/cmd/prereqs/BUILD.bazel +++ b/pkg/cmd/prereqs/BUILD.bazel @@ -19,7 +19,10 @@ go_test( name = "prereqs_test", size = "small", srcs = ["prereqs_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":prereqs_lib"], tags = ["broken_in_bazel"], diff --git a/pkg/cmd/publish-artifacts/BUILD.bazel b/pkg/cmd/publish-artifacts/BUILD.bazel index 3aa398a93f5d..80421981d1cf 100644 --- a/pkg/cmd/publish-artifacts/BUILD.bazel +++ b/pkg/cmd/publish-artifacts/BUILD.bazel @@ -22,7 +22,10 @@ go_test( name = "publish-artifacts_test", size = "small", srcs = ["main_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":publish-artifacts_lib"], deps = [ "//pkg/release", diff --git a/pkg/cmd/publish-provisional-artifacts/BUILD.bazel b/pkg/cmd/publish-provisional-artifacts/BUILD.bazel index 32045927edde..6c39fbf5540f 100644 --- a/pkg/cmd/publish-provisional-artifacts/BUILD.bazel +++ b/pkg/cmd/publish-provisional-artifacts/BUILD.bazel @@ -23,7 +23,10 @@ go_test( name = "publish-provisional-artifacts_test", size = "small", srcs = ["main_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":publish-provisional-artifacts_lib"], deps = [ "//pkg/release", diff --git a/pkg/cmd/reduce/reduce/BUILD.bazel b/pkg/cmd/reduce/reduce/BUILD.bazel index 975e7bd644a0..ba416f3307cb 100644 --- a/pkg/cmd/reduce/reduce/BUILD.bazel +++ b/pkg/cmd/reduce/reduce/BUILD.bazel @@ -22,7 +22,10 @@ go_test( name = "reduce_test", size = "small", srcs = ["reduce_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), deps = [":reduce"], ) diff --git a/pkg/cmd/reduce/reduce/reducesql/BUILD.bazel b/pkg/cmd/reduce/reduce/reducesql/BUILD.bazel index 08a89ddf64f6..9829b2efb6f8 100644 --- a/pkg/cmd/reduce/reduce/reducesql/BUILD.bazel +++ b/pkg/cmd/reduce/reduce/reducesql/BUILD.bazel @@ -22,7 +22,10 @@ go_test( "main_test.go", "reducesql_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), deps = [ ":reducesql", diff --git a/pkg/cmd/release/BUILD.bazel b/pkg/cmd/release/BUILD.bazel index 359278ca4271..8ea0653c65b6 100644 --- a/pkg/cmd/release/BUILD.bazel +++ b/pkg/cmd/release/BUILD.bazel @@ -46,7 +46,10 @@ go_test( "roachtest_predecessors_test.go", "sender_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob([ "templates/**", "testdata/**", diff --git a/pkg/cmd/roachprod-microbench/BUILD.bazel b/pkg/cmd/roachprod-microbench/BUILD.bazel index c3a59227a866..c71bdc03f757 100644 --- a/pkg/cmd/roachprod-microbench/BUILD.bazel +++ b/pkg/cmd/roachprod-microbench/BUILD.bazel @@ -42,7 +42,10 @@ go_test( "benchmark_test.go", "compare_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":roachprod-microbench_lib"], deps = [ diff --git a/pkg/cmd/roachtest/BUILD.bazel b/pkg/cmd/roachtest/BUILD.bazel index 1dc5a1971dca..524f63713c77 100644 --- a/pkg/cmd/roachtest/BUILD.bazel +++ b/pkg/cmd/roachtest/BUILD.bazel @@ -76,7 +76,10 @@ go_test( "test_registry_test.go", "test_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":roachtest_lib"], deps = [ "//pkg/cmd/internal/issues", diff --git a/pkg/cmd/roachtest/clusterstats/BUILD.bazel b/pkg/cmd/roachtest/clusterstats/BUILD.bazel index e27bc5a8ea8e..d1cd6c6aa5e3 100644 --- a/pkg/cmd/roachtest/clusterstats/BUILD.bazel +++ b/pkg/cmd/roachtest/clusterstats/BUILD.bazel @@ -34,7 +34,10 @@ go_test( "streamer_test.go", ":clusterstats_mock", # keep ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":clusterstats"], deps = [ "//pkg/roachprod/logger", diff --git a/pkg/cmd/roachtest/option/BUILD.bazel b/pkg/cmd/roachtest/option/BUILD.bazel index 6289cff1c520..85853d1f9e90 100644 --- a/pkg/cmd/roachtest/option/BUILD.bazel +++ b/pkg/cmd/roachtest/option/BUILD.bazel @@ -21,7 +21,10 @@ go_library( go_test( name = "option_test", srcs = ["connection_options_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":option"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/cmd/roachtest/roachtestutil/BUILD.bazel b/pkg/cmd/roachtest/roachtestutil/BUILD.bazel index 9f1eee627a71..f1088239e6d9 100644 --- a/pkg/cmd/roachtest/roachtestutil/BUILD.bazel +++ b/pkg/cmd/roachtest/roachtestutil/BUILD.bazel @@ -28,7 +28,10 @@ go_library( go_test( name = "roachtestutil_test", srcs = ["commandbuilder_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":roachtestutil"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/cmd/roachtest/roachtestutil/mixedversion/BUILD.bazel b/pkg/cmd/roachtest/roachtestutil/mixedversion/BUILD.bazel index 96a0f5b8d998..e9c871d03b08 100644 --- a/pkg/cmd/roachtest/roachtestutil/mixedversion/BUILD.bazel +++ b/pkg/cmd/roachtest/roachtestutil/mixedversion/BUILD.bazel @@ -29,7 +29,10 @@ go_library( go_test( name = "mixedversion_test", srcs = ["planner_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":mixedversion"], deps = [ "//pkg/cmd/roachtest/cluster", diff --git a/pkg/cmd/roachtest/tests/BUILD.bazel b/pkg/cmd/roachtest/tests/BUILD.bazel index 7c3bb2eb7058..16d924d3a174 100644 --- a/pkg/cmd/roachtest/tests/BUILD.bazel +++ b/pkg/cmd/roachtest/tests/BUILD.bazel @@ -285,7 +285,10 @@ go_test( "util_load_group_test.go", ":mocks_drt", # keep ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":tests"], deps = [ "//pkg/cmd/roachtest/option", diff --git a/pkg/cmd/teamcity-trigger/BUILD.bazel b/pkg/cmd/teamcity-trigger/BUILD.bazel index 0927cdaaa246..6705b4c6a0ed 100644 --- a/pkg/cmd/teamcity-trigger/BUILD.bazel +++ b/pkg/cmd/teamcity-trigger/BUILD.bazel @@ -22,7 +22,10 @@ go_test( name = "teamcity-trigger_test", size = "small", srcs = ["main_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":teamcity-trigger_lib"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/col/coldata/BUILD.bazel b/pkg/col/coldata/BUILD.bazel index 13a02f037026..1173aea7e453 100644 --- a/pkg/col/coldata/BUILD.bazel +++ b/pkg/col/coldata/BUILD.bazel @@ -41,7 +41,10 @@ go_test( "nulls_test.go", "vec_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":coldata"], tags = ["no-remote"], # keep deps = [ diff --git a/pkg/col/coldataext/BUILD.bazel b/pkg/col/coldataext/BUILD.bazel index 1a98d29510fe..63444e8d0682 100644 --- a/pkg/col/coldataext/BUILD.bazel +++ b/pkg/col/coldataext/BUILD.bazel @@ -34,7 +34,10 @@ go_test( name = "coldataext_test", size = "small", srcs = ["datum_vec_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":coldataext"], deps = [ "//pkg/col/coldata", diff --git a/pkg/col/colserde/BUILD.bazel b/pkg/col/colserde/BUILD.bazel index 68f84e234818..95fc43c99a5f 100644 --- a/pkg/col/colserde/BUILD.bazel +++ b/pkg/col/colserde/BUILD.bazel @@ -39,7 +39,10 @@ go_test( "main_test.go", "record_batch_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":colserde", "//pkg/col/coldata", diff --git a/pkg/compose/BUILD.bazel b/pkg/compose/BUILD.bazel index 728201bdd5f0..f3528bb3dbef 100644 --- a/pkg/compose/BUILD.bazel +++ b/pkg/compose/BUILD.bazel @@ -11,7 +11,10 @@ go_library( go_test( name = "compose_test", srcs = ["compose_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = [ "//c-deps:libgeos", "//pkg/compose:compare/docker-compose.yml", diff --git a/pkg/compose/compare/compare/BUILD.bazel b/pkg/compose/compare/compare/BUILD.bazel index 9ac4cead8631..417e864dffc9 100644 --- a/pkg/compose/compare/compare/BUILD.bazel +++ b/pkg/compose/compare/compare/BUILD.bazel @@ -11,7 +11,10 @@ go_library( go_test( name = "compare_test", srcs = ["compare_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":compare"], gotags = ["compose"], tags = ["integration"], diff --git a/pkg/config/BUILD.bazel b/pkg/config/BUILD.bazel index 6d225eb93cf5..7cdf68ce9c06 100644 --- a/pkg/config/BUILD.bazel +++ b/pkg/config/BUILD.bazel @@ -41,7 +41,10 @@ go_test( "main_test.go", "system_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":config", "//pkg/config/zonepb", diff --git a/pkg/config/zonepb/BUILD.bazel b/pkg/config/zonepb/BUILD.bazel index 27e4cb79300f..e54020aa0f71 100644 --- a/pkg/config/zonepb/BUILD.bazel +++ b/pkg/config/zonepb/BUILD.bazel @@ -29,7 +29,10 @@ go_test( name = "zonepb_test", size = "small", srcs = ["zone_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":zonepb"], deps = [ "//pkg/keys", diff --git a/pkg/configprofiles/BUILD.bazel b/pkg/configprofiles/BUILD.bazel index ee3f7a07eb82..7b9bb122cd18 100644 --- a/pkg/configprofiles/BUILD.bazel +++ b/pkg/configprofiles/BUILD.bazel @@ -29,7 +29,10 @@ go_test( "main_test.go", "profiles_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]) + ["//c-deps:libgeos"], embed = [":configprofiles"], deps = [ diff --git a/pkg/geo/BUILD.bazel b/pkg/geo/BUILD.bazel index c4219041ee13..fe95d74fd05f 100644 --- a/pkg/geo/BUILD.bazel +++ b/pkg/geo/BUILD.bazel @@ -53,7 +53,10 @@ go_test( "latlng_test.go", "parse_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":geo"], deps = [ "//pkg/geo/geographiclib", diff --git a/pkg/geo/geogen/BUILD.bazel b/pkg/geo/geogen/BUILD.bazel index 011ee190d66e..03fa1fcd617d 100644 --- a/pkg/geo/geogen/BUILD.bazel +++ b/pkg/geo/geogen/BUILD.bazel @@ -19,7 +19,10 @@ go_test( name = "geogen_test", size = "small", srcs = ["geogen_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":geogen"], deps = [ "//pkg/geo/geopb", diff --git a/pkg/geo/geogfn/BUILD.bazel b/pkg/geo/geogfn/BUILD.bazel index 59c232b7e33a..06c00bff3801 100644 --- a/pkg/geo/geogfn/BUILD.bazel +++ b/pkg/geo/geogfn/BUILD.bazel @@ -49,7 +49,10 @@ go_test( "topology_operations_test.go", "unary_operators_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = ["//c-deps:libgeos"], embed = [":geogfn"], deps = [ diff --git a/pkg/geo/geographiclib/BUILD.bazel b/pkg/geo/geographiclib/BUILD.bazel index b4513fd0d02f..c884a92bcd81 100644 --- a/pkg/geo/geographiclib/BUILD.bazel +++ b/pkg/geo/geographiclib/BUILD.bazel @@ -26,7 +26,10 @@ go_test( name = "geographiclib_test", size = "small", srcs = ["geographiclib_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":geographiclib"], deps = [ "@com_github_golang_geo//s1", diff --git a/pkg/geo/geoindex/BUILD.bazel b/pkg/geo/geoindex/BUILD.bazel index 75eb3d9c0d24..d1cab58b1a2e 100644 --- a/pkg/geo/geoindex/BUILD.bazel +++ b/pkg/geo/geoindex/BUILD.bazel @@ -38,7 +38,10 @@ go_test( "s2_geometry_index_test.go", "utils_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]) + ["//c-deps:libgeos"], embed = [":geoindex"], deps = [ diff --git a/pkg/geo/geomfn/BUILD.bazel b/pkg/geo/geomfn/BUILD.bazel index 92b52c8eaa51..4bb317e1b763 100644 --- a/pkg/geo/geomfn/BUILD.bazel +++ b/pkg/geo/geomfn/BUILD.bazel @@ -101,7 +101,10 @@ go_test( "validity_check_test.go", "voronoi_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = ["//c-deps:libgeos"], embed = [":geomfn"], deps = [ diff --git a/pkg/geo/geopb/BUILD.bazel b/pkg/geo/geopb/BUILD.bazel index b557f5e94f1c..c9788348238b 100644 --- a/pkg/geo/geopb/BUILD.bazel +++ b/pkg/geo/geopb/BUILD.bazel @@ -34,7 +34,10 @@ go_proto_library( go_test( name = "geopb_test", srcs = ["types_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":geopb"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/geo/geoproj/BUILD.bazel b/pkg/geo/geoproj/BUILD.bazel index 6f123d3c6829..5528b4895e07 100644 --- a/pkg/geo/geoproj/BUILD.bazel +++ b/pkg/geo/geoproj/BUILD.bazel @@ -52,7 +52,10 @@ go_test( name = "geoproj_test", size = "small", srcs = ["geoproj_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":geoproj"], deps = [ "//pkg/geo/geoprojbase", diff --git a/pkg/geo/geoprojbase/BUILD.bazel b/pkg/geo/geoprojbase/BUILD.bazel index cf3df471e0cf..8fb08203d86e 100644 --- a/pkg/geo/geoprojbase/BUILD.bazel +++ b/pkg/geo/geoprojbase/BUILD.bazel @@ -25,7 +25,10 @@ go_test( name = "geoprojbase_test", size = "small", srcs = ["projections_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":geoprojbase", "//pkg/geo/geographiclib", diff --git a/pkg/geo/geos/BUILD.bazel b/pkg/geo/geos/BUILD.bazel index 3ce629414e82..73ebbf8f559b 100644 --- a/pkg/geo/geos/BUILD.bazel +++ b/pkg/geo/geos/BUILD.bazel @@ -68,7 +68,10 @@ go_test( name = "geos_test", size = "small", srcs = ["geos_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = ["//c-deps:libgeos"], embed = [":geos"], deps = [ diff --git a/pkg/geo/geotransform/BUILD.bazel b/pkg/geo/geotransform/BUILD.bazel index ba2ee78ad66d..f1bb52cc2f79 100644 --- a/pkg/geo/geotransform/BUILD.bazel +++ b/pkg/geo/geotransform/BUILD.bazel @@ -21,7 +21,10 @@ go_test( name = "geotransform_test", size = "small", srcs = ["geotransform_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":geotransform"], deps = [ "//pkg/geo/geopb", diff --git a/pkg/geo/twkb/BUILD.bazel b/pkg/geo/twkb/BUILD.bazel index 3339d5238b01..57f7420c41ff 100644 --- a/pkg/geo/twkb/BUILD.bazel +++ b/pkg/geo/twkb/BUILD.bazel @@ -16,7 +16,10 @@ go_library( go_test( name = "twkb_test", srcs = ["twkb_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":twkb"], deps = [ "@com_github_stretchr_testify//require", diff --git a/pkg/gossip/BUILD.bazel b/pkg/gossip/BUILD.bazel index 4d06c27969b6..1df5a11bbdb9 100644 --- a/pkg/gossip/BUILD.bazel +++ b/pkg/gossip/BUILD.bazel @@ -62,7 +62,10 @@ go_test( "storage_test.go", "util_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":gossip"], deps = [ "//pkg/base", diff --git a/pkg/internal/client/requestbatcher/BUILD.bazel b/pkg/internal/client/requestbatcher/BUILD.bazel index 2562f9f97e62..35d2422b33f0 100644 --- a/pkg/internal/client/requestbatcher/BUILD.bazel +++ b/pkg/internal/client/requestbatcher/BUILD.bazel @@ -21,7 +21,10 @@ go_test( name = "requestbatcher_test", size = "small", srcs = ["batcher_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":requestbatcher"], deps = [ "//pkg/kv/kvpb", diff --git a/pkg/internal/codeowners/BUILD.bazel b/pkg/internal/codeowners/BUILD.bazel index 62e1a434a31e..c32069237468 100644 --- a/pkg/internal/codeowners/BUILD.bazel +++ b/pkg/internal/codeowners/BUILD.bazel @@ -23,7 +23,10 @@ go_test( name = "codeowners_test", size = "small", srcs = ["codeowners_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = [ "//:TEAMS.yaml", "//.github:CODEOWNERS", diff --git a/pkg/internal/rsg/BUILD.bazel b/pkg/internal/rsg/BUILD.bazel index 7caff1947621..6afb906e9184 100644 --- a/pkg/internal/rsg/BUILD.bazel +++ b/pkg/internal/rsg/BUILD.bazel @@ -19,7 +19,10 @@ go_test( name = "rsg_test", size = "small", srcs = ["rsg_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":rsg"], ) diff --git a/pkg/internal/rsg/yacc/BUILD.bazel b/pkg/internal/rsg/yacc/BUILD.bazel index df58656dc73b..b41a7886c5aa 100644 --- a/pkg/internal/rsg/yacc/BUILD.bazel +++ b/pkg/internal/rsg/yacc/BUILD.bazel @@ -17,7 +17,10 @@ go_test( name = "yacc_test", size = "small", srcs = ["parse_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = ["//pkg/sql/parser:sql.y"], embed = [":yacc"], deps = [ diff --git a/pkg/internal/sqlsmith/BUILD.bazel b/pkg/internal/sqlsmith/BUILD.bazel index c15154a6724e..f3fe92a9eac8 100644 --- a/pkg/internal/sqlsmith/BUILD.bazel +++ b/pkg/internal/sqlsmith/BUILD.bazel @@ -51,7 +51,10 @@ go_test( "main_test.go", "sqlsmith_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = ["//c-deps:libgeos"], embed = [":sqlsmith"], deps = [ diff --git a/pkg/internal/team/BUILD.bazel b/pkg/internal/team/BUILD.bazel index 8a02095c12c0..ac916c739616 100644 --- a/pkg/internal/team/BUILD.bazel +++ b/pkg/internal/team/BUILD.bazel @@ -18,7 +18,10 @@ go_test( name = "team_test", size = "small", srcs = ["team_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = [ "//:TEAMS.yaml", ], diff --git a/pkg/jobs/BUILD.bazel b/pkg/jobs/BUILD.bazel index b33fa13675f0..40ca92bb51ee 100644 --- a/pkg/jobs/BUILD.bazel +++ b/pkg/jobs/BUILD.bazel @@ -101,7 +101,10 @@ go_test( "testutils_test.go", "update_test.go", ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), embed = [":jobs"], shard_count = 16, deps = [ diff --git a/pkg/jobs/joberror/BUILD.bazel b/pkg/jobs/joberror/BUILD.bazel index 1f3f4fac74d7..1ddc18cfd917 100644 --- a/pkg/jobs/joberror/BUILD.bazel +++ b/pkg/jobs/joberror/BUILD.bazel @@ -20,7 +20,10 @@ go_library( go_test( name = "joberror_test", srcs = ["errors_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":joberror"], deps = [ "//pkg/util/circuit", diff --git a/pkg/jobs/jobsauth/BUILD.bazel b/pkg/jobs/jobsauth/BUILD.bazel index 23984e6cd335..bb114a947e17 100644 --- a/pkg/jobs/jobsauth/BUILD.bazel +++ b/pkg/jobs/jobsauth/BUILD.bazel @@ -21,7 +21,10 @@ go_library( go_test( name = "jobsauth_test", srcs = ["authorization_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":jobsauth", "//pkg/ccl/changefeedccl", diff --git a/pkg/jobs/jobspb/BUILD.bazel b/pkg/jobs/jobspb/BUILD.bazel index 7e821431f20b..bdaf3bec5366 100644 --- a/pkg/jobs/jobspb/BUILD.bazel +++ b/pkg/jobs/jobspb/BUILD.bazel @@ -71,7 +71,10 @@ go_proto_library( go_test( name = "jobspb_test", srcs = ["wrap_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":jobspb", "@com_github_stretchr_testify//assert", diff --git a/pkg/jobs/jobsprofiler/BUILD.bazel b/pkg/jobs/jobsprofiler/BUILD.bazel index 31240a88f9a6..6c5ee5131865 100644 --- a/pkg/jobs/jobsprofiler/BUILD.bazel +++ b/pkg/jobs/jobsprofiler/BUILD.bazel @@ -25,7 +25,10 @@ go_test( "main_test.go", "profiler_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ "//pkg/base", "//pkg/ccl", diff --git a/pkg/jobs/jobsprotectedts/BUILD.bazel b/pkg/jobs/jobsprotectedts/BUILD.bazel index 1105b751bc20..8e90cbe885b1 100644 --- a/pkg/jobs/jobsprotectedts/BUILD.bazel +++ b/pkg/jobs/jobsprotectedts/BUILD.bazel @@ -36,7 +36,10 @@ go_test( "jobs_protected_ts_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ "//pkg/security/securityassets", "//pkg/security/securitytest", diff --git a/pkg/keys/BUILD.bazel b/pkg/keys/BUILD.bazel index 47513301d44c..634ff37ff39d 100644 --- a/pkg/keys/BUILD.bazel +++ b/pkg/keys/BUILD.bazel @@ -32,7 +32,10 @@ go_test( "printer_test.go", "sql_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":keys"], deps = [ "//pkg/kv/kvpb", diff --git a/pkg/keyvisualizer/spanstatsconsumer/BUILD.bazel b/pkg/keyvisualizer/spanstatsconsumer/BUILD.bazel index 224f605ecddd..a15431eedade 100644 --- a/pkg/keyvisualizer/spanstatsconsumer/BUILD.bazel +++ b/pkg/keyvisualizer/spanstatsconsumer/BUILD.bazel @@ -22,7 +22,10 @@ go_library( go_test( name = "spanstatsconsumer_test", srcs = ["span_stats_consumer_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":spanstatsconsumer"], deps = [ "//pkg/roachpb", diff --git a/pkg/kv/BUILD.bazel b/pkg/kv/BUILD.bazel index 84c1fb73f1fe..b193796eaa23 100644 --- a/pkg/kv/BUILD.bazel +++ b/pkg/kv/BUILD.bazel @@ -59,7 +59,10 @@ go_test( "txn_external_test.go", "txn_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":kv"], shard_count = 16, diff --git a/pkg/kv/bulk/BUILD.bazel b/pkg/kv/bulk/BUILD.bazel index 56c397e49de3..a504f93b1679 100644 --- a/pkg/kv/bulk/BUILD.bazel +++ b/pkg/kv/bulk/BUILD.bazel @@ -47,7 +47,10 @@ go_test( "main_test.go", "sst_batcher_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":bulk"], deps = [ "//pkg/base", diff --git a/pkg/kv/kvclient/BUILD.bazel b/pkg/kv/kvclient/BUILD.bazel index c916b7b36589..f23c63c2bd02 100644 --- a/pkg/kv/kvclient/BUILD.bazel +++ b/pkg/kv/kvclient/BUILD.bazel @@ -26,7 +26,10 @@ go_test( "main_test.go", "revision_reader_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":kvclient"], deps = [ "//pkg/base", diff --git a/pkg/kv/kvclient/kvcoord/BUILD.bazel b/pkg/kv/kvclient/kvcoord/BUILD.bazel index 2b7ca5245f6a..21464ecbf642 100644 --- a/pkg/kv/kvclient/kvcoord/BUILD.bazel +++ b/pkg/kv/kvclient/kvcoord/BUILD.bazel @@ -149,7 +149,10 @@ go_test( "txn_test.go", ":mock_kvcoord", # keep ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":kvcoord"], shard_count = 16, diff --git a/pkg/kv/kvclient/kvstreamer/BUILD.bazel b/pkg/kv/kvclient/kvstreamer/BUILD.bazel index 1ea44f8233c7..f1d43852f717 100644 --- a/pkg/kv/kvclient/kvstreamer/BUILD.bazel +++ b/pkg/kv/kvclient/kvstreamer/BUILD.bazel @@ -48,7 +48,10 @@ go_test( "streamer_disabled_test.go", "streamer_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":kvstreamer"], deps = [ "//pkg/base", diff --git a/pkg/kv/kvclient/kvtenant/BUILD.bazel b/pkg/kv/kvclient/kvtenant/BUILD.bazel index 6370ffd2d55e..0e33de7cadf8 100644 --- a/pkg/kv/kvclient/kvtenant/BUILD.bazel +++ b/pkg/kv/kvclient/kvtenant/BUILD.bazel @@ -60,7 +60,10 @@ go_test( "tenant_scan_range_descriptors_test.go", "tenant_trace_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":kvtenant"], deps = [ "//pkg/base", diff --git a/pkg/kv/kvclient/rangecache/BUILD.bazel b/pkg/kv/kvclient/rangecache/BUILD.bazel index b84278b53d1f..5bb9eb467a2f 100644 --- a/pkg/kv/kvclient/rangecache/BUILD.bazel +++ b/pkg/kv/kvclient/rangecache/BUILD.bazel @@ -29,7 +29,10 @@ go_test( name = "rangecache_test", size = "small", srcs = ["range_cache_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":rangecache"], deps = [ "//pkg/keys", diff --git a/pkg/kv/kvclient/rangefeed/BUILD.bazel b/pkg/kv/kvclient/rangefeed/BUILD.bazel index d63af6c55606..e16c06ada43c 100644 --- a/pkg/kv/kvclient/rangefeed/BUILD.bazel +++ b/pkg/kv/kvclient/rangefeed/BUILD.bazel @@ -63,7 +63,10 @@ go_test( "rangefeed_mock_test.go", ":mock_rangefeed", # keep ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":rangefeed"], deps = [ "//pkg/base", diff --git a/pkg/kv/kvclient/rangefeed/rangefeedbuffer/BUILD.bazel b/pkg/kv/kvclient/rangefeed/rangefeedbuffer/BUILD.bazel index 7cfff958e3a1..299f8f736d52 100644 --- a/pkg/kv/kvclient/rangefeed/rangefeedbuffer/BUILD.bazel +++ b/pkg/kv/kvclient/rangefeed/rangefeedbuffer/BUILD.bazel @@ -25,7 +25,10 @@ go_test( "buffer_test.go", "kvs_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":rangefeedbuffer"], deps = [ "//pkg/keys", diff --git a/pkg/kv/kvclient/rangefeed/rangefeedcache/BUILD.bazel b/pkg/kv/kvclient/rangefeed/rangefeedcache/BUILD.bazel index fef05221117c..0c2c73941268 100644 --- a/pkg/kv/kvclient/rangefeed/rangefeedcache/BUILD.bazel +++ b/pkg/kv/kvclient/rangefeed/rangefeedcache/BUILD.bazel @@ -32,7 +32,10 @@ go_test( "main_test.go", "watcher_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":rangefeedcache"], deps = [ "//pkg/base", diff --git a/pkg/kv/kvnemesis/BUILD.bazel b/pkg/kv/kvnemesis/BUILD.bazel index 8bee62dfc3bf..3ff15455fb28 100644 --- a/pkg/kv/kvnemesis/BUILD.bazel +++ b/pkg/kv/kvnemesis/BUILD.bazel @@ -67,7 +67,10 @@ go_test( "operations_test.go", "validator_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":kvnemesis"], deps = [ diff --git a/pkg/kv/kvnemesis/kvnemesisutil/BUILD.bazel b/pkg/kv/kvnemesis/kvnemesisutil/BUILD.bazel index e8cdabe98659..7c270697cf6a 100644 --- a/pkg/kv/kvnemesis/kvnemesisutil/BUILD.bazel +++ b/pkg/kv/kvnemesis/kvnemesisutil/BUILD.bazel @@ -11,8 +11,8 @@ go_library( "//build/toolchains:crdb_test": [":gen-crdb-test-on"], "//conditions:default": [":gen-crdb-test-off"], }) + [ - "seq.go", "context.go", + "seq.go", ], importpath = "github.com/cockroachdb/cockroach/pkg/kv/kvnemesis/kvnemesisutil", visibility = ["//visibility:public"], diff --git a/pkg/kv/kvpb/BUILD.bazel b/pkg/kv/kvpb/BUILD.bazel index 20faf18fd9c6..a94192fb228d 100644 --- a/pkg/kv/kvpb/BUILD.bazel +++ b/pkg/kv/kvpb/BUILD.bazel @@ -57,7 +57,10 @@ go_test( "replica_unavailable_error_test.go", "string_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":kvpb"], deps = [ diff --git a/pkg/kv/kvprober/BUILD.bazel b/pkg/kv/kvprober/BUILD.bazel index d812f7a43cfd..440809bf97e1 100644 --- a/pkg/kv/kvprober/BUILD.bazel +++ b/pkg/kv/kvprober/BUILD.bazel @@ -41,7 +41,10 @@ go_test( "planner_test.go", "quarantine_pool_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":kvprober"], deps = [ "//pkg/base", diff --git a/pkg/kv/kvserver/BUILD.bazel b/pkg/kv/kvserver/BUILD.bazel index 8004670b6a96..a6585d12a070 100644 --- a/pkg/kv/kvserver/BUILD.bazel +++ b/pkg/kv/kvserver/BUILD.bazel @@ -334,7 +334,10 @@ go_test( "txn_recovery_integration_test.go", "txn_wait_queue_test.go", ], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = glob(["testdata/**"]), embed = [":kvserver"], shard_count = 48, diff --git a/pkg/kv/kvserver/abortspan/BUILD.bazel b/pkg/kv/kvserver/abortspan/BUILD.bazel index 93a35aae3382..9c673217f2ac 100644 --- a/pkg/kv/kvserver/abortspan/BUILD.bazel +++ b/pkg/kv/kvserver/abortspan/BUILD.bazel @@ -22,7 +22,10 @@ go_test( name = "abortspan_test", size = "small", srcs = ["abortspan_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":abortspan"], deps = [ "//pkg/keys", diff --git a/pkg/kv/kvserver/allocator/allocator2/BUILD.bazel b/pkg/kv/kvserver/allocator/allocator2/BUILD.bazel index 4802a7e4412d..e869d854693c 100644 --- a/pkg/kv/kvserver/allocator/allocator2/BUILD.bazel +++ b/pkg/kv/kvserver/allocator/allocator2/BUILD.bazel @@ -15,7 +15,10 @@ go_library( go_test( name = "allocator2_test", srcs = ["constraint_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":allocator2"], ) diff --git a/pkg/kv/kvserver/allocator/allocatorimpl/BUILD.bazel b/pkg/kv/kvserver/allocator/allocatorimpl/BUILD.bazel index 1cc268247690..aa8a2fc8ddc2 100644 --- a/pkg/kv/kvserver/allocator/allocatorimpl/BUILD.bazel +++ b/pkg/kv/kvserver/allocator/allocatorimpl/BUILD.bazel @@ -41,7 +41,10 @@ go_test( "allocator_scorer_test.go", "allocator_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":allocatorimpl"], deps = [ "//pkg/config/zonepb", diff --git a/pkg/kv/kvserver/allocator/storepool/BUILD.bazel b/pkg/kv/kvserver/allocator/storepool/BUILD.bazel index 73c8adc436fc..6bfef2d56c3d 100644 --- a/pkg/kv/kvserver/allocator/storepool/BUILD.bazel +++ b/pkg/kv/kvserver/allocator/storepool/BUILD.bazel @@ -38,7 +38,10 @@ go_test( "override_store_pool_test.go", "store_pool_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":storepool"], deps = [ "//pkg/kv/kvserver/liveness/livenesspb", diff --git a/pkg/kv/kvserver/apply/BUILD.bazel b/pkg/kv/kvserver/apply/BUILD.bazel index 0186f876c66e..c958f09a79a4 100644 --- a/pkg/kv/kvserver/apply/BUILD.bazel +++ b/pkg/kv/kvserver/apply/BUILD.bazel @@ -24,7 +24,10 @@ go_test( "doc_test.go", "task_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":apply", "//pkg/kv/kvpb", diff --git a/pkg/kv/kvserver/asim/BUILD.bazel b/pkg/kv/kvserver/asim/BUILD.bazel index 55ddf0aca259..72fc1b767406 100644 --- a/pkg/kv/kvserver/asim/BUILD.bazel +++ b/pkg/kv/kvserver/asim/BUILD.bazel @@ -21,7 +21,10 @@ go_library( go_test( name = "asim_test", srcs = ["asim_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":asim", "//pkg/kv/kvserver/asim/config", diff --git a/pkg/kv/kvserver/asim/gossip/BUILD.bazel b/pkg/kv/kvserver/asim/gossip/BUILD.bazel index f007187eb6e6..0535bf4c4920 100644 --- a/pkg/kv/kvserver/asim/gossip/BUILD.bazel +++ b/pkg/kv/kvserver/asim/gossip/BUILD.bazel @@ -25,7 +25,10 @@ go_test( "exchange_test.go", "gossip_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":gossip"], deps = [ "//pkg/kv/kvserver/allocator/storepool", diff --git a/pkg/kv/kvserver/asim/metrics/BUILD.bazel b/pkg/kv/kvserver/asim/metrics/BUILD.bazel index 4fa11a10cdbb..420c0d1837a5 100644 --- a/pkg/kv/kvserver/asim/metrics/BUILD.bazel +++ b/pkg/kv/kvserver/asim/metrics/BUILD.bazel @@ -23,7 +23,10 @@ go_test( "metrics_test.go", "tracker_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":metrics", "//pkg/kv/kvserver/asim", diff --git a/pkg/kv/kvserver/asim/op/BUILD.bazel b/pkg/kv/kvserver/asim/op/BUILD.bazel index 0467780be8cb..1dfc917f3f6a 100644 --- a/pkg/kv/kvserver/asim/op/BUILD.bazel +++ b/pkg/kv/kvserver/asim/op/BUILD.bazel @@ -27,7 +27,10 @@ go_library( go_test( name = "op_test", srcs = ["controller_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":op"], deps = [ "//pkg/kv/kvserver/allocator", diff --git a/pkg/kv/kvserver/asim/queue/BUILD.bazel b/pkg/kv/kvserver/asim/queue/BUILD.bazel index 4873b80be382..772a193f32a5 100644 --- a/pkg/kv/kvserver/asim/queue/BUILD.bazel +++ b/pkg/kv/kvserver/asim/queue/BUILD.bazel @@ -27,7 +27,10 @@ go_test( "replicate_queue_test.go", "split_queue_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":queue"], deps = [ "//pkg/kv/kvserver/asim/config", diff --git a/pkg/kv/kvserver/asim/state/BUILD.bazel b/pkg/kv/kvserver/asim/state/BUILD.bazel index 93252a639313..fab76ef38ed4 100644 --- a/pkg/kv/kvserver/asim/state/BUILD.bazel +++ b/pkg/kv/kvserver/asim/state/BUILD.bazel @@ -49,7 +49,10 @@ go_test( "split_decider_test.go", "state_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":state"], deps = [ "//pkg/kv/kvserver/asim/config", diff --git a/pkg/kv/kvserver/asim/storerebalancer/BUILD.bazel b/pkg/kv/kvserver/asim/storerebalancer/BUILD.bazel index ccdb41ce738e..c28e454dc28c 100644 --- a/pkg/kv/kvserver/asim/storerebalancer/BUILD.bazel +++ b/pkg/kv/kvserver/asim/storerebalancer/BUILD.bazel @@ -33,7 +33,10 @@ go_test( "replica_rankings_test.go", "store_rebalancer_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":storerebalancer"], deps = [ "//pkg/kv/kvserver", diff --git a/pkg/kv/kvserver/asim/tests/BUILD.bazel b/pkg/kv/kvserver/asim/tests/BUILD.bazel index 74a48673171c..80509530f7ae 100644 --- a/pkg/kv/kvserver/asim/tests/BUILD.bazel +++ b/pkg/kv/kvserver/asim/tests/BUILD.bazel @@ -4,7 +4,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_test( name = "tests_test", srcs = ["datadriven_simulation_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":tests"], deps = [ diff --git a/pkg/kv/kvserver/asim/workload/BUILD.bazel b/pkg/kv/kvserver/asim/workload/BUILD.bazel index 027bac06bbc3..5ec4daeb435c 100644 --- a/pkg/kv/kvserver/asim/workload/BUILD.bazel +++ b/pkg/kv/kvserver/asim/workload/BUILD.bazel @@ -11,7 +11,10 @@ go_library( go_test( name = "workload_test", srcs = ["workload_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":workload"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/kv/kvserver/batcheval/BUILD.bazel b/pkg/kv/kvserver/batcheval/BUILD.bazel index 6c985c5e6fa3..7c9ee83396b2 100644 --- a/pkg/kv/kvserver/batcheval/BUILD.bazel +++ b/pkg/kv/kvserver/batcheval/BUILD.bazel @@ -127,7 +127,10 @@ go_test( "testutils_test.go", "transaction_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":batcheval"], deps = [ "//pkg/base", diff --git a/pkg/kv/kvserver/batcheval/result/BUILD.bazel b/pkg/kv/kvserver/batcheval/result/BUILD.bazel index 0a27e7b5f795..1fe0a4276327 100644 --- a/pkg/kv/kvserver/batcheval/result/BUILD.bazel +++ b/pkg/kv/kvserver/batcheval/result/BUILD.bazel @@ -25,7 +25,10 @@ go_test( name = "result_test", size = "small", srcs = ["result_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":result"], deps = [ "//pkg/kv/kvserver/kvserverpb", diff --git a/pkg/kv/kvserver/closedts/BUILD.bazel b/pkg/kv/kvserver/closedts/BUILD.bazel index 4f4fc3f273e7..dad635637273 100644 --- a/pkg/kv/kvserver/closedts/BUILD.bazel +++ b/pkg/kv/kvserver/closedts/BUILD.bazel @@ -19,7 +19,10 @@ go_library( go_test( name = "closedts_test", srcs = ["policy_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":closedts"], deps = [ "//pkg/roachpb", diff --git a/pkg/kv/kvserver/closedts/sidetransport/BUILD.bazel b/pkg/kv/kvserver/closedts/sidetransport/BUILD.bazel index d32ea0002e69..24b5924a282b 100644 --- a/pkg/kv/kvserver/closedts/sidetransport/BUILD.bazel +++ b/pkg/kv/kvserver/closedts/sidetransport/BUILD.bazel @@ -38,7 +38,10 @@ go_test( "receiver_test.go", "sender_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":sidetransport"], deps = [ "//pkg/base", diff --git a/pkg/kv/kvserver/closedts/tracker/BUILD.bazel b/pkg/kv/kvserver/closedts/tracker/BUILD.bazel index edf19d0b321c..753943e4c505 100644 --- a/pkg/kv/kvserver/closedts/tracker/BUILD.bazel +++ b/pkg/kv/kvserver/closedts/tracker/BUILD.bazel @@ -22,7 +22,10 @@ go_test( name = "tracker_test", size = "small", srcs = ["tracker_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":tracker"], deps = [ "//pkg/testutils/skip", diff --git a/pkg/kv/kvserver/concurrency/BUILD.bazel b/pkg/kv/kvserver/concurrency/BUILD.bazel index 78b7da19e877..536ab019eaf0 100644 --- a/pkg/kv/kvserver/concurrency/BUILD.bazel +++ b/pkg/kv/kvserver/concurrency/BUILD.bazel @@ -55,7 +55,10 @@ go_test( "lock_table_waiter_test.go", ":lockstate_interval_btree_test.go", # keep ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), data = glob(["testdata/**"]), embed = [":concurrency"], shard_count = 16, diff --git a/pkg/kv/kvserver/concurrency/isolation/BUILD.bazel b/pkg/kv/kvserver/concurrency/isolation/BUILD.bazel index 24b0874b00c6..7235cd5dfb1f 100644 --- a/pkg/kv/kvserver/concurrency/isolation/BUILD.bazel +++ b/pkg/kv/kvserver/concurrency/isolation/BUILD.bazel @@ -31,7 +31,10 @@ go_library( go_test( name = "isolation_test", srcs = ["levels_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":isolation"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/kv/kvserver/concurrency/lock/BUILD.bazel b/pkg/kv/kvserver/concurrency/lock/BUILD.bazel index a5c4c3168404..6df2663d117d 100644 --- a/pkg/kv/kvserver/concurrency/lock/BUILD.bazel +++ b/pkg/kv/kvserver/concurrency/lock/BUILD.bazel @@ -58,7 +58,10 @@ go_test( "lock_waiter_test.go", "locking_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":lock", "//pkg/kv/kvserver/concurrency/isolation", diff --git a/pkg/kv/kvserver/concurrency/poison/BUILD.bazel b/pkg/kv/kvserver/concurrency/poison/BUILD.bazel index b6667cdde190..49839240c8a8 100644 --- a/pkg/kv/kvserver/concurrency/poison/BUILD.bazel +++ b/pkg/kv/kvserver/concurrency/poison/BUILD.bazel @@ -47,7 +47,10 @@ go_library( go_test( name = "poison_test", srcs = ["error_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), deps = [ ":poison", diff --git a/pkg/kv/kvserver/gc/BUILD.bazel b/pkg/kv/kvserver/gc/BUILD.bazel index 6623a8e2fdc0..38080aff6dc1 100644 --- a/pkg/kv/kvserver/gc/BUILD.bazel +++ b/pkg/kv/kvserver/gc/BUILD.bazel @@ -43,7 +43,10 @@ go_test( "gc_test.go", "main_test.go", ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), embed = [":gc"], deps = [ "//pkg/base", diff --git a/pkg/kv/kvserver/idalloc/BUILD.bazel b/pkg/kv/kvserver/idalloc/BUILD.bazel index bf17fe98f73f..999d3c2c3c95 100644 --- a/pkg/kv/kvserver/idalloc/BUILD.bazel +++ b/pkg/kv/kvserver/idalloc/BUILD.bazel @@ -25,7 +25,10 @@ go_test( "id_alloc_test.go", "main_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":idalloc"], deps = [ "//pkg/keys", diff --git a/pkg/kv/kvserver/intentresolver/BUILD.bazel b/pkg/kv/kvserver/intentresolver/BUILD.bazel index edb5ba775f2a..9f195bbe357e 100644 --- a/pkg/kv/kvserver/intentresolver/BUILD.bazel +++ b/pkg/kv/kvserver/intentresolver/BUILD.bazel @@ -40,7 +40,10 @@ go_test( "intent_resolver_test.go", "main_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":intentresolver"], deps = [ "//pkg/base", diff --git a/pkg/kv/kvserver/kvflowcontrol/kvflowcontroller/BUILD.bazel b/pkg/kv/kvserver/kvflowcontrol/kvflowcontroller/BUILD.bazel index 1c2ac6ecb8d0..cb418cc06757 100644 --- a/pkg/kv/kvserver/kvflowcontrol/kvflowcontroller/BUILD.bazel +++ b/pkg/kv/kvserver/kvflowcontrol/kvflowcontroller/BUILD.bazel @@ -26,7 +26,10 @@ go_library( go_test( name = "kvflowcontroller_test", srcs = ["kvflowcontrol_token_adjustment_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":kvflowcontroller"], deps = [ diff --git a/pkg/kv/kvserver/kvflowcontrol/kvflowdispatch/BUILD.bazel b/pkg/kv/kvserver/kvflowcontrol/kvflowdispatch/BUILD.bazel index a286451bb7e5..17bcbf228dd0 100644 --- a/pkg/kv/kvserver/kvflowcontrol/kvflowdispatch/BUILD.bazel +++ b/pkg/kv/kvserver/kvflowcontrol/kvflowdispatch/BUILD.bazel @@ -18,7 +18,10 @@ go_library( go_test( name = "kvflowdispatch_test", srcs = ["kvflowdispatch_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":kvflowdispatch"], deps = [ diff --git a/pkg/kv/kvserver/kvflowcontrol/kvflowhandle/BUILD.bazel b/pkg/kv/kvserver/kvflowcontrol/kvflowhandle/BUILD.bazel index ff07b3cc5958..3fc290c5b052 100644 --- a/pkg/kv/kvserver/kvflowcontrol/kvflowhandle/BUILD.bazel +++ b/pkg/kv/kvserver/kvflowcontrol/kvflowhandle/BUILD.bazel @@ -27,7 +27,10 @@ go_library( go_test( name = "kvflowhandle_test", srcs = ["kvflowhandle_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":kvflowhandle", "//pkg/kv/kvserver/kvflowcontrol", diff --git a/pkg/kv/kvserver/kvflowcontrol/kvflowsequencer/BUILD.bazel b/pkg/kv/kvserver/kvflowcontrol/kvflowsequencer/BUILD.bazel index 4b7b66091b3e..e87843bc0ce0 100644 --- a/pkg/kv/kvserver/kvflowcontrol/kvflowsequencer/BUILD.bazel +++ b/pkg/kv/kvserver/kvflowcontrol/kvflowsequencer/BUILD.bazel @@ -12,7 +12,10 @@ go_library( go_test( name = "kvflowsequencer_test", srcs = ["sequencer_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":kvflowsequencer"], deps = [ diff --git a/pkg/kv/kvserver/kvflowcontrol/kvflowsimulator/BUILD.bazel b/pkg/kv/kvserver/kvflowcontrol/kvflowsimulator/BUILD.bazel index 826ca4c1f9aa..4d4d6999735e 100644 --- a/pkg/kv/kvserver/kvflowcontrol/kvflowsimulator/BUILD.bazel +++ b/pkg/kv/kvserver/kvflowcontrol/kvflowsimulator/BUILD.bazel @@ -4,7 +4,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test") go_test( name = "kvflowsimulator_test", srcs = ["simulation_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), deps = [ "//pkg/kv/kvserver/kvflowcontrol", diff --git a/pkg/kv/kvserver/kvflowcontrol/kvflowtokentracker/BUILD.bazel b/pkg/kv/kvserver/kvflowcontrol/kvflowtokentracker/BUILD.bazel index bd3536c6fec0..5ce309f8d9e2 100644 --- a/pkg/kv/kvserver/kvflowcontrol/kvflowtokentracker/BUILD.bazel +++ b/pkg/kv/kvserver/kvflowcontrol/kvflowtokentracker/BUILD.bazel @@ -17,7 +17,10 @@ go_library( go_test( name = "kvflowtokentracker_test", srcs = ["tracker_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":kvflowtokentracker"], deps = [ diff --git a/pkg/kv/kvserver/kvstorage/BUILD.bazel b/pkg/kv/kvserver/kvstorage/BUILD.bazel index 31e6d409cad7..b3d13bf566f9 100644 --- a/pkg/kv/kvserver/kvstorage/BUILD.bazel +++ b/pkg/kv/kvserver/kvstorage/BUILD.bazel @@ -38,7 +38,10 @@ go_test( "cluster_version_test.go", "datadriven_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":kvstorage"], deps = [ diff --git a/pkg/kv/kvserver/liveness/BUILD.bazel b/pkg/kv/kvserver/liveness/BUILD.bazel index 9f438a44ef72..01afbfafc173 100644 --- a/pkg/kv/kvserver/liveness/BUILD.bazel +++ b/pkg/kv/kvserver/liveness/BUILD.bazel @@ -41,7 +41,10 @@ go_test( "liveness_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":liveness"], deps = [ "//pkg/base", diff --git a/pkg/kv/kvserver/lockspanset/BUILD.bazel b/pkg/kv/kvserver/lockspanset/BUILD.bazel index 65aa3c825c65..709dea19beec 100644 --- a/pkg/kv/kvserver/lockspanset/BUILD.bazel +++ b/pkg/kv/kvserver/lockspanset/BUILD.bazel @@ -15,7 +15,10 @@ go_library( go_test( name = "lockspanset_test", srcs = ["lockspanset_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":lockspanset"], deps = [ "//pkg/kv/kvserver/concurrency/lock", diff --git a/pkg/kv/kvserver/logstore/BUILD.bazel b/pkg/kv/kvserver/logstore/BUILD.bazel index 47d26b524c37..390869ce0ede 100644 --- a/pkg/kv/kvserver/logstore/BUILD.bazel +++ b/pkg/kv/kvserver/logstore/BUILD.bazel @@ -51,7 +51,10 @@ go_test( "sideload_test.go", "sync_waiter_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":logstore"], deps = [ "//pkg/kv/kvpb", diff --git a/pkg/kv/kvserver/loqrecovery/BUILD.bazel b/pkg/kv/kvserver/loqrecovery/BUILD.bazel index 3a9b4fb442c3..2d31ab87acfe 100644 --- a/pkg/kv/kvserver/loqrecovery/BUILD.bazel +++ b/pkg/kv/kvserver/loqrecovery/BUILD.bazel @@ -70,7 +70,10 @@ go_test( "store_test.go", "version_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":loqrecovery"], deps = [ diff --git a/pkg/kv/kvserver/loqrecovery/loqrecoverypb/BUILD.bazel b/pkg/kv/kvserver/loqrecovery/loqrecoverypb/BUILD.bazel index 9d97bbc2f13e..88232d3e7bfd 100644 --- a/pkg/kv/kvserver/loqrecovery/loqrecoverypb/BUILD.bazel +++ b/pkg/kv/kvserver/loqrecovery/loqrecoverypb/BUILD.bazel @@ -53,7 +53,10 @@ go_library( go_test( name = "loqrecoverypb_test", srcs = ["recovery_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":loqrecoverypb"], deps = [ "//pkg/roachpb", diff --git a/pkg/kv/kvserver/multiqueue/BUILD.bazel b/pkg/kv/kvserver/multiqueue/BUILD.bazel index 14dbae432c80..ed3a1bd5a0e8 100644 --- a/pkg/kv/kvserver/multiqueue/BUILD.bazel +++ b/pkg/kv/kvserver/multiqueue/BUILD.bazel @@ -17,7 +17,10 @@ go_test( name = "multiqueue_test", size = "small", srcs = ["multi_queue_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":multiqueue"], deps = [ "//pkg/testutils", diff --git a/pkg/kv/kvserver/protectedts/BUILD.bazel b/pkg/kv/kvserver/protectedts/BUILD.bazel index da471647b7c7..8b9d5d591215 100644 --- a/pkg/kv/kvserver/protectedts/BUILD.bazel +++ b/pkg/kv/kvserver/protectedts/BUILD.bazel @@ -29,7 +29,10 @@ go_test( name = "protectedts_test", size = "small", srcs = ["protectedts_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":protectedts"], ) diff --git a/pkg/kv/kvserver/protectedts/ptcache/BUILD.bazel b/pkg/kv/kvserver/protectedts/ptcache/BUILD.bazel index 5d7e11b71fc0..50285650eda4 100644 --- a/pkg/kv/kvserver/protectedts/ptcache/BUILD.bazel +++ b/pkg/kv/kvserver/protectedts/ptcache/BUILD.bazel @@ -30,7 +30,10 @@ go_test( "cache_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":ptcache", "//pkg/base", diff --git a/pkg/kv/kvserver/protectedts/ptreconcile/BUILD.bazel b/pkg/kv/kvserver/protectedts/ptreconcile/BUILD.bazel index c224e62b5ebe..6764186e3e54 100644 --- a/pkg/kv/kvserver/protectedts/ptreconcile/BUILD.bazel +++ b/pkg/kv/kvserver/protectedts/ptreconcile/BUILD.bazel @@ -31,7 +31,10 @@ go_test( "main_test.go", "reconciler_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":ptreconcile", "//pkg/base", diff --git a/pkg/kv/kvserver/protectedts/ptstorage/BUILD.bazel b/pkg/kv/kvserver/protectedts/ptstorage/BUILD.bazel index 257901192534..8f8135a3898b 100644 --- a/pkg/kv/kvserver/protectedts/ptstorage/BUILD.bazel +++ b/pkg/kv/kvserver/protectedts/ptstorage/BUILD.bazel @@ -36,7 +36,10 @@ go_test( "storage_test.go", "validate_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":ptstorage"], shard_count = 16, deps = [ diff --git a/pkg/kv/kvserver/raftentry/BUILD.bazel b/pkg/kv/kvserver/raftentry/BUILD.bazel index 097ab8218d52..4cedce7db340 100644 --- a/pkg/kv/kvserver/raftentry/BUILD.bazel +++ b/pkg/kv/kvserver/raftentry/BUILD.bazel @@ -28,7 +28,10 @@ go_test( "cache_test.go", "ring_buffer_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":raftentry"], deps = [ "//pkg/kv/kvpb", diff --git a/pkg/kv/kvserver/raftlog/BUILD.bazel b/pkg/kv/kvserver/raftlog/BUILD.bazel index bb4e67c6e005..68a9aa98037a 100644 --- a/pkg/kv/kvserver/raftlog/BUILD.bazel +++ b/pkg/kv/kvserver/raftlog/BUILD.bazel @@ -37,7 +37,10 @@ go_test( "iter_bench_test.go", "iter_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":raftlog"], deps = [ "//pkg/keys", diff --git a/pkg/kv/kvserver/raftutil/BUILD.bazel b/pkg/kv/kvserver/raftutil/BUILD.bazel index 5d1b2529d930..c7830670384c 100644 --- a/pkg/kv/kvserver/raftutil/BUILD.bazel +++ b/pkg/kv/kvserver/raftutil/BUILD.bazel @@ -17,7 +17,10 @@ go_library( go_test( name = "raftutil_test", srcs = ["util_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":raftutil"], deps = [ "@com_github_stretchr_testify//require", diff --git a/pkg/kv/kvserver/rangefeed/BUILD.bazel b/pkg/kv/kvserver/rangefeed/BUILD.bazel index 3bd87b1e0e04..d22332aa06e3 100644 --- a/pkg/kv/kvserver/rangefeed/BUILD.bazel +++ b/pkg/kv/kvserver/rangefeed/BUILD.bazel @@ -54,7 +54,10 @@ go_test( "resolved_timestamp_test.go", "task_test.go", ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), embed = [":rangefeed"], deps = [ "//pkg/base", diff --git a/pkg/kv/kvserver/rangelog/BUILD.bazel b/pkg/kv/kvserver/rangelog/BUILD.bazel index 7c9aac44c758..43f52d92e3a1 100644 --- a/pkg/kv/kvserver/rangelog/BUILD.bazel +++ b/pkg/kv/kvserver/rangelog/BUILD.bazel @@ -26,7 +26,10 @@ go_test( "main_test.go", "rangelog_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":rangelog"], embedsrcs = ["testdata/rangelog.bin"], diff --git a/pkg/kv/kvserver/rditer/BUILD.bazel b/pkg/kv/kvserver/rditer/BUILD.bazel index b106d2d18486..df707f34f46c 100644 --- a/pkg/kv/kvserver/rditer/BUILD.bazel +++ b/pkg/kv/kvserver/rditer/BUILD.bazel @@ -26,7 +26,10 @@ go_test( "replica_data_iter_test.go", "select_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":rditer"], deps = [ diff --git a/pkg/kv/kvserver/replicastats/BUILD.bazel b/pkg/kv/kvserver/replicastats/BUILD.bazel index 3e9c6e45c95c..c113753d9010 100644 --- a/pkg/kv/kvserver/replicastats/BUILD.bazel +++ b/pkg/kv/kvserver/replicastats/BUILD.bazel @@ -15,7 +15,10 @@ go_library( go_test( name = "replicastats_test", srcs = ["replica_stats_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":replicastats"], deps = [ "//pkg/roachpb", diff --git a/pkg/kv/kvserver/reports/BUILD.bazel b/pkg/kv/kvserver/reports/BUILD.bazel index 2633b25b6b55..8899df2c1ac2 100644 --- a/pkg/kv/kvserver/reports/BUILD.bazel +++ b/pkg/kv/kvserver/reports/BUILD.bazel @@ -52,7 +52,10 @@ go_test( "replication_stats_report_test.go", "reporter_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":reports"], deps = [ "//pkg/base", diff --git a/pkg/kv/kvserver/spanlatch/BUILD.bazel b/pkg/kv/kvserver/spanlatch/BUILD.bazel index 9984c73cb43d..f087e2b5d450 100644 --- a/pkg/kv/kvserver/spanlatch/BUILD.bazel +++ b/pkg/kv/kvserver/spanlatch/BUILD.bazel @@ -37,7 +37,10 @@ go_test( "signal_test.go", ":latch_interval_btree_test.go", # keep ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), embed = [":spanlatch"], shard_count = 16, deps = [ diff --git a/pkg/kv/kvserver/spanset/BUILD.bazel b/pkg/kv/kvserver/spanset/BUILD.bazel index 5e7ecff39184..a9ffc4b37d23 100644 --- a/pkg/kv/kvserver/spanset/BUILD.bazel +++ b/pkg/kv/kvserver/spanset/BUILD.bazel @@ -30,7 +30,10 @@ go_test( "batch_test.go", "spanset_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":spanset"], deps = [ "//pkg/keys", diff --git a/pkg/kv/kvserver/split/BUILD.bazel b/pkg/kv/kvserver/split/BUILD.bazel index 8ceee186faa5..db123e9bcab0 100644 --- a/pkg/kv/kvserver/split/BUILD.bazel +++ b/pkg/kv/kvserver/split/BUILD.bazel @@ -30,7 +30,10 @@ go_test( "unweighted_finder_test.go", "weighted_finder_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":split"], deps = [ diff --git a/pkg/kv/kvserver/stateloader/BUILD.bazel b/pkg/kv/kvserver/stateloader/BUILD.bazel index 0008032a0520..c7b84408302b 100644 --- a/pkg/kv/kvserver/stateloader/BUILD.bazel +++ b/pkg/kv/kvserver/stateloader/BUILD.bazel @@ -30,7 +30,10 @@ go_test( "initial_test.go", "stateloader_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":stateloader"], deps = [ "//pkg/kv/kvpb", diff --git a/pkg/kv/kvserver/tenantrate/BUILD.bazel b/pkg/kv/kvserver/tenantrate/BUILD.bazel index 23921fd27552..a88c082ed00a 100644 --- a/pkg/kv/kvserver/tenantrate/BUILD.bazel +++ b/pkg/kv/kvserver/tenantrate/BUILD.bazel @@ -33,7 +33,10 @@ go_test( name = "tenantrate_test", size = "small", srcs = ["limiter_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), deps = [ ":tenantrate", diff --git a/pkg/kv/kvserver/tscache/BUILD.bazel b/pkg/kv/kvserver/tscache/BUILD.bazel index 9ff16bba6bd6..ce403b71a98f 100644 --- a/pkg/kv/kvserver/tscache/BUILD.bazel +++ b/pkg/kv/kvserver/tscache/BUILD.bazel @@ -37,7 +37,10 @@ go_test( "interval_skl_test.go", "tree_impl_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":tscache"], deps = [ "//pkg/roachpb", diff --git a/pkg/kv/kvserver/txnrecovery/BUILD.bazel b/pkg/kv/kvserver/txnrecovery/BUILD.bazel index 81c0624ccca6..7027628df43b 100644 --- a/pkg/kv/kvserver/txnrecovery/BUILD.bazel +++ b/pkg/kv/kvserver/txnrecovery/BUILD.bazel @@ -26,7 +26,10 @@ go_test( name = "txnrecovery_test", size = "small", srcs = ["manager_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":txnrecovery"], deps = [ "//pkg/kv", diff --git a/pkg/kv/kvserver/txnwait/BUILD.bazel b/pkg/kv/kvserver/txnwait/BUILD.bazel index 759db05b7a4b..6d7e5582e3e8 100644 --- a/pkg/kv/kvserver/txnwait/BUILD.bazel +++ b/pkg/kv/kvserver/txnwait/BUILD.bazel @@ -32,7 +32,10 @@ go_test( name = "txnwait_test", size = "small", srcs = ["queue_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":txnwait"], deps = [ "//pkg/kv", diff --git a/pkg/kv/kvserver/uncertainty/BUILD.bazel b/pkg/kv/kvserver/uncertainty/BUILD.bazel index 260b9292b968..4d48214d2a5c 100644 --- a/pkg/kv/kvserver/uncertainty/BUILD.bazel +++ b/pkg/kv/kvserver/uncertainty/BUILD.bazel @@ -24,7 +24,10 @@ go_test( "compute_test.go", "interval_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":uncertainty"], deps = [ "//pkg/kv/kvpb", diff --git a/pkg/multitenant/tenantcapabilities/BUILD.bazel b/pkg/multitenant/tenantcapabilities/BUILD.bazel index 691765805682..eaa5bdd31920 100644 --- a/pkg/multitenant/tenantcapabilities/BUILD.bazel +++ b/pkg/multitenant/tenantcapabilities/BUILD.bazel @@ -38,7 +38,10 @@ stringer( go_test( name = "tenantcapabilities_test", srcs = ["values_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":tenantcapabilities"], deps = [ "//pkg/multitenant/tenantcapabilities/tenantcapabilitiespb", diff --git a/pkg/multitenant/tenantcapabilities/tenantcapabilitiesauthorizer/BUILD.bazel b/pkg/multitenant/tenantcapabilities/tenantcapabilitiesauthorizer/BUILD.bazel index 20223775ae4d..bc7bb9136bdf 100644 --- a/pkg/multitenant/tenantcapabilities/tenantcapabilitiesauthorizer/BUILD.bazel +++ b/pkg/multitenant/tenantcapabilities/tenantcapabilitiesauthorizer/BUILD.bazel @@ -28,7 +28,10 @@ go_library( go_test( name = "tenantcapabilitiesauthorizer_test", srcs = ["authorizer_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":tenantcapabilitiesauthorizer"], deps = [ diff --git a/pkg/multitenant/tenantcapabilities/tenantcapabilitieswatcher/BUILD.bazel b/pkg/multitenant/tenantcapabilities/tenantcapabilitieswatcher/BUILD.bazel index 3913380c8056..5fccf9b8ffe3 100644 --- a/pkg/multitenant/tenantcapabilities/tenantcapabilitieswatcher/BUILD.bazel +++ b/pkg/multitenant/tenantcapabilities/tenantcapabilitieswatcher/BUILD.bazel @@ -43,7 +43,10 @@ go_test( "main_test.go", "watcher_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), deps = [ ":tenantcapabilitieswatcher", diff --git a/pkg/multitenant/tenantcostmodel/BUILD.bazel b/pkg/multitenant/tenantcostmodel/BUILD.bazel index 9d4fdb795675..74f33f471140 100644 --- a/pkg/multitenant/tenantcostmodel/BUILD.bazel +++ b/pkg/multitenant/tenantcostmodel/BUILD.bazel @@ -20,7 +20,10 @@ go_library( go_test( name = "tenantcostmodel_test", srcs = ["settings_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":tenantcostmodel"], deps = [ "//pkg/util/leaktest", diff --git a/pkg/obsservice/obslib/ingest/BUILD.bazel b/pkg/obsservice/obslib/ingest/BUILD.bazel index 91d88b9c8908..2e4e2b4405a0 100644 --- a/pkg/obsservice/obslib/ingest/BUILD.bazel +++ b/pkg/obsservice/obslib/ingest/BUILD.bazel @@ -25,7 +25,10 @@ go_test( "ingest_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":ingest"], deps = [ "//pkg/base", diff --git a/pkg/roachpb/BUILD.bazel b/pkg/roachpb/BUILD.bazel index b3f29088fea3..20f1770f8dc1 100644 --- a/pkg/roachpb/BUILD.bazel +++ b/pkg/roachpb/BUILD.bazel @@ -68,7 +68,10 @@ go_test( "tenant_test.go", "version_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":roachpb"], tags = ["no-remote"], deps = [ diff --git a/pkg/roachprod/cloud/BUILD.bazel b/pkg/roachprod/cloud/BUILD.bazel index 802fb7755ab1..a42e33545a0f 100644 --- a/pkg/roachprod/cloud/BUILD.bazel +++ b/pkg/roachprod/cloud/BUILD.bazel @@ -30,7 +30,10 @@ go_library( go_test( name = "cloud_test", srcs = ["cloud_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":cloud"], deps = [ "@com_github_aws_aws_sdk_go_v2_service_ec2//types", diff --git a/pkg/roachprod/config/BUILD.bazel b/pkg/roachprod/config/BUILD.bazel index 3783e8cf97a4..209dd76ad03c 100644 --- a/pkg/roachprod/config/BUILD.bazel +++ b/pkg/roachprod/config/BUILD.bazel @@ -16,7 +16,10 @@ go_library( go_test( name = "config_test", srcs = ["config_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":config"], ) diff --git a/pkg/roachprod/install/BUILD.bazel b/pkg/roachprod/install/BUILD.bazel index 94b01bf661e8..cd83841ccd49 100644 --- a/pkg/roachprod/install/BUILD.bazel +++ b/pkg/roachprod/install/BUILD.bazel @@ -52,7 +52,10 @@ go_test( "staging_test.go", "start_template_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":install"], deps = [ diff --git a/pkg/roachprod/prometheus/BUILD.bazel b/pkg/roachprod/prometheus/BUILD.bazel index 57e36a1b18e7..739df371f559 100644 --- a/pkg/roachprod/prometheus/BUILD.bazel +++ b/pkg/roachprod/prometheus/BUILD.bazel @@ -19,7 +19,10 @@ go_library( go_test( name = "prometheus_test", srcs = ["prometheus_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":prometheus"], deps = [ diff --git a/pkg/roachprod/ssh/BUILD.bazel b/pkg/roachprod/ssh/BUILD.bazel index ad6d47af4afd..81ee47a04b39 100644 --- a/pkg/roachprod/ssh/BUILD.bazel +++ b/pkg/roachprod/ssh/BUILD.bazel @@ -14,7 +14,10 @@ go_library( go_test( name = "ssh_test", srcs = ["io_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":ssh"], ) diff --git a/pkg/roachprod/vm/BUILD.bazel b/pkg/roachprod/vm/BUILD.bazel index ceea2204445d..ed1a350b4360 100644 --- a/pkg/roachprod/vm/BUILD.bazel +++ b/pkg/roachprod/vm/BUILD.bazel @@ -19,7 +19,10 @@ go_test( name = "vm_test", size = "small", srcs = ["vm_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":vm"], deps = ["@com_github_stretchr_testify//assert"], ) diff --git a/pkg/rpc/BUILD.bazel b/pkg/rpc/BUILD.bazel index d3a8079ba211..0c5b8d64c941 100644 --- a/pkg/rpc/BUILD.bazel +++ b/pkg/rpc/BUILD.bazel @@ -98,7 +98,10 @@ go_test( "snappy_test.go", "tls_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":rpc"], deps = [ "//pkg/base", diff --git a/pkg/rpc/nodedialer/BUILD.bazel b/pkg/rpc/nodedialer/BUILD.bazel index 8d2462648aab..bd2e760e95f9 100644 --- a/pkg/rpc/nodedialer/BUILD.bazel +++ b/pkg/rpc/nodedialer/BUILD.bazel @@ -25,7 +25,10 @@ go_test( name = "nodedialer_test", size = "small", srcs = ["nodedialer_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":nodedialer"], deps = [ "//pkg/clusterversion", diff --git a/pkg/scheduledjobs/schedulebase/BUILD.bazel b/pkg/scheduledjobs/schedulebase/BUILD.bazel index 66b0f222daed..6facb9f57bdd 100644 --- a/pkg/scheduledjobs/schedulebase/BUILD.bazel +++ b/pkg/scheduledjobs/schedulebase/BUILD.bazel @@ -26,7 +26,10 @@ go_library( go_test( name = "schedulebase_test", srcs = ["util_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":schedulebase"], deps = [ "//pkg/jobs/jobspb", diff --git a/pkg/security/BUILD.bazel b/pkg/security/BUILD.bazel index 234dc5ae8b5b..27457562cfb2 100644 --- a/pkg/security/BUILD.bazel +++ b/pkg/security/BUILD.bazel @@ -70,7 +70,10 @@ go_test( "tls_test.go", "x509_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":security"], deps = [ "//pkg/base", diff --git a/pkg/security/certmgr/BUILD.bazel b/pkg/security/certmgr/BUILD.bazel index c70349e22743..cd053ad62c30 100644 --- a/pkg/security/certmgr/BUILD.bazel +++ b/pkg/security/certmgr/BUILD.bazel @@ -30,7 +30,10 @@ go_test( "self_signed_cert_test.go", ":mocks_certmgr", # keep ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":certmgr"], deps = [ "//pkg/testutils", diff --git a/pkg/security/password/BUILD.bazel b/pkg/security/password/BUILD.bazel index ae863af65bb8..8913d25adc2e 100644 --- a/pkg/security/password/BUILD.bazel +++ b/pkg/security/password/BUILD.bazel @@ -20,7 +20,10 @@ go_library( go_test( name = "password_test", srcs = ["password_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":password", "//pkg/security", diff --git a/pkg/security/sessionrevival/BUILD.bazel b/pkg/security/sessionrevival/BUILD.bazel index 07a6c58fe57e..943bf6ac4daf 100644 --- a/pkg/security/sessionrevival/BUILD.bazel +++ b/pkg/security/sessionrevival/BUILD.bazel @@ -20,7 +20,10 @@ go_library( go_test( name = "sessionrevival_test", srcs = ["token_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":sessionrevival"], deps = [ "//pkg/security/username", diff --git a/pkg/security/username/BUILD.bazel b/pkg/security/username/BUILD.bazel index 622cd6567d17..4f788f1da80a 100644 --- a/pkg/security/username/BUILD.bazel +++ b/pkg/security/username/BUILD.bazel @@ -18,7 +18,10 @@ go_library( go_test( name = "username_test", srcs = ["username_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":username", "//pkg/testutils", diff --git a/pkg/server/BUILD.bazel b/pkg/server/BUILD.bazel index bd7685455b64..b31f1c75c6ad 100644 --- a/pkg/server/BUILD.bazel +++ b/pkg/server/BUILD.bazel @@ -441,7 +441,10 @@ go_test( "user_test.go", "version_cluster_test.go", ], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = glob(["testdata/**"]), embed = [":server"], shard_count = 16, diff --git a/pkg/server/autoconfig/BUILD.bazel b/pkg/server/autoconfig/BUILD.bazel index 7b964371cc61..596cdc491da1 100644 --- a/pkg/server/autoconfig/BUILD.bazel +++ b/pkg/server/autoconfig/BUILD.bazel @@ -38,7 +38,10 @@ go_test( "main_test.go", "task_markers_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":autoconfig", "//pkg/base", diff --git a/pkg/server/debug/BUILD.bazel b/pkg/server/debug/BUILD.bazel index d4d5377ba544..ca6ab3a78dda 100644 --- a/pkg/server/debug/BUILD.bazel +++ b/pkg/server/debug/BUILD.bazel @@ -50,7 +50,10 @@ go_test( name = "debug_test", size = "small", srcs = ["logspy_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":debug"], deps = [ "//pkg/roachpb", diff --git a/pkg/server/debug/goroutineui/BUILD.bazel b/pkg/server/debug/goroutineui/BUILD.bazel index 6646e2e7b160..c5e60c2ed052 100644 --- a/pkg/server/debug/goroutineui/BUILD.bazel +++ b/pkg/server/debug/goroutineui/BUILD.bazel @@ -16,7 +16,10 @@ go_test( name = "goroutineui_test", size = "small", srcs = ["dump_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = ["@go_sdk//:files"], embed = [":goroutineui"], deps = [ diff --git a/pkg/server/debug/pprofui/BUILD.bazel b/pkg/server/debug/pprofui/BUILD.bazel index 1bae59dd7a85..d558c0c1f062 100644 --- a/pkg/server/debug/pprofui/BUILD.bazel +++ b/pkg/server/debug/pprofui/BUILD.bazel @@ -30,7 +30,10 @@ go_test( name = "pprofui_test", size = "small", srcs = ["server_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":pprofui"], deps = [ diff --git a/pkg/server/diagnostics/BUILD.bazel b/pkg/server/diagnostics/BUILD.bazel index ee85b48cf52b..35239f844712 100644 --- a/pkg/server/diagnostics/BUILD.bazel +++ b/pkg/server/diagnostics/BUILD.bazel @@ -57,7 +57,10 @@ go_test( "main_test.go", "update_checker_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), tags = ["no-remote"], deps = [ ":diagnostics", diff --git a/pkg/server/dumpstore/BUILD.bazel b/pkg/server/dumpstore/BUILD.bazel index 4df966fbe9cb..2075ade66886 100644 --- a/pkg/server/dumpstore/BUILD.bazel +++ b/pkg/server/dumpstore/BUILD.bazel @@ -17,7 +17,10 @@ go_test( name = "dumpstore_test", size = "small", srcs = ["dumpstore_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":dumpstore"], deps = [ "@com_github_stretchr_testify//assert", diff --git a/pkg/server/goroutinedumper/BUILD.bazel b/pkg/server/goroutinedumper/BUILD.bazel index e1be79ebd5e3..72102232d425 100644 --- a/pkg/server/goroutinedumper/BUILD.bazel +++ b/pkg/server/goroutinedumper/BUILD.bazel @@ -20,7 +20,10 @@ go_test( name = "goroutinedumper_test", size = "small", srcs = ["goroutinedumper_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":goroutinedumper"], deps = [ "//pkg/server/dumpstore", diff --git a/pkg/server/pgurl/BUILD.bazel b/pkg/server/pgurl/BUILD.bazel index b6ce53968e46..b181baccbbae 100644 --- a/pkg/server/pgurl/BUILD.bazel +++ b/pkg/server/pgurl/BUILD.bazel @@ -22,7 +22,10 @@ go_library( go_test( name = "pgurl_test", srcs = ["pgurl_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":pgurl"], deps = [ diff --git a/pkg/server/profiler/BUILD.bazel b/pkg/server/profiler/BUILD.bazel index 4dff11186795..48ecff643a3e 100644 --- a/pkg/server/profiler/BUILD.bazel +++ b/pkg/server/profiler/BUILD.bazel @@ -41,7 +41,10 @@ go_test( "profiler_common_test.go", "profilestore_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":profiler"], deps = [ "//pkg/clusterversion", diff --git a/pkg/server/serverpb/BUILD.bazel b/pkg/server/serverpb/BUILD.bazel index 8e36fd60f640..6a83c44fa36d 100644 --- a/pkg/server/serverpb/BUILD.bazel +++ b/pkg/server/serverpb/BUILD.bazel @@ -116,7 +116,10 @@ go_test( name = "serverpb_test", size = "medium", srcs = ["admin_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":serverpb"], deps = ["@com_github_stretchr_testify//assert"], ) diff --git a/pkg/server/serverrules/BUILD.bazel b/pkg/server/serverrules/BUILD.bazel index 01dee9570653..0e7eee023521 100644 --- a/pkg/server/serverrules/BUILD.bazel +++ b/pkg/server/serverrules/BUILD.bazel @@ -16,7 +16,10 @@ go_library( go_test( name = "serverrules_test", srcs = ["metric_rules_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":serverrules"], deps = [ "//pkg/util/leaktest", diff --git a/pkg/server/settingswatcher/BUILD.bazel b/pkg/server/settingswatcher/BUILD.bazel index 9fac911f3d76..f1d36fcad342 100644 --- a/pkg/server/settingswatcher/BUILD.bazel +++ b/pkg/server/settingswatcher/BUILD.bazel @@ -47,7 +47,10 @@ go_test( "settings_watcher_external_test.go", "version_guard_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":settingswatcher", "//pkg/base", diff --git a/pkg/server/status/BUILD.bazel b/pkg/server/status/BUILD.bazel index ff6f2674be63..f2b110f74cd1 100644 --- a/pkg/server/status/BUILD.bazel +++ b/pkg/server/status/BUILD.bazel @@ -132,7 +132,10 @@ go_test( "runtime_stats_test.go", "runtime_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":status"], deps = [ "//pkg/base", diff --git a/pkg/server/structlogging/BUILD.bazel b/pkg/server/structlogging/BUILD.bazel index ae7afd66e8bb..d9ecca8618b4 100644 --- a/pkg/server/structlogging/BUILD.bazel +++ b/pkg/server/structlogging/BUILD.bazel @@ -27,7 +27,10 @@ go_test( "hot_ranges_log_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":structlogging", "//pkg/base", diff --git a/pkg/server/systemconfigwatcher/BUILD.bazel b/pkg/server/systemconfigwatcher/BUILD.bazel index b033067609f4..10ab683e6410 100644 --- a/pkg/server/systemconfigwatcher/BUILD.bazel +++ b/pkg/server/systemconfigwatcher/BUILD.bazel @@ -27,7 +27,10 @@ go_test( "cache_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":systemconfigwatcher", "//pkg/base", diff --git a/pkg/server/telemetry/BUILD.bazel b/pkg/server/telemetry/BUILD.bazel index e923343e3f68..c9c3a7921334 100644 --- a/pkg/server/telemetry/BUILD.bazel +++ b/pkg/server/telemetry/BUILD.bazel @@ -22,7 +22,10 @@ go_test( name = "telemetry_test", size = "small", srcs = ["features_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":telemetry", "//pkg/util/metric", diff --git a/pkg/server/tenantsettingswatcher/BUILD.bazel b/pkg/server/tenantsettingswatcher/BUILD.bazel index 2358f2a5dadf..fd2d759bc44c 100644 --- a/pkg/server/tenantsettingswatcher/BUILD.bazel +++ b/pkg/server/tenantsettingswatcher/BUILD.bazel @@ -44,7 +44,10 @@ go_test( "row_decoder_test.go", "watcher_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":tenantsettingswatcher"], deps = [ "//pkg/base", diff --git a/pkg/server/tracedumper/BUILD.bazel b/pkg/server/tracedumper/BUILD.bazel index 435522979868..1cf619ff983c 100644 --- a/pkg/server/tracedumper/BUILD.bazel +++ b/pkg/server/tracedumper/BUILD.bazel @@ -27,7 +27,10 @@ go_test( "main_test.go", "tracedumper_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":tracedumper"], deps = [ "//pkg/security/securityassets", diff --git a/pkg/settings/BUILD.bazel b/pkg/settings/BUILD.bazel index deba2644ae99..82cd2dfdffad 100644 --- a/pkg/settings/BUILD.bazel +++ b/pkg/settings/BUILD.bazel @@ -49,7 +49,10 @@ go_test( "internal_test.go", "settings_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":settings"], deps = [ "//pkg/testutils", diff --git a/pkg/spanconfig/BUILD.bazel b/pkg/spanconfig/BUILD.bazel index b91554578034..2e721cad6511 100644 --- a/pkg/spanconfig/BUILD.bazel +++ b/pkg/spanconfig/BUILD.bazel @@ -41,7 +41,10 @@ go_test( "record_test.go", "target_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":spanconfig"], deps = [ "//pkg/jobs/jobsprotectedts", diff --git a/pkg/spanconfig/spanconfigbounds/BUILD.bazel b/pkg/spanconfig/spanconfigbounds/BUILD.bazel index a7891683fcb6..dd528a015608 100644 --- a/pkg/spanconfig/spanconfigbounds/BUILD.bazel +++ b/pkg/spanconfig/spanconfigbounds/BUILD.bazel @@ -36,7 +36,10 @@ go_test( "data_driven_test.go", "helpers_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":spanconfigbounds"], deps = [ diff --git a/pkg/spanconfig/spanconfigkvaccessor/BUILD.bazel b/pkg/spanconfig/spanconfigkvaccessor/BUILD.bazel index b16181c8f1f3..b3ead81ef6c3 100644 --- a/pkg/spanconfig/spanconfigkvaccessor/BUILD.bazel +++ b/pkg/spanconfig/spanconfigkvaccessor/BUILD.bazel @@ -33,7 +33,10 @@ go_test( "main_test.go", "validation_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":spanconfigkvaccessor"], deps = [ diff --git a/pkg/spanconfig/spanconfigkvsubscriber/BUILD.bazel b/pkg/spanconfig/spanconfigkvsubscriber/BUILD.bazel index a309f36e9bc0..fff337664137 100644 --- a/pkg/spanconfig/spanconfigkvsubscriber/BUILD.bazel +++ b/pkg/spanconfig/spanconfigkvsubscriber/BUILD.bazel @@ -47,7 +47,10 @@ go_test( "main_test.go", "spanconfigdecoder_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":spanconfigkvsubscriber"], deps = [ diff --git a/pkg/spanconfig/spanconfigmanager/BUILD.bazel b/pkg/spanconfig/spanconfigmanager/BUILD.bazel index 245453aee5e1..d77add19ecc4 100644 --- a/pkg/spanconfig/spanconfigmanager/BUILD.bazel +++ b/pkg/spanconfig/spanconfigmanager/BUILD.bazel @@ -30,7 +30,10 @@ go_test( "main_test.go", "manager_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":spanconfigmanager", "//pkg/base", diff --git a/pkg/spanconfig/spanconfigptsreader/BUILD.bazel b/pkg/spanconfig/spanconfigptsreader/BUILD.bazel index 3ab6c3bb9132..bef5b7d0b74f 100644 --- a/pkg/spanconfig/spanconfigptsreader/BUILD.bazel +++ b/pkg/spanconfig/spanconfigptsreader/BUILD.bazel @@ -21,7 +21,10 @@ go_library( go_test( name = "spanconfigptsreader_test", srcs = ["adapter_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":spanconfigptsreader"], deps = [ "//pkg/keys", diff --git a/pkg/spanconfig/spanconfigreconciler/BUILD.bazel b/pkg/spanconfig/spanconfigreconciler/BUILD.bazel index cfccd98cf5d4..c6c4379e5745 100644 --- a/pkg/spanconfig/spanconfigreconciler/BUILD.bazel +++ b/pkg/spanconfig/spanconfigreconciler/BUILD.bazel @@ -32,7 +32,10 @@ go_library( go_test( name = "spanconfigreconciler_test", srcs = ["reconciler_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), ) diff --git a/pkg/spanconfig/spanconfigreporter/BUILD.bazel b/pkg/spanconfig/spanconfigreporter/BUILD.bazel index d463555d1fb3..0548f0a56f9f 100644 --- a/pkg/spanconfig/spanconfigreporter/BUILD.bazel +++ b/pkg/spanconfig/spanconfigreporter/BUILD.bazel @@ -28,7 +28,10 @@ go_test( "datadriven_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), deps = [ ":spanconfigreporter", diff --git a/pkg/spanconfig/spanconfigsqltranslator/BUILD.bazel b/pkg/spanconfig/spanconfigsqltranslator/BUILD.bazel index 975d1879c354..43ab902f1150 100644 --- a/pkg/spanconfig/spanconfigsqltranslator/BUILD.bazel +++ b/pkg/spanconfig/spanconfigsqltranslator/BUILD.bazel @@ -24,7 +24,10 @@ go_library( go_test( name = "spanconfigsqltranslator_test", srcs = ["sqltranslator_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), ) diff --git a/pkg/spanconfig/spanconfigsqlwatcher/BUILD.bazel b/pkg/spanconfig/spanconfigsqlwatcher/BUILD.bazel index 24242739cdf3..535248bbc1fa 100644 --- a/pkg/spanconfig/spanconfigsqlwatcher/BUILD.bazel +++ b/pkg/spanconfig/spanconfigsqlwatcher/BUILD.bazel @@ -48,7 +48,10 @@ go_test( "protectedtsdecoder_test.go", "zonesdecoder_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":spanconfigsqlwatcher"], deps = [ "//pkg/base", diff --git a/pkg/spanconfig/spanconfigstore/BUILD.bazel b/pkg/spanconfig/spanconfigstore/BUILD.bazel index 4b09ec6c55c4..1fc44c8779fc 100644 --- a/pkg/spanconfig/spanconfigstore/BUILD.bazel +++ b/pkg/spanconfig/spanconfigstore/BUILD.bazel @@ -39,7 +39,10 @@ go_test( "system_store_test.go", ":entry_interval_btree_test.go", # keep ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":spanconfigstore"], deps = [ diff --git a/pkg/spanconfig/spanconfigtestutils/BUILD.bazel b/pkg/spanconfig/spanconfigtestutils/BUILD.bazel index 773614f5cbc1..1303ebfcd84c 100644 --- a/pkg/spanconfig/spanconfigtestutils/BUILD.bazel +++ b/pkg/spanconfig/spanconfigtestutils/BUILD.bazel @@ -30,7 +30,10 @@ go_library( go_test( name = "spanconfigtestutils_test", srcs = ["utils_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":spanconfigtestutils"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/sql/BUILD.bazel b/pkg/sql/BUILD.bazel index a7d8e6ca01fd..ad43167fef36 100644 --- a/pkg/sql/BUILD.bazel +++ b/pkg/sql/BUILD.bazel @@ -705,7 +705,10 @@ go_test( "zone_config_test.go", "zone_test.go", ], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = glob(["testdata/**"]) + [ "//c-deps:libgeos", "//pkg/sql:information_schema.go", diff --git a/pkg/sql/appstatspb/BUILD.bazel b/pkg/sql/appstatspb/BUILD.bazel index f286ad52d628..f773d2b4c1de 100644 --- a/pkg/sql/appstatspb/BUILD.bazel +++ b/pkg/sql/appstatspb/BUILD.bazel @@ -15,7 +15,10 @@ go_library( go_test( name = "appstatspb_test", srcs = ["app_stats_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":appstatspb"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/sql/backfill/BUILD.bazel b/pkg/sql/backfill/BUILD.bazel index 005511d6b172..43129951fd49 100644 --- a/pkg/sql/backfill/BUILD.bazel +++ b/pkg/sql/backfill/BUILD.bazel @@ -52,7 +52,10 @@ go_library( go_test( name = "backfill_test", srcs = ["index_backfiller_cols_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":backfill"], deps = [ "//pkg/sql/catalog", diff --git a/pkg/sql/cacheutil/BUILD.bazel b/pkg/sql/cacheutil/BUILD.bazel index b1409dcd6605..72ea010148eb 100644 --- a/pkg/sql/cacheutil/BUILD.bazel +++ b/pkg/sql/cacheutil/BUILD.bazel @@ -20,7 +20,10 @@ go_library( go_test( name = "cacheutil_test", srcs = ["cache_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":cacheutil"], deps = [ "//pkg/settings/cluster", diff --git a/pkg/sql/catalog/BUILD.bazel b/pkg/sql/catalog/BUILD.bazel index 0e8c681059c8..0082c38043a7 100644 --- a/pkg/sql/catalog/BUILD.bazel +++ b/pkg/sql/catalog/BUILD.bazel @@ -58,7 +58,10 @@ go_test( "table_col_map_test.go", "table_col_set_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":catalog"], tags = ["no-remote"], deps = [ diff --git a/pkg/sql/catalog/bootstrap/BUILD.bazel b/pkg/sql/catalog/bootstrap/BUILD.bazel index b63430e0cc83..3ea62d753a92 100644 --- a/pkg/sql/catalog/bootstrap/BUILD.bazel +++ b/pkg/sql/catalog/bootstrap/BUILD.bazel @@ -37,7 +37,10 @@ go_library( go_test( name = "bootstrap_test", srcs = ["bootstrap_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":bootstrap"], deps = [ diff --git a/pkg/sql/catalog/catalogkeys/BUILD.bazel b/pkg/sql/catalog/catalogkeys/BUILD.bazel index 6350e247025b..60e9303da152 100644 --- a/pkg/sql/catalog/catalogkeys/BUILD.bazel +++ b/pkg/sql/catalog/catalogkeys/BUILD.bazel @@ -27,7 +27,10 @@ go_test( name = "catalogkeys_test", size = "small", srcs = ["keys_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":catalogkeys"], deps = [ "//pkg/keys", diff --git a/pkg/sql/catalog/catformat/BUILD.bazel b/pkg/sql/catalog/catformat/BUILD.bazel index 61d346737cdd..e22fb7df976d 100644 --- a/pkg/sql/catalog/catformat/BUILD.bazel +++ b/pkg/sql/catalog/catformat/BUILD.bazel @@ -22,7 +22,10 @@ go_test( name = "catformat_test", size = "small", srcs = ["index_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":catformat"], deps = [ "//pkg/sql/catalog/catenumpb", diff --git a/pkg/sql/catalog/catpb/BUILD.bazel b/pkg/sql/catalog/catpb/BUILD.bazel index 24ac54bc37af..9a1ae5dfd79b 100644 --- a/pkg/sql/catalog/catpb/BUILD.bazel +++ b/pkg/sql/catalog/catpb/BUILD.bazel @@ -59,7 +59,10 @@ go_library( go_test( name = "catpb_test", srcs = ["privilege_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":catpb", "//pkg/keys", diff --git a/pkg/sql/catalog/catprivilege/BUILD.bazel b/pkg/sql/catalog/catprivilege/BUILD.bazel index c0e75e92034e..70575d93ace1 100644 --- a/pkg/sql/catalog/catprivilege/BUILD.bazel +++ b/pkg/sql/catalog/catprivilege/BUILD.bazel @@ -30,7 +30,10 @@ go_test( "default_privilege_test.go", "fix_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":catprivilege"], deps = [ "//pkg/keys", diff --git a/pkg/sql/catalog/colinfo/BUILD.bazel b/pkg/sql/catalog/colinfo/BUILD.bazel index 5e08791937dd..251dde916fa3 100644 --- a/pkg/sql/catalog/colinfo/BUILD.bazel +++ b/pkg/sql/catalog/colinfo/BUILD.bazel @@ -42,7 +42,10 @@ go_test( "column_type_properties_test.go", "result_columns_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":colinfo"], deps = [ "//pkg/sql/catalog/colinfo/colinfotestutils", diff --git a/pkg/sql/catalog/dbdesc/BUILD.bazel b/pkg/sql/catalog/dbdesc/BUILD.bazel index 07799bddd560..b37d22756886 100644 --- a/pkg/sql/catalog/dbdesc/BUILD.bazel +++ b/pkg/sql/catalog/dbdesc/BUILD.bazel @@ -34,7 +34,10 @@ go_test( name = "dbdesc_test", size = "small", srcs = ["database_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":dbdesc"], deps = [ "//pkg/clusterversion", diff --git a/pkg/sql/catalog/descpb/BUILD.bazel b/pkg/sql/catalog/descpb/BUILD.bazel index 5d4c4e7554e3..ce53be074cc4 100644 --- a/pkg/sql/catalog/descpb/BUILD.bazel +++ b/pkg/sql/catalog/descpb/BUILD.bazel @@ -40,7 +40,10 @@ go_test( name = "descpb_test", size = "small", srcs = ["structured_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":descpb"], ) diff --git a/pkg/sql/catalog/descs/BUILD.bazel b/pkg/sql/catalog/descs/BUILD.bazel index 15fb80abc7d7..9c603c2f1bb3 100644 --- a/pkg/sql/catalog/descs/BUILD.bazel +++ b/pkg/sql/catalog/descs/BUILD.bazel @@ -86,7 +86,10 @@ go_test( "txn_external_test.go", "txn_with_executor_datadriven_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":descs"], deps = [ diff --git a/pkg/sql/catalog/funcdesc/BUILD.bazel b/pkg/sql/catalog/funcdesc/BUILD.bazel index a04495543fdc..375865bb513b 100644 --- a/pkg/sql/catalog/funcdesc/BUILD.bazel +++ b/pkg/sql/catalog/funcdesc/BUILD.bazel @@ -36,7 +36,10 @@ go_library( go_test( name = "funcdesc_test", srcs = ["func_desc_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":funcdesc", "//pkg/clusterversion", diff --git a/pkg/sql/catalog/hydrateddesccache/BUILD.bazel b/pkg/sql/catalog/hydrateddesccache/BUILD.bazel index 0ef2e3f2df22..a6b81161c714 100644 --- a/pkg/sql/catalog/hydrateddesccache/BUILD.bazel +++ b/pkg/sql/catalog/hydrateddesccache/BUILD.bazel @@ -26,7 +26,10 @@ go_library( go_test( name = "hydrateddesccache_test", srcs = ["hydratedcache_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":hydrateddesccache"], deps = [ "//pkg/security/username", diff --git a/pkg/sql/catalog/internal/catkv/BUILD.bazel b/pkg/sql/catalog/internal/catkv/BUILD.bazel index dc126000d887..1439936ab8a7 100644 --- a/pkg/sql/catalog/internal/catkv/BUILD.bazel +++ b/pkg/sql/catalog/internal/catkv/BUILD.bazel @@ -51,7 +51,10 @@ go_test( "catalog_reader_test.go", "main_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), deps = [ ":catkv", diff --git a/pkg/sql/catalog/internal/validate/BUILD.bazel b/pkg/sql/catalog/internal/validate/BUILD.bazel index 1548ebe3c075..7dc64fe21000 100644 --- a/pkg/sql/catalog/internal/validate/BUILD.bazel +++ b/pkg/sql/catalog/internal/validate/BUILD.bazel @@ -29,7 +29,10 @@ go_test( "helpers_test.go", "schema_changer_state_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":validate"], deps = [ "//pkg/clusterversion", diff --git a/pkg/sql/catalog/lease/BUILD.bazel b/pkg/sql/catalog/lease/BUILD.bazel index fa636185207e..82750f37a3fe 100644 --- a/pkg/sql/catalog/lease/BUILD.bazel +++ b/pkg/sql/catalog/lease/BUILD.bazel @@ -74,7 +74,10 @@ go_test( "lease_test.go", "main_test.go", ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), embed = [":lease"], deps = [ "//pkg/base", diff --git a/pkg/sql/catalog/multiregion/BUILD.bazel b/pkg/sql/catalog/multiregion/BUILD.bazel index 8a8cb8cae65f..607463488eb3 100644 --- a/pkg/sql/catalog/multiregion/BUILD.bazel +++ b/pkg/sql/catalog/multiregion/BUILD.bazel @@ -29,7 +29,10 @@ go_library( go_test( name = "multiregion_test", srcs = ["region_config_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":multiregion", "//pkg/config/zonepb", diff --git a/pkg/sql/catalog/nstree/BUILD.bazel b/pkg/sql/catalog/nstree/BUILD.bazel index 22d654d4e1a2..918b75ecb509 100644 --- a/pkg/sql/catalog/nstree/BUILD.bazel +++ b/pkg/sql/catalog/nstree/BUILD.bazel @@ -42,7 +42,10 @@ go_test( "map_test.go", "set_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":nstree"], deps = [ diff --git a/pkg/sql/catalog/randgen/BUILD.bazel b/pkg/sql/catalog/randgen/BUILD.bazel index 17b699e2c088..7aee6b99e3eb 100644 --- a/pkg/sql/catalog/randgen/BUILD.bazel +++ b/pkg/sql/catalog/randgen/BUILD.bazel @@ -51,7 +51,10 @@ go_library( go_test( name = "randgen_test", srcs = ["template_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":randgen"], deps = [ "//pkg/sql/catalog/desctestutils", diff --git a/pkg/sql/catalog/redact/BUILD.bazel b/pkg/sql/catalog/redact/BUILD.bazel index e2cb8aaa00a3..68b7ec6844a1 100644 --- a/pkg/sql/catalog/redact/BUILD.bazel +++ b/pkg/sql/catalog/redact/BUILD.bazel @@ -22,7 +22,10 @@ go_test( "main_test.go", "redact_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":redact", "//pkg/base", diff --git a/pkg/sql/catalog/resolver/BUILD.bazel b/pkg/sql/catalog/resolver/BUILD.bazel index 9dc8d921e06e..7ea2d932ed4f 100644 --- a/pkg/sql/catalog/resolver/BUILD.bazel +++ b/pkg/sql/catalog/resolver/BUILD.bazel @@ -29,7 +29,10 @@ go_test( "resolver_bench_test.go", "resolver_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":resolver", "//pkg/base", diff --git a/pkg/sql/catalog/schemadesc/BUILD.bazel b/pkg/sql/catalog/schemadesc/BUILD.bazel index 3dcd977affaa..9bf84771e299 100644 --- a/pkg/sql/catalog/schemadesc/BUILD.bazel +++ b/pkg/sql/catalog/schemadesc/BUILD.bazel @@ -41,7 +41,10 @@ go_test( name = "schemadesc_test", size = "small", srcs = ["schema_desc_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":schemadesc", "//pkg/clusterversion", diff --git a/pkg/sql/catalog/schemaexpr/BUILD.bazel b/pkg/sql/catalog/schemaexpr/BUILD.bazel index f793c2d566ae..09f449d37383 100644 --- a/pkg/sql/catalog/schemaexpr/BUILD.bazel +++ b/pkg/sql/catalog/schemaexpr/BUILD.bazel @@ -57,7 +57,10 @@ go_test( "partial_index_test.go", "testutils_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":schemaexpr"], deps = [ diff --git a/pkg/sql/catalog/schematelemetry/BUILD.bazel b/pkg/sql/catalog/schematelemetry/BUILD.bazel index faf2ec26f4b0..67af35741c36 100644 --- a/pkg/sql/catalog/schematelemetry/BUILD.bazel +++ b/pkg/sql/catalog/schematelemetry/BUILD.bazel @@ -45,7 +45,10 @@ go_test( "main_test.go", "schema_telemetry_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ "//pkg/base", "//pkg/jobs", diff --git a/pkg/sql/catalog/schematelemetry/schematelemetrycontroller/BUILD.bazel b/pkg/sql/catalog/schematelemetry/schematelemetrycontroller/BUILD.bazel index e2c159e23397..660443e4b908 100644 --- a/pkg/sql/catalog/schematelemetry/schematelemetrycontroller/BUILD.bazel +++ b/pkg/sql/catalog/schematelemetry/schematelemetrycontroller/BUILD.bazel @@ -48,7 +48,10 @@ go_library( go_test( name = "schematelemetrycontroller_test", srcs = ["rewrite_cron_expr_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":schematelemetrycontroller"], deps = [ diff --git a/pkg/sql/catalog/seqexpr/BUILD.bazel b/pkg/sql/catalog/seqexpr/BUILD.bazel index b9d1144c4a11..583db85a5da9 100644 --- a/pkg/sql/catalog/seqexpr/BUILD.bazel +++ b/pkg/sql/catalog/seqexpr/BUILD.bazel @@ -23,7 +23,10 @@ go_library( go_test( name = "seqexpr_test", srcs = ["sequence_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":seqexpr", "//pkg/sql/catalog/descpb", diff --git a/pkg/sql/catalog/systemschema_test/BUILD.bazel b/pkg/sql/catalog/systemschema_test/BUILD.bazel index f244c38fa866..6f02c0bf11d4 100644 --- a/pkg/sql/catalog/systemschema_test/BUILD.bazel +++ b/pkg/sql/catalog/systemschema_test/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "main_test.go", "systemschema_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), deps = [ "//pkg/base", diff --git a/pkg/sql/catalog/tabledesc/BUILD.bazel b/pkg/sql/catalog/tabledesc/BUILD.bazel index 66ae3a187ea7..cf0615fac161 100644 --- a/pkg/sql/catalog/tabledesc/BUILD.bazel +++ b/pkg/sql/catalog/tabledesc/BUILD.bazel @@ -82,7 +82,10 @@ go_test( "table_desc_test.go", "validate_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":tabledesc"], deps = [ "//pkg/base", diff --git a/pkg/sql/catalog/typedesc/BUILD.bazel b/pkg/sql/catalog/typedesc/BUILD.bazel index 5d45f5d5c812..f69b07d35eb7 100644 --- a/pkg/sql/catalog/typedesc/BUILD.bazel +++ b/pkg/sql/catalog/typedesc/BUILD.bazel @@ -45,7 +45,10 @@ go_test( "safe_format_test.go", "type_desc_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":typedesc", "//pkg/clusterversion", diff --git a/pkg/sql/clusterunique/BUILD.bazel b/pkg/sql/clusterunique/BUILD.bazel index 24cf30e6485f..fbf2fb022f71 100644 --- a/pkg/sql/clusterunique/BUILD.bazel +++ b/pkg/sql/clusterunique/BUILD.bazel @@ -18,7 +18,10 @@ go_library( go_test( name = "clusterunique_test", srcs = ["id_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":clusterunique"], deps = [ "//pkg/util/uint128", diff --git a/pkg/sql/colcontainer/BUILD.bazel b/pkg/sql/colcontainer/BUILD.bazel index 767aa256c692..0006eeea3a0a 100644 --- a/pkg/sql/colcontainer/BUILD.bazel +++ b/pkg/sql/colcontainer/BUILD.bazel @@ -34,7 +34,10 @@ go_test( "main_test.go", "partitionedqueue_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":colcontainer", "//pkg/col/coldata", diff --git a/pkg/sql/colconv/BUILD.bazel b/pkg/sql/colconv/BUILD.bazel index 5014f3b40386..7fbdc3eb58d4 100644 --- a/pkg/sql/colconv/BUILD.bazel +++ b/pkg/sql/colconv/BUILD.bazel @@ -31,7 +31,10 @@ go_library( go_test( name = "colconv_test", srcs = ["batch_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":colconv"], deps = [ "//pkg/col/coldata", diff --git a/pkg/sql/colenc/BUILD.bazel b/pkg/sql/colenc/BUILD.bazel index 1d480491b369..47af597c7dc5 100644 --- a/pkg/sql/colenc/BUILD.bazel +++ b/pkg/sql/colenc/BUILD.bazel @@ -49,7 +49,10 @@ go_test( "encode_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = ["//c-deps:libgeos"], deps = [ ":colenc", diff --git a/pkg/sql/colencoding/BUILD.bazel b/pkg/sql/colencoding/BUILD.bazel index 5f118f41be10..4c40eb4b6011 100644 --- a/pkg/sql/colencoding/BUILD.bazel +++ b/pkg/sql/colencoding/BUILD.bazel @@ -33,7 +33,10 @@ go_test( name = "colencoding_test", size = "small", srcs = ["value_encoding_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":colencoding"], deps = [ "//pkg/col/coldata", diff --git a/pkg/sql/colexec/BUILD.bazel b/pkg/sql/colexec/BUILD.bazel index 998bfd6df4d6..fe2819b52adf 100644 --- a/pkg/sql/colexec/BUILD.bazel +++ b/pkg/sql/colexec/BUILD.bazel @@ -135,7 +135,10 @@ go_test( "types_integration_test.go", "values_test.go", ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), embed = [":colexec"], shard_count = 16, deps = [ diff --git a/pkg/sql/colexec/colbuilder/BUILD.bazel b/pkg/sql/colexec/colbuilder/BUILD.bazel index 6e73f609a5fe..f018d4bef537 100644 --- a/pkg/sql/colexec/colbuilder/BUILD.bazel +++ b/pkg/sql/colexec/colbuilder/BUILD.bazel @@ -56,7 +56,10 @@ go_test( "execplan_test.go", "main_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":colbuilder"], deps = [ "//pkg/base", diff --git a/pkg/sql/colexec/colexecbase/BUILD.bazel b/pkg/sql/colexec/colexecbase/BUILD.bazel index cc6cdf46d420..b7cefc234cdd 100644 --- a/pkg/sql/colexec/colexecbase/BUILD.bazel +++ b/pkg/sql/colexec/colexecbase/BUILD.bazel @@ -54,7 +54,10 @@ go_test( "ordinality_test.go", "simple_project_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), tags = ["no-remote"], deps = [ ":colexecbase", diff --git a/pkg/sql/colexec/colexecdisk/BUILD.bazel b/pkg/sql/colexec/colexecdisk/BUILD.bazel index f7b6b1c5a874..530c200a93cf 100644 --- a/pkg/sql/colexec/colexecdisk/BUILD.bazel +++ b/pkg/sql/colexec/colexecdisk/BUILD.bazel @@ -49,7 +49,10 @@ go_test( "inject_setup_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":colexecdisk"], deps = [ "//pkg/col/coldata", diff --git a/pkg/sql/colexec/colexechash/BUILD.bazel b/pkg/sql/colexec/colexechash/BUILD.bazel index dd0866ebc6b2..e5c93b978044 100644 --- a/pkg/sql/colexec/colexechash/BUILD.bazel +++ b/pkg/sql/colexec/colexechash/BUILD.bazel @@ -38,7 +38,10 @@ go_test( "hash_utils_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":colexechash"], tags = ["no-remote"], deps = [ diff --git a/pkg/sql/colexec/colexecjoin/BUILD.bazel b/pkg/sql/colexec/colexecjoin/BUILD.bazel index 24ab641d1ab2..7cecdb4f382f 100644 --- a/pkg/sql/colexec/colexecjoin/BUILD.bazel +++ b/pkg/sql/colexec/colexecjoin/BUILD.bazel @@ -48,7 +48,10 @@ go_test( "main_test.go", "mergejoiner_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":colexecjoin"], tags = ["no-remote"], deps = [ diff --git a/pkg/sql/colexec/colexecproj/BUILD.bazel b/pkg/sql/colexec/colexecproj/BUILD.bazel index 1c9520beda64..8321343e32ed 100644 --- a/pkg/sql/colexec/colexecproj/BUILD.bazel +++ b/pkg/sql/colexec/colexecproj/BUILD.bazel @@ -44,7 +44,10 @@ go_test( "main_test.go", "projection_ops_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":colexecproj"], # keep tags = ["no-remote"], deps = [ diff --git a/pkg/sql/colexec/colexecprojconst/BUILD.bazel b/pkg/sql/colexec/colexecprojconst/BUILD.bazel index d56bf6d9a6d8..4c18623eba7b 100644 --- a/pkg/sql/colexec/colexecprojconst/BUILD.bazel +++ b/pkg/sql/colexec/colexecprojconst/BUILD.bazel @@ -43,7 +43,10 @@ go_library( go_test( name = "colexecprojconst_test", srcs = ["projection_ops_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":colexecprojconst"], deps = [ "//pkg/sql/colexecop", diff --git a/pkg/sql/colexec/colexecsel/BUILD.bazel b/pkg/sql/colexec/colexecsel/BUILD.bazel index ce60efd5cdd3..b24e6e23adca 100644 --- a/pkg/sql/colexec/colexecsel/BUILD.bazel +++ b/pkg/sql/colexec/colexecsel/BUILD.bazel @@ -39,7 +39,10 @@ go_test( "main_test.go", "selection_ops_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":colexecsel"], tags = ["no-remote"], deps = [ diff --git a/pkg/sql/colexec/colexecspan/BUILD.bazel b/pkg/sql/colexec/colexecspan/BUILD.bazel index 2d63f6150eb3..20c7d7394569 100644 --- a/pkg/sql/colexec/colexecspan/BUILD.bazel +++ b/pkg/sql/colexec/colexecspan/BUILD.bazel @@ -42,7 +42,10 @@ go_test( "main_test.go", "span_assembler_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":colexecspan"], # keep tags = ["no-remote"], deps = [ diff --git a/pkg/sql/colexec/colexectestutils/BUILD.bazel b/pkg/sql/colexec/colexectestutils/BUILD.bazel index 30ba91e233a7..8f958ee27d67 100644 --- a/pkg/sql/colexec/colexectestutils/BUILD.bazel +++ b/pkg/sql/colexec/colexectestutils/BUILD.bazel @@ -49,7 +49,10 @@ go_test( "main_test.go", "utils_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":colexectestutils"], deps = [ "//pkg/col/coldata", diff --git a/pkg/sql/colexec/colexecutils/BUILD.bazel b/pkg/sql/colexec/colexecutils/BUILD.bazel index 1761cf8a92d0..752c050f60f7 100644 --- a/pkg/sql/colexec/colexecutils/BUILD.bazel +++ b/pkg/sql/colexec/colexecutils/BUILD.bazel @@ -50,7 +50,10 @@ go_test( "spilling_buffer_test.go", "spilling_queue_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":colexecutils"], tags = ["no-remote"], deps = [ diff --git a/pkg/sql/colexec/colexecwindow/BUILD.bazel b/pkg/sql/colexec/colexecwindow/BUILD.bazel index f8c8247778fe..20c3ef4ec059 100644 --- a/pkg/sql/colexec/colexecwindow/BUILD.bazel +++ b/pkg/sql/colexec/colexecwindow/BUILD.bazel @@ -56,7 +56,10 @@ go_test( "window_framer_test.go", "window_functions_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":colexecwindow"], tags = ["no-remote"], deps = [ diff --git a/pkg/sql/colexec/execgen/BUILD.bazel b/pkg/sql/colexec/execgen/BUILD.bazel index 0e8371451e81..e4314d33eac8 100644 --- a/pkg/sql/colexec/execgen/BUILD.bazel +++ b/pkg/sql/colexec/execgen/BUILD.bazel @@ -33,7 +33,10 @@ go_test( "template_test.go", "util_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":execgen"], deps = [ diff --git a/pkg/sql/colexecerror/BUILD.bazel b/pkg/sql/colexecerror/BUILD.bazel index fa5cd951807c..9552d1136194 100644 --- a/pkg/sql/colexecerror/BUILD.bazel +++ b/pkg/sql/colexecerror/BUILD.bazel @@ -17,7 +17,10 @@ go_library( go_test( name = "colexecerror_test", srcs = ["error_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":colexecerror", "//pkg/util/leaktest", diff --git a/pkg/sql/colfetcher/BUILD.bazel b/pkg/sql/colfetcher/BUILD.bazel index 98c9543e3900..78a1ab8f09d8 100644 --- a/pkg/sql/colfetcher/BUILD.bazel +++ b/pkg/sql/colfetcher/BUILD.bazel @@ -86,7 +86,10 @@ go_test( "main_test.go", "vectorized_batch_size_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ "//pkg/base", "//pkg/security/securityassets", diff --git a/pkg/sql/colflow/BUILD.bazel b/pkg/sql/colflow/BUILD.bazel index 6860aea5182d..f45db5c41724 100644 --- a/pkg/sql/colflow/BUILD.bazel +++ b/pkg/sql/colflow/BUILD.bazel @@ -82,7 +82,10 @@ go_test( "vectorized_meta_propagation_test.go", "vectorized_panic_propagation_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":colflow"], tags = ["no-remote"], deps = [ diff --git a/pkg/sql/colflow/colrpc/BUILD.bazel b/pkg/sql/colflow/colrpc/BUILD.bazel index 37fd800f79d4..bf3f3c23bfa2 100644 --- a/pkg/sql/colflow/colrpc/BUILD.bazel +++ b/pkg/sql/colflow/colrpc/BUILD.bazel @@ -47,7 +47,10 @@ go_test( "main_test.go", "outbox_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":colrpc"], deps = [ "//pkg/base", diff --git a/pkg/sql/colmem/BUILD.bazel b/pkg/sql/colmem/BUILD.bazel index 29efe82fbc1c..69e2961912d6 100644 --- a/pkg/sql/colmem/BUILD.bazel +++ b/pkg/sql/colmem/BUILD.bazel @@ -28,7 +28,10 @@ go_test( "allocator_test.go", "reset_maybe_reallocate_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":colmem"], deps = [ "//pkg/col/coldata", diff --git a/pkg/sql/compengine/BUILD.bazel b/pkg/sql/compengine/BUILD.bazel index af1b61fd69f3..dfa49186ea26 100644 --- a/pkg/sql/compengine/BUILD.bazel +++ b/pkg/sql/compengine/BUILD.bazel @@ -24,7 +24,10 @@ go_library( go_test( name = "compengine_test", srcs = ["sketch_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":compengine"], deps = [ diff --git a/pkg/sql/comprules/BUILD.bazel b/pkg/sql/comprules/BUILD.bazel index ffe11d570647..1cf008fd7685 100644 --- a/pkg/sql/comprules/BUILD.bazel +++ b/pkg/sql/comprules/BUILD.bazel @@ -19,7 +19,10 @@ go_library( go_test( name = "comprules_test", srcs = ["rules_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":comprules"], deps = [ diff --git a/pkg/sql/contention/BUILD.bazel b/pkg/sql/contention/BUILD.bazel index 60a9c5771983..3a081f58a012 100644 --- a/pkg/sql/contention/BUILD.bazel +++ b/pkg/sql/contention/BUILD.bazel @@ -45,7 +45,10 @@ go_test( "resolver_test.go", "utils_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":contention"], deps = [ diff --git a/pkg/sql/contention/contentionutils/BUILD.bazel b/pkg/sql/contention/contentionutils/BUILD.bazel index 4033e4c5d8e0..9cbafc974c21 100644 --- a/pkg/sql/contention/contentionutils/BUILD.bazel +++ b/pkg/sql/contention/contentionutils/BUILD.bazel @@ -12,7 +12,10 @@ go_library( go_test( name = "contentionutils_test", srcs = ["concurrent_buffer_guard_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":contentionutils"], deps = [ "//pkg/util/syncutil", diff --git a/pkg/sql/contention/txnidcache/BUILD.bazel b/pkg/sql/contention/txnidcache/BUILD.bazel index 3aacc3167e2b..15884b68ccd3 100644 --- a/pkg/sql/contention/txnidcache/BUILD.bazel +++ b/pkg/sql/contention/txnidcache/BUILD.bazel @@ -35,7 +35,10 @@ go_test( "txn_id_cache_test.go", "writer_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":txnidcache"], deps = [ diff --git a/pkg/sql/contentionpb/BUILD.bazel b/pkg/sql/contentionpb/BUILD.bazel index d77b6d19239f..6c3a9053bdf0 100644 --- a/pkg/sql/contentionpb/BUILD.bazel +++ b/pkg/sql/contentionpb/BUILD.bazel @@ -50,7 +50,10 @@ go_proto_library( go_test( name = "contentionpb_test", srcs = ["contention_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":contentionpb"], deps = [ "//pkg/sql/clusterunique", diff --git a/pkg/sql/copy/BUILD.bazel b/pkg/sql/copy/BUILD.bazel index c93608860020..6b585c2eb3f7 100644 --- a/pkg/sql/copy/BUILD.bazel +++ b/pkg/sql/copy/BUILD.bazel @@ -9,7 +9,10 @@ go_test( "copy_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), deps = [ "//pkg/base", diff --git a/pkg/sql/covering/BUILD.bazel b/pkg/sql/covering/BUILD.bazel index 9b5434ca2eda..ca7b3e5fcb15 100644 --- a/pkg/sql/covering/BUILD.bazel +++ b/pkg/sql/covering/BUILD.bazel @@ -16,7 +16,10 @@ go_test( "main_test.go", "overlap_merge_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":covering"], deps = [ "//pkg/util/leaktest", diff --git a/pkg/sql/decodeusername/BUILD.bazel b/pkg/sql/decodeusername/BUILD.bazel index 35112df6f9bb..ba9ca7c98c71 100644 --- a/pkg/sql/decodeusername/BUILD.bazel +++ b/pkg/sql/decodeusername/BUILD.bazel @@ -19,7 +19,10 @@ go_library( go_test( name = "decodeusername_test", srcs = ["role_spec_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":decodeusername"], deps = [ "//pkg/security/username", diff --git a/pkg/sql/descmetadata/BUILD.bazel b/pkg/sql/descmetadata/BUILD.bazel index a4bf90e5ff74..6e9bf6a68424 100644 --- a/pkg/sql/descmetadata/BUILD.bazel +++ b/pkg/sql/descmetadata/BUILD.bazel @@ -21,7 +21,10 @@ go_library( go_test( name = "descmetadata_test", srcs = ["main_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ "//pkg/security/securityassets", "//pkg/security/securitytest", diff --git a/pkg/sql/distsql/BUILD.bazel b/pkg/sql/distsql/BUILD.bazel index a95f90942b8e..f878e2f45482 100644 --- a/pkg/sql/distsql/BUILD.bazel +++ b/pkg/sql/distsql/BUILD.bazel @@ -50,7 +50,10 @@ go_test( "setup_flow_after_drain_test.go", "vectorized_panic_propagation_test.go", ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), embed = [":distsql"], deps = [ "//pkg/base", diff --git a/pkg/sql/doctor/BUILD.bazel b/pkg/sql/doctor/BUILD.bazel index cc2aaaae370a..d491482ed9fc 100644 --- a/pkg/sql/doctor/BUILD.bazel +++ b/pkg/sql/doctor/BUILD.bazel @@ -29,7 +29,10 @@ go_test( name = "doctor_test", size = "small", srcs = ["doctor_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":doctor", "//pkg/clusterversion", diff --git a/pkg/sql/enum/BUILD.bazel b/pkg/sql/enum/BUILD.bazel index 24837b6e3192..97e473888bc8 100644 --- a/pkg/sql/enum/BUILD.bazel +++ b/pkg/sql/enum/BUILD.bazel @@ -12,7 +12,10 @@ go_test( name = "enum_test", size = "small", srcs = ["enum_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":enum"], deps = [ "//pkg/util/leaktest", diff --git a/pkg/sql/execinfra/BUILD.bazel b/pkg/sql/execinfra/BUILD.bazel index 6832fc3a6b4e..046b8d8207a3 100644 --- a/pkg/sql/execinfra/BUILD.bazel +++ b/pkg/sql/execinfra/BUILD.bazel @@ -91,7 +91,10 @@ go_test( "base_test.go", "main_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":execinfra"], tags = ["no-remote"], deps = [ diff --git a/pkg/sql/execinfrapb/BUILD.bazel b/pkg/sql/execinfrapb/BUILD.bazel index 85b8f1de24d7..7565900a5fdc 100644 --- a/pkg/sql/execinfrapb/BUILD.bazel +++ b/pkg/sql/execinfrapb/BUILD.bazel @@ -75,7 +75,10 @@ go_test( "flow_diagram_external_test.go", "flow_diagram_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":execinfrapb"], deps = [ "//pkg/base", diff --git a/pkg/sql/execstats/BUILD.bazel b/pkg/sql/execstats/BUILD.bazel index ffcda9dab8e6..d56821d15b6e 100644 --- a/pkg/sql/execstats/BUILD.bazel +++ b/pkg/sql/execstats/BUILD.bazel @@ -32,7 +32,10 @@ go_test( "traceanalyzer_test.go", "utils_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":execstats"], deps = [ "//pkg/base", diff --git a/pkg/sql/exprutil/BUILD.bazel b/pkg/sql/exprutil/BUILD.bazel index 686af60f44d3..132298cc10a8 100644 --- a/pkg/sql/exprutil/BUILD.bazel +++ b/pkg/sql/exprutil/BUILD.bazel @@ -38,7 +38,10 @@ go_library( go_test( name = "exprutil_test", srcs = ["evaluator_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":exprutil", "//pkg/settings/cluster", diff --git a/pkg/sql/flowinfra/BUILD.bazel b/pkg/sql/flowinfra/BUILD.bazel index b589393aa863..b0f401e6757f 100644 --- a/pkg/sql/flowinfra/BUILD.bazel +++ b/pkg/sql/flowinfra/BUILD.bazel @@ -67,7 +67,10 @@ go_test( "stream_data_test.go", "utils_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":flowinfra"], tags = ["no-remote"], deps = [ diff --git a/pkg/sql/gcjob/BUILD.bazel b/pkg/sql/gcjob/BUILD.bazel index c70fbcb350e9..6722bf308579 100644 --- a/pkg/sql/gcjob/BUILD.bazel +++ b/pkg/sql/gcjob/BUILD.bazel @@ -58,7 +58,10 @@ go_test( "main_test.go", "table_garbage_collection_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":gcjob"], deps = [ "//pkg/base", diff --git a/pkg/sql/gcjob/gcjobnotifier/BUILD.bazel b/pkg/sql/gcjob/gcjobnotifier/BUILD.bazel index cf0441cd8fa3..84fa4150a948 100644 --- a/pkg/sql/gcjob/gcjobnotifier/BUILD.bazel +++ b/pkg/sql/gcjob/gcjobnotifier/BUILD.bazel @@ -24,7 +24,10 @@ go_test( name = "gcjobnotifier_test", size = "small", srcs = ["notifier_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":gcjobnotifier"], deps = [ "//pkg/config", diff --git a/pkg/sql/gcjob_test/BUILD.bazel b/pkg/sql/gcjob_test/BUILD.bazel index ec743901f9de..9a7bd8237566 100644 --- a/pkg/sql/gcjob_test/BUILD.bazel +++ b/pkg/sql/gcjob_test/BUILD.bazel @@ -8,7 +8,10 @@ go_test( "gc_job_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ "//pkg/base", "//pkg/clusterversion", diff --git a/pkg/sql/idxrecommendations/BUILD.bazel b/pkg/sql/idxrecommendations/BUILD.bazel index e0b20ae43024..0067b1cbad37 100644 --- a/pkg/sql/idxrecommendations/BUILD.bazel +++ b/pkg/sql/idxrecommendations/BUILD.bazel @@ -25,7 +25,10 @@ go_test( "idx_recommendations_cache_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":idxrecommendations", "//pkg/security/securityassets", diff --git a/pkg/sql/idxusage/BUILD.bazel b/pkg/sql/idxusage/BUILD.bazel index 3d2a3868f649..9d0c4d7beeda 100644 --- a/pkg/sql/idxusage/BUILD.bazel +++ b/pkg/sql/idxusage/BUILD.bazel @@ -29,7 +29,10 @@ go_test( "index_usage_stats_rec_test.go", "local_index_usage_stats_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":idxusage"], deps = [ "//pkg/roachpb", diff --git a/pkg/sql/importer/BUILD.bazel b/pkg/sql/importer/BUILD.bazel index 0f8478a1d970..07a2e4ab1eb5 100644 --- a/pkg/sql/importer/BUILD.bazel +++ b/pkg/sql/importer/BUILD.bazel @@ -157,7 +157,10 @@ go_test( "read_import_pgdump_test.go", "testutils_test.go", ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), data = glob(["testdata/**"]) + ["//c-deps:libgeos"], embed = [":importer"], # It's a large test, so use 16 shards to run test cases. diff --git a/pkg/sql/inverted/BUILD.bazel b/pkg/sql/inverted/BUILD.bazel index bd9b6d0e98a1..89ca69ac0ea8 100644 --- a/pkg/sql/inverted/BUILD.bazel +++ b/pkg/sql/inverted/BUILD.bazel @@ -22,7 +22,10 @@ go_test( name = "inverted_test", size = "small", srcs = ["expression_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":inverted"], deps = [ diff --git a/pkg/sql/lex/BUILD.bazel b/pkg/sql/lex/BUILD.bazel index f00e9ef7e0c7..d6c3a850590a 100644 --- a/pkg/sql/lex/BUILD.bazel +++ b/pkg/sql/lex/BUILD.bazel @@ -21,7 +21,10 @@ go_library( go_test( name = "lex_test", srcs = ["encode_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [":lex"], ) diff --git a/pkg/sql/lexbase/BUILD.bazel b/pkg/sql/lexbase/BUILD.bazel index 4f6d16aaca1b..c9383b0f4932 100644 --- a/pkg/sql/lexbase/BUILD.bazel +++ b/pkg/sql/lexbase/BUILD.bazel @@ -24,7 +24,10 @@ go_test( name = "lexbase_test", size = "small", srcs = ["encode_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":lexbase", "//pkg/sql/parser", diff --git a/pkg/sql/logictest/BUILD.bazel b/pkg/sql/logictest/BUILD.bazel index 801a09179ff2..91a1aeff2b13 100644 --- a/pkg/sql/logictest/BUILD.bazel +++ b/pkg/sql/logictest/BUILD.bazel @@ -85,7 +85,10 @@ go_test( "main_test.go", "parallel_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = [":testdata"], embed = [":logictest"], deps = [ diff --git a/pkg/sql/logictest/tests/5node-disk/BUILD.bazel b/pkg/sql/logictest/tests/5node-disk/BUILD.bazel index 32451b5f6772..8cccd4efc2ee 100644 --- a/pkg/sql/logictest/tests/5node-disk/BUILD.bazel +++ b/pkg/sql/logictest/tests/5node-disk/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "5node-disk_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/logictest:testdata", # keep diff --git a/pkg/sql/logictest/tests/5node/BUILD.bazel b/pkg/sql/logictest/tests/5node/BUILD.bazel index c23e345ef414..ea9e79a3e980 100644 --- a/pkg/sql/logictest/tests/5node/BUILD.bazel +++ b/pkg/sql/logictest/tests/5node/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "5node_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/logictest:testdata", # keep diff --git a/pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/BUILD.bazel b/pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/BUILD.bazel index 865fbe3f2745..05b0650294f1 100644 --- a/pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/BUILD.bazel +++ b/pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "cockroach-go-testserver-upgrade-to-master_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/cmd/cockroach-short", # keep diff --git a/pkg/sql/logictest/tests/fakedist-disk/BUILD.bazel b/pkg/sql/logictest/tests/fakedist-disk/BUILD.bazel index b3488614f4c9..9537ab7e25ef 100644 --- a/pkg/sql/logictest/tests/fakedist-disk/BUILD.bazel +++ b/pkg/sql/logictest/tests/fakedist-disk/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "fakedist-disk_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/logictest:testdata", # keep diff --git a/pkg/sql/logictest/tests/fakedist-vec-off/BUILD.bazel b/pkg/sql/logictest/tests/fakedist-vec-off/BUILD.bazel index 6a61660d70f1..c3bf12780b9e 100644 --- a/pkg/sql/logictest/tests/fakedist-vec-off/BUILD.bazel +++ b/pkg/sql/logictest/tests/fakedist-vec-off/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "fakedist-vec-off_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/logictest:testdata", # keep diff --git a/pkg/sql/logictest/tests/fakedist/BUILD.bazel b/pkg/sql/logictest/tests/fakedist/BUILD.bazel index ddb1978f59a3..e8c0abe7b814 100644 --- a/pkg/sql/logictest/tests/fakedist/BUILD.bazel +++ b/pkg/sql/logictest/tests/fakedist/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "fakedist_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/logictest:testdata", # keep diff --git a/pkg/sql/logictest/tests/local-legacy-schema-changer/BUILD.bazel b/pkg/sql/logictest/tests/local-legacy-schema-changer/BUILD.bazel index a22efc4fd9b1..4c515b1720bd 100644 --- a/pkg/sql/logictest/tests/local-legacy-schema-changer/BUILD.bazel +++ b/pkg/sql/logictest/tests/local-legacy-schema-changer/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "local-legacy-schema-changer_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/logictest:testdata", # keep diff --git a/pkg/sql/logictest/tests/local-mixed-22.2-23.1/BUILD.bazel b/pkg/sql/logictest/tests/local-mixed-22.2-23.1/BUILD.bazel index 7efb73de5af3..4d7e42d33e40 100644 --- a/pkg/sql/logictest/tests/local-mixed-22.2-23.1/BUILD.bazel +++ b/pkg/sql/logictest/tests/local-mixed-22.2-23.1/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "local-mixed-22_2-23_1_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/logictest:testdata", # keep diff --git a/pkg/sql/logictest/tests/local-vec-off/BUILD.bazel b/pkg/sql/logictest/tests/local-vec-off/BUILD.bazel index 5b2fb3374a51..79e23b060637 100644 --- a/pkg/sql/logictest/tests/local-vec-off/BUILD.bazel +++ b/pkg/sql/logictest/tests/local-vec-off/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "local-vec-off_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/logictest:testdata", # keep diff --git a/pkg/sql/logictest/tests/local/BUILD.bazel b/pkg/sql/logictest/tests/local/BUILD.bazel index c869729e8b80..8622ebe2aba5 100644 --- a/pkg/sql/logictest/tests/local/BUILD.bazel +++ b/pkg/sql/logictest/tests/local/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "local_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/logictest:testdata", # keep diff --git a/pkg/sql/logictest/tests/multiregion-9node-3region-3azs/BUILD.bazel b/pkg/sql/logictest/tests/multiregion-9node-3region-3azs/BUILD.bazel index 989f366d5dfc..51b3440bfe0a 100644 --- a/pkg/sql/logictest/tests/multiregion-9node-3region-3azs/BUILD.bazel +++ b/pkg/sql/logictest/tests/multiregion-9node-3region-3azs/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "multiregion-9node-3region-3azs_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/logictest:testdata", # keep diff --git a/pkg/sql/logictest/tests/multiregion-invalid-locality/BUILD.bazel b/pkg/sql/logictest/tests/multiregion-invalid-locality/BUILD.bazel index 6730f376770b..b7eb609f8205 100644 --- a/pkg/sql/logictest/tests/multiregion-invalid-locality/BUILD.bazel +++ b/pkg/sql/logictest/tests/multiregion-invalid-locality/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "multiregion-invalid-locality_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/logictest:testdata", # keep diff --git a/pkg/sql/oidext/BUILD.bazel b/pkg/sql/oidext/BUILD.bazel index c25aabf86b91..3cf500fe1d84 100644 --- a/pkg/sql/oidext/BUILD.bazel +++ b/pkg/sql/oidext/BUILD.bazel @@ -13,7 +13,10 @@ go_test( name = "oidext_test", size = "small", srcs = ["oidext_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":oidext"], deps = [ "@com_github_lib_pq//oid", diff --git a/pkg/sql/opt/BUILD.bazel b/pkg/sql/opt/BUILD.bazel index 51803f0dd4f4..00d09b5fc7dd 100644 --- a/pkg/sql/opt/BUILD.bazel +++ b/pkg/sql/opt/BUILD.bazel @@ -60,7 +60,10 @@ go_test( "operator_test.go", "ordering_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":opt"], deps = [ "//pkg/roachpb", diff --git a/pkg/sql/opt/bench/BUILD.bazel b/pkg/sql/opt/bench/BUILD.bazel index b43ee8bd4114..f0ab46fef8dc 100644 --- a/pkg/sql/opt/bench/BUILD.bazel +++ b/pkg/sql/opt/bench/BUILD.bazel @@ -15,7 +15,10 @@ go_test( "bench_test.go", "fk_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":bench"], deps = [ "//pkg/base", diff --git a/pkg/sql/opt/cat/BUILD.bazel b/pkg/sql/opt/cat/BUILD.bazel index 70f734f6f81e..4040be8f79b4 100644 --- a/pkg/sql/opt/cat/BUILD.bazel +++ b/pkg/sql/opt/cat/BUILD.bazel @@ -42,7 +42,10 @@ go_test( name = "cat_test", size = "small", srcs = ["utils_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":cat", "//pkg/sql/catalog/descpb", diff --git a/pkg/sql/opt/constraint/BUILD.bazel b/pkg/sql/opt/constraint/BUILD.bazel index f938b177ea3d..0470f2c7b38c 100644 --- a/pkg/sql/opt/constraint/BUILD.bazel +++ b/pkg/sql/opt/constraint/BUILD.bazel @@ -37,7 +37,10 @@ go_test( "span_test.go", "spans_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":constraint"], deps = [ "//pkg/settings/cluster", diff --git a/pkg/sql/opt/cycle/BUILD.bazel b/pkg/sql/opt/cycle/BUILD.bazel index 23202e6c9818..76116912aac3 100644 --- a/pkg/sql/opt/cycle/BUILD.bazel +++ b/pkg/sql/opt/cycle/BUILD.bazel @@ -11,7 +11,10 @@ go_library( go_test( name = "cycle_test", srcs = ["detector_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":cycle"], ) diff --git a/pkg/sql/opt/distribution/BUILD.bazel b/pkg/sql/opt/distribution/BUILD.bazel index 172594b7b75c..26b2ddec11e6 100644 --- a/pkg/sql/opt/distribution/BUILD.bazel +++ b/pkg/sql/opt/distribution/BUILD.bazel @@ -20,7 +20,10 @@ go_library( go_test( name = "distribution_test", srcs = ["distribution_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":distribution"], deps = [ "//pkg/settings/cluster", diff --git a/pkg/sql/opt/exec/execbuilder/BUILD.bazel b/pkg/sql/opt/exec/execbuilder/BUILD.bazel index 7a9a4cd6ec10..d2b446308442 100644 --- a/pkg/sql/opt/exec/execbuilder/BUILD.bazel +++ b/pkg/sql/opt/exec/execbuilder/BUILD.bazel @@ -67,7 +67,10 @@ go_test( "main_test.go", "mutation_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = [ ":testdata", "//c-deps:libgeos", diff --git a/pkg/sql/opt/exec/execbuilder/tests/5node/BUILD.bazel b/pkg/sql/opt/exec/execbuilder/tests/5node/BUILD.bazel index 4cd343d82811..e316e11ef50f 100644 --- a/pkg/sql/opt/exec/execbuilder/tests/5node/BUILD.bazel +++ b/pkg/sql/opt/exec/execbuilder/tests/5node/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "5node_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/opt/exec/execbuilder:testdata", # keep diff --git a/pkg/sql/opt/exec/execbuilder/tests/fakedist-disk/BUILD.bazel b/pkg/sql/opt/exec/execbuilder/tests/fakedist-disk/BUILD.bazel index 390a49c7d59d..0d03bb20b8a0 100644 --- a/pkg/sql/opt/exec/execbuilder/tests/fakedist-disk/BUILD.bazel +++ b/pkg/sql/opt/exec/execbuilder/tests/fakedist-disk/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "fakedist-disk_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/opt/exec/execbuilder:testdata", # keep diff --git a/pkg/sql/opt/exec/execbuilder/tests/fakedist-vec-off/BUILD.bazel b/pkg/sql/opt/exec/execbuilder/tests/fakedist-vec-off/BUILD.bazel index bc3e3a455cc4..840f5425917a 100644 --- a/pkg/sql/opt/exec/execbuilder/tests/fakedist-vec-off/BUILD.bazel +++ b/pkg/sql/opt/exec/execbuilder/tests/fakedist-vec-off/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "fakedist-vec-off_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/opt/exec/execbuilder:testdata", # keep diff --git a/pkg/sql/opt/exec/execbuilder/tests/fakedist/BUILD.bazel b/pkg/sql/opt/exec/execbuilder/tests/fakedist/BUILD.bazel index e80e7316c5da..22862d4bc63b 100644 --- a/pkg/sql/opt/exec/execbuilder/tests/fakedist/BUILD.bazel +++ b/pkg/sql/opt/exec/execbuilder/tests/fakedist/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "fakedist_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/opt/exec/execbuilder:testdata", # keep diff --git a/pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer/BUILD.bazel b/pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer/BUILD.bazel index f1b5a26f8849..27bab777d306 100644 --- a/pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer/BUILD.bazel +++ b/pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "local-legacy-schema-changer_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/opt/exec/execbuilder:testdata", # keep diff --git a/pkg/sql/opt/exec/execbuilder/tests/local-mixed-22.2-23.1/BUILD.bazel b/pkg/sql/opt/exec/execbuilder/tests/local-mixed-22.2-23.1/BUILD.bazel index d07c5f0c2019..80693cea8ddc 100644 --- a/pkg/sql/opt/exec/execbuilder/tests/local-mixed-22.2-23.1/BUILD.bazel +++ b/pkg/sql/opt/exec/execbuilder/tests/local-mixed-22.2-23.1/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "local-mixed-22_2-23_1_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/opt/exec/execbuilder:testdata", # keep diff --git a/pkg/sql/opt/exec/execbuilder/tests/local-vec-off/BUILD.bazel b/pkg/sql/opt/exec/execbuilder/tests/local-vec-off/BUILD.bazel index b7ecc4a31e28..3340371d1961 100644 --- a/pkg/sql/opt/exec/execbuilder/tests/local-vec-off/BUILD.bazel +++ b/pkg/sql/opt/exec/execbuilder/tests/local-vec-off/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "local-vec-off_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/opt/exec/execbuilder:testdata", # keep diff --git a/pkg/sql/opt/exec/execbuilder/tests/local/BUILD.bazel b/pkg/sql/opt/exec/execbuilder/tests/local/BUILD.bazel index 26a885856cbc..9742523d37e1 100644 --- a/pkg/sql/opt/exec/execbuilder/tests/local/BUILD.bazel +++ b/pkg/sql/opt/exec/execbuilder/tests/local/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "local_test", size = "enormous", srcs = ["generated_test.go"], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [ "//c-deps:libgeos", # keep "//pkg/sql/opt/exec/execbuilder:testdata", # keep diff --git a/pkg/sql/opt/exec/explain/BUILD.bazel b/pkg/sql/opt/exec/explain/BUILD.bazel index 77e4f9723f97..3a139d7e570a 100644 --- a/pkg/sql/opt/exec/explain/BUILD.bazel +++ b/pkg/sql/opt/exec/explain/BUILD.bazel @@ -54,7 +54,10 @@ go_test( "output_test.go", "plan_gist_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]) + [ "//pkg/sql/opt/testutils/opttester:testfixtures", ], diff --git a/pkg/sql/opt/idxconstraint/BUILD.bazel b/pkg/sql/opt/idxconstraint/BUILD.bazel index c82f26885310..edc411a8e158 100644 --- a/pkg/sql/opt/idxconstraint/BUILD.bazel +++ b/pkg/sql/opt/idxconstraint/BUILD.bazel @@ -24,7 +24,10 @@ go_test( name = "idxconstraint_test", size = "small", srcs = ["index_constraints_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), deps = [ ":idxconstraint", diff --git a/pkg/sql/opt/indexrec/BUILD.bazel b/pkg/sql/opt/indexrec/BUILD.bazel index 59c5fda3eb70..5b642acd60b1 100644 --- a/pkg/sql/opt/indexrec/BUILD.bazel +++ b/pkg/sql/opt/indexrec/BUILD.bazel @@ -33,7 +33,10 @@ go_test( "hypothetical_table_test.go", "indexrec_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":indexrec"], deps = [ diff --git a/pkg/sql/opt/invertedexpr/BUILD.bazel b/pkg/sql/opt/invertedexpr/BUILD.bazel index a13885bdf09d..07a931f16612 100644 --- a/pkg/sql/opt/invertedexpr/BUILD.bazel +++ b/pkg/sql/opt/invertedexpr/BUILD.bazel @@ -25,7 +25,10 @@ go_test( name = "invertedexpr_test", size = "small", srcs = ["geo_expression_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":invertedexpr"], deps = [ diff --git a/pkg/sql/opt/invertedidx/BUILD.bazel b/pkg/sql/opt/invertedidx/BUILD.bazel index 7fa01ba26944..3a58d60fd56b 100644 --- a/pkg/sql/opt/invertedidx/BUILD.bazel +++ b/pkg/sql/opt/invertedidx/BUILD.bazel @@ -52,7 +52,10 @@ go_test( "trigram_test.go", "tsearch_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":invertedidx", "//pkg/geo", diff --git a/pkg/sql/opt/lookupjoin/BUILD.bazel b/pkg/sql/opt/lookupjoin/BUILD.bazel index 95432b55df7f..ea0a44b28b7c 100644 --- a/pkg/sql/opt/lookupjoin/BUILD.bazel +++ b/pkg/sql/opt/lookupjoin/BUILD.bazel @@ -30,7 +30,10 @@ go_test( "constraint_builder_test.go", "exports_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":lookupjoin"], deps = [ diff --git a/pkg/sql/opt/memo/BUILD.bazel b/pkg/sql/opt/memo/BUILD.bazel index 262283f7b495..e7fc6d9c8084 100644 --- a/pkg/sql/opt/memo/BUILD.bazel +++ b/pkg/sql/opt/memo/BUILD.bazel @@ -72,7 +72,10 @@ go_test( "statistics_builder_test.go", "typing_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]) + [ "//c-deps:libgeos", "//pkg/sql/opt/testutils/opttester:testfixtures", diff --git a/pkg/sql/opt/norm/BUILD.bazel b/pkg/sql/opt/norm/BUILD.bazel index 68864029a811..38c2cf6276d4 100644 --- a/pkg/sql/opt/norm/BUILD.bazel +++ b/pkg/sql/opt/norm/BUILD.bazel @@ -74,7 +74,10 @@ go_test( "general_funcs_test.go", "norm_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]) + [ "//c-deps:libgeos", "//pkg/sql/opt/testutils/opttester:testfixtures", diff --git a/pkg/sql/opt/opbench/BUILD.bazel b/pkg/sql/opt/opbench/BUILD.bazel index 681cf0a5a2c3..e51873bda41e 100644 --- a/pkg/sql/opt/opbench/BUILD.bazel +++ b/pkg/sql/opt/opbench/BUILD.bazel @@ -20,7 +20,10 @@ go_test( "config_test.go", "opbench_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":opbench"], deps = [ diff --git a/pkg/sql/opt/optbuilder/BUILD.bazel b/pkg/sql/opt/optbuilder/BUILD.bazel index 79b3397bad1d..7db4ee8a4ba9 100644 --- a/pkg/sql/opt/optbuilder/BUILD.bazel +++ b/pkg/sql/opt/optbuilder/BUILD.bazel @@ -105,7 +105,10 @@ go_test( "name_resolution_test.go", "union_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":optbuilder"], deps = [ diff --git a/pkg/sql/opt/optgen/cmd/optfmt/BUILD.bazel b/pkg/sql/opt/optgen/cmd/optfmt/BUILD.bazel index d47d4f3ca91d..37b1cbafab7f 100644 --- a/pkg/sql/opt/optgen/cmd/optfmt/BUILD.bazel +++ b/pkg/sql/opt/optgen/cmd/optfmt/BUILD.bazel @@ -23,7 +23,10 @@ go_test( name = "optfmt_test", size = "small", srcs = ["main_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":optfmt_lib"], deps = [ diff --git a/pkg/sql/opt/optgen/cmd/optgen/BUILD.bazel b/pkg/sql/opt/optgen/cmd/optgen/BUILD.bazel index 53ae3e017472..d1634fa468a2 100644 --- a/pkg/sql/opt/optgen/cmd/optgen/BUILD.bazel +++ b/pkg/sql/opt/optgen/cmd/optgen/BUILD.bazel @@ -38,7 +38,10 @@ go_test( name = "optgen_test", size = "small", srcs = ["main_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":optgen_lib"], deps = [ diff --git a/pkg/sql/opt/optgen/exprgen/BUILD.bazel b/pkg/sql/opt/optgen/exprgen/BUILD.bazel index 43960c094683..30b7bd2bb59d 100644 --- a/pkg/sql/opt/optgen/exprgen/BUILD.bazel +++ b/pkg/sql/opt/optgen/exprgen/BUILD.bazel @@ -34,7 +34,10 @@ go_test( name = "exprgen_test", size = "small", srcs = ["expr_gen_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), deps = [ "//pkg/sql/opt/testutils/opttester", diff --git a/pkg/sql/opt/optgen/lang/BUILD.bazel b/pkg/sql/opt/optgen/lang/BUILD.bazel index 55ebf99abe40..1ff762bb587c 100644 --- a/pkg/sql/opt/optgen/lang/BUILD.bazel +++ b/pkg/sql/opt/optgen/lang/BUILD.bazel @@ -34,7 +34,10 @@ go_test( "parser_test.go", "scanner_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":lang"], deps = [ diff --git a/pkg/sql/opt/ordering/BUILD.bazel b/pkg/sql/opt/ordering/BUILD.bazel index 489e17a4b8c2..ad72d57289eb 100644 --- a/pkg/sql/opt/ordering/BUILD.bazel +++ b/pkg/sql/opt/ordering/BUILD.bazel @@ -50,7 +50,10 @@ go_test( "row_number_test.go", "scan_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":ordering"], deps = [ "//pkg/settings/cluster", diff --git a/pkg/sql/opt/partialidx/BUILD.bazel b/pkg/sql/opt/partialidx/BUILD.bazel index 963ec567a140..707133db8b62 100644 --- a/pkg/sql/opt/partialidx/BUILD.bazel +++ b/pkg/sql/opt/partialidx/BUILD.bazel @@ -21,7 +21,10 @@ go_test( name = "partialidx_test", size = "small", srcs = ["implicator_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), deps = [ ":partialidx", diff --git a/pkg/sql/opt/partition/BUILD.bazel b/pkg/sql/opt/partition/BUILD.bazel index 31559266b77b..1f281bda188b 100644 --- a/pkg/sql/opt/partition/BUILD.bazel +++ b/pkg/sql/opt/partition/BUILD.bazel @@ -22,7 +22,10 @@ go_library( go_test( name = "partition_test", srcs = ["locality_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":partition"], deps = [ "//pkg/settings/cluster", diff --git a/pkg/sql/opt/props/BUILD.bazel b/pkg/sql/opt/props/BUILD.bazel index 5e4b01def62b..15ab5e0d9380 100644 --- a/pkg/sql/opt/props/BUILD.bazel +++ b/pkg/sql/opt/props/BUILD.bazel @@ -54,7 +54,10 @@ go_test( "statistics_test.go", "volatility_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":props"], deps = [ "//pkg/settings/cluster", diff --git a/pkg/sql/opt/props/physical/BUILD.bazel b/pkg/sql/opt/props/physical/BUILD.bazel index 57fcc0f49a79..9e3f617ddcd0 100644 --- a/pkg/sql/opt/props/physical/BUILD.bazel +++ b/pkg/sql/opt/props/physical/BUILD.bazel @@ -30,7 +30,10 @@ go_test( "distribution_test.go", "required_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":physical"], deps = [ "//pkg/config/zonepb", diff --git a/pkg/sql/opt/testutils/BUILD.bazel b/pkg/sql/opt/testutils/BUILD.bazel index 174effcc8059..7c9cc87398b6 100644 --- a/pkg/sql/opt/testutils/BUILD.bazel +++ b/pkg/sql/opt/testutils/BUILD.bazel @@ -28,7 +28,10 @@ go_test( name = "testutils_test", size = "small", srcs = ["scalar_vars_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":testutils"], deps = [ "//pkg/sql/opt", diff --git a/pkg/sql/opt/testutils/opttester/BUILD.bazel b/pkg/sql/opt/testutils/opttester/BUILD.bazel index d3359d8cf5db..4c642b9353b7 100644 --- a/pkg/sql/opt/testutils/opttester/BUILD.bazel +++ b/pkg/sql/opt/testutils/opttester/BUILD.bazel @@ -67,7 +67,10 @@ go_test( name = "opttester_test", size = "small", srcs = ["opt_tester_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), deps = [ ":opttester", diff --git a/pkg/sql/opt/testutils/testcat/BUILD.bazel b/pkg/sql/opt/testutils/testcat/BUILD.bazel index cd3380cd4ed0..d7ccffcd2272 100644 --- a/pkg/sql/opt/testutils/testcat/BUILD.bazel +++ b/pkg/sql/opt/testutils/testcat/BUILD.bazel @@ -63,7 +63,10 @@ go_test( name = "testcat_test", size = "small", srcs = ["test_catalog_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), deps = [ ":testcat", diff --git a/pkg/sql/opt/xform/BUILD.bazel b/pkg/sql/opt/xform/BUILD.bazel index 2ca8ed870fec..e2e31d067101 100644 --- a/pkg/sql/opt/xform/BUILD.bazel +++ b/pkg/sql/opt/xform/BUILD.bazel @@ -71,7 +71,10 @@ go_test( "optimizer_test.go", "physical_props_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]) + [ "//c-deps:libgeos", "//pkg/sql/opt/testutils/opttester:testfixtures", diff --git a/pkg/sql/parser/BUILD.bazel b/pkg/sql/parser/BUILD.bazel index 9e1ae39ca90f..9fb392c4099b 100644 --- a/pkg/sql/parser/BUILD.bazel +++ b/pkg/sql/parser/BUILD.bazel @@ -56,7 +56,10 @@ go_test( "scanner_test.go", ":gen-helpmap-test", # keep ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":parser"], deps = [ diff --git a/pkg/sql/pgwire/BUILD.bazel b/pkg/sql/pgwire/BUILD.bazel index 778329c58715..d7e9c1be3342 100644 --- a/pkg/sql/pgwire/BUILD.bazel +++ b/pkg/sql/pgwire/BUILD.bazel @@ -102,7 +102,10 @@ go_test( "pgwire_test.go", "types_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":pgwire"], shard_count = 16, diff --git a/pkg/sql/pgwire/hba/BUILD.bazel b/pkg/sql/pgwire/hba/BUILD.bazel index 60c1287c1c7a..0fdcb4eb750c 100644 --- a/pkg/sql/pgwire/hba/BUILD.bazel +++ b/pkg/sql/pgwire/hba/BUILD.bazel @@ -28,7 +28,10 @@ go_test( "hba_test.go", "scanner_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":hba"], deps = [ diff --git a/pkg/sql/pgwire/identmap/BUILD.bazel b/pkg/sql/pgwire/identmap/BUILD.bazel index a0b3dbbbd2ae..32304fae34a5 100644 --- a/pkg/sql/pgwire/identmap/BUILD.bazel +++ b/pkg/sql/pgwire/identmap/BUILD.bazel @@ -16,7 +16,10 @@ go_library( go_test( name = "identmap_test", srcs = ["ident_map_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":identmap"], deps = ["@com_github_stretchr_testify//assert"], ) diff --git a/pkg/sql/pgwire/pgerror/BUILD.bazel b/pkg/sql/pgwire/pgerror/BUILD.bazel index cb9c6b694a6b..67b526f8bcbd 100644 --- a/pkg/sql/pgwire/pgerror/BUILD.bazel +++ b/pkg/sql/pgwire/pgerror/BUILD.bazel @@ -41,7 +41,10 @@ go_test( "severity_test.go", "wrap_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":pgerror"], deps = [ "//pkg/kv/kvpb", diff --git a/pkg/sql/pgwire/pgwirecancel/BUILD.bazel b/pkg/sql/pgwire/pgwirecancel/BUILD.bazel index b0a7c454598a..7fe99b3a52b8 100644 --- a/pkg/sql/pgwire/pgwirecancel/BUILD.bazel +++ b/pkg/sql/pgwire/pgwirecancel/BUILD.bazel @@ -16,7 +16,10 @@ go_test( "cancel_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":pgwirecancel"], deps = [ "//pkg/base", diff --git a/pkg/sql/physicalplan/BUILD.bazel b/pkg/sql/physicalplan/BUILD.bazel index 0c1356ad165f..bfb08513d009 100644 --- a/pkg/sql/physicalplan/BUILD.bazel +++ b/pkg/sql/physicalplan/BUILD.bazel @@ -50,7 +50,10 @@ go_test( "span_resolver_internal_test.go", "span_resolver_test.go", ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), embed = [":physicalplan"], shard_count = 16, deps = [ diff --git a/pkg/sql/physicalplan/replicaoracle/BUILD.bazel b/pkg/sql/physicalplan/replicaoracle/BUILD.bazel index 3f0de494476b..bb4a7daec8df 100644 --- a/pkg/sql/physicalplan/replicaoracle/BUILD.bazel +++ b/pkg/sql/physicalplan/replicaoracle/BUILD.bazel @@ -23,7 +23,10 @@ go_test( name = "replicaoracle_test", size = "small", srcs = ["oracle_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":replicaoracle"], deps = [ "//pkg/config/zonepb", diff --git a/pkg/sql/plpgsql/parser/BUILD.bazel b/pkg/sql/plpgsql/parser/BUILD.bazel index 3315cae2cec6..5881d77a9709 100644 --- a/pkg/sql/plpgsql/parser/BUILD.bazel +++ b/pkg/sql/plpgsql/parser/BUILD.bazel @@ -64,7 +64,10 @@ exports_files( go_test( name = "parser_test", srcs = ["parser_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), deps = [ ":plpgparser", diff --git a/pkg/sql/privilege/BUILD.bazel b/pkg/sql/privilege/BUILD.bazel index ce806ceef7d5..79b8a552bdcd 100644 --- a/pkg/sql/privilege/BUILD.bazel +++ b/pkg/sql/privilege/BUILD.bazel @@ -25,7 +25,10 @@ go_test( "main_test.go", "privilege_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":privilege", "//pkg/util/leaktest", diff --git a/pkg/sql/protoreflect/BUILD.bazel b/pkg/sql/protoreflect/BUILD.bazel index 3c5f094552eb..3fe55b7cdc20 100644 --- a/pkg/sql/protoreflect/BUILD.bazel +++ b/pkg/sql/protoreflect/BUILD.bazel @@ -27,7 +27,10 @@ go_test( "main_test.go", "utils_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":protoreflect"], deps = [ "//pkg/geo/geoindex", diff --git a/pkg/sql/querycache/BUILD.bazel b/pkg/sql/querycache/BUILD.bazel index d31370a2cf32..0dee55dc4243 100644 --- a/pkg/sql/querycache/BUILD.bazel +++ b/pkg/sql/querycache/BUILD.bazel @@ -25,7 +25,10 @@ go_test( name = "querycache_test", size = "small", srcs = ["query_cache_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":querycache"], deps = [ "//pkg/sql/opt/memo", diff --git a/pkg/sql/randgen/BUILD.bazel b/pkg/sql/randgen/BUILD.bazel index e92aaabed07f..a84bb68666cd 100644 --- a/pkg/sql/randgen/BUILD.bazel +++ b/pkg/sql/randgen/BUILD.bazel @@ -67,7 +67,10 @@ go_test( "schema_test.go", "types_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":randgen"], deps = [ "//pkg/base", diff --git a/pkg/sql/regions/BUILD.bazel b/pkg/sql/regions/BUILD.bazel index 96dce23718dc..3ddfe4151c58 100644 --- a/pkg/sql/regions/BUILD.bazel +++ b/pkg/sql/regions/BUILD.bazel @@ -22,7 +22,10 @@ go_library( go_test( name = "regions_test", srcs = ["region_provider_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":regions", "//pkg/keys", diff --git a/pkg/sql/row/BUILD.bazel b/pkg/sql/row/BUILD.bazel index dea8123f307c..f6380f963d41 100644 --- a/pkg/sql/row/BUILD.bazel +++ b/pkg/sql/row/BUILD.bazel @@ -102,7 +102,10 @@ go_test( "fetcher_test.go", "main_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":row"], deps = [ "//pkg/base", diff --git a/pkg/sql/rowcontainer/BUILD.bazel b/pkg/sql/rowcontainer/BUILD.bazel index c1426abe7954..a08c65d6861e 100644 --- a/pkg/sql/rowcontainer/BUILD.bazel +++ b/pkg/sql/rowcontainer/BUILD.bazel @@ -52,7 +52,10 @@ go_test( "numbered_row_container_test.go", "row_container_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":rowcontainer"], deps = [ "//pkg/base", diff --git a/pkg/sql/rowenc/BUILD.bazel b/pkg/sql/rowenc/BUILD.bazel index e3eda4db8dd9..3146e136dc36 100644 --- a/pkg/sql/rowenc/BUILD.bazel +++ b/pkg/sql/rowenc/BUILD.bazel @@ -56,7 +56,10 @@ go_test( "main_test.go", "roundtrip_format_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), deps = [ ":rowenc", diff --git a/pkg/sql/rowenc/keyside/BUILD.bazel b/pkg/sql/rowenc/keyside/BUILD.bazel index 37222c44ac4a..4aa805002650 100644 --- a/pkg/sql/rowenc/keyside/BUILD.bazel +++ b/pkg/sql/rowenc/keyside/BUILD.bazel @@ -34,7 +34,10 @@ go_library( go_test( name = "keyside_test", srcs = ["keyside_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":keyside", "//pkg/settings/cluster", diff --git a/pkg/sql/rowenc/valueside/BUILD.bazel b/pkg/sql/rowenc/valueside/BUILD.bazel index efde8f5f4030..29c1ebf949fc 100644 --- a/pkg/sql/rowenc/valueside/BUILD.bazel +++ b/pkg/sql/rowenc/valueside/BUILD.bazel @@ -39,7 +39,10 @@ go_test( "array_test.go", "valueside_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":valueside"], deps = [ "//pkg/roachpb", diff --git a/pkg/sql/rowexec/BUILD.bazel b/pkg/sql/rowexec/BUILD.bazel index aa8de28a9670..db6dfedbc487 100644 --- a/pkg/sql/rowexec/BUILD.bazel +++ b/pkg/sql/rowexec/BUILD.bazel @@ -146,7 +146,10 @@ go_test( "windower_test.go", "zigzagjoiner_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":rowexec"], tags = ["no-remote"], deps = [ diff --git a/pkg/sql/rowflow/BUILD.bazel b/pkg/sql/rowflow/BUILD.bazel index 05e008af103a..318270dd1a63 100644 --- a/pkg/sql/rowflow/BUILD.bazel +++ b/pkg/sql/rowflow/BUILD.bazel @@ -42,7 +42,10 @@ go_test( "input_sync_test.go", "routers_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":rowflow"], tags = ["no-remote"], deps = [ diff --git a/pkg/sql/scanner/BUILD.bazel b/pkg/sql/scanner/BUILD.bazel index 9d2499d56c9e..55ba57c98dd3 100644 --- a/pkg/sql/scanner/BUILD.bazel +++ b/pkg/sql/scanner/BUILD.bazel @@ -21,7 +21,10 @@ go_test( "scan_test.go", ":gen-token-names", # keep ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":scanner"], deps = [ diff --git a/pkg/sql/scheduledlogging/BUILD.bazel b/pkg/sql/scheduledlogging/BUILD.bazel index dcb8a64b4297..750e5efb22bd 100644 --- a/pkg/sql/scheduledlogging/BUILD.bazel +++ b/pkg/sql/scheduledlogging/BUILD.bazel @@ -30,7 +30,10 @@ go_test( "captured_index_usage_stats_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":scheduledlogging"], deps = [ "//pkg/base", diff --git a/pkg/sql/schemachange/BUILD.bazel b/pkg/sql/schemachange/BUILD.bazel index b58350aeb4a0..363a506e18e0 100644 --- a/pkg/sql/schemachange/BUILD.bazel +++ b/pkg/sql/schemachange/BUILD.bazel @@ -25,7 +25,10 @@ go_test( "alter_column_type_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":schemachange"], deps = [ "//pkg/base", diff --git a/pkg/sql/schemachanger/BUILD.bazel b/pkg/sql/schemachanger/BUILD.bazel index ec883fbde8de..8bbb450ee75f 100644 --- a/pkg/sql/schemachanger/BUILD.bazel +++ b/pkg/sql/schemachanger/BUILD.bazel @@ -22,7 +22,10 @@ go_test( "schemachanger_test.go", ":test_gen", # keep ], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = [":testdata"], shard_count = 16, deps = [ diff --git a/pkg/sql/schemachanger/corpus/BUILD.bazel b/pkg/sql/schemachanger/corpus/BUILD.bazel index fb692c575e44..f9d7e0bc3715 100644 --- a/pkg/sql/schemachanger/corpus/BUILD.bazel +++ b/pkg/sql/schemachanger/corpus/BUILD.bazel @@ -22,7 +22,10 @@ go_library( go_test( name = "corpus_test", srcs = ["corpus_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":corpus", "//pkg/clusterversion", diff --git a/pkg/sql/schemachanger/rel/BUILD.bazel b/pkg/sql/schemachanger/rel/BUILD.bazel index 24e31f102c6b..04391f1b9d3e 100644 --- a/pkg/sql/schemachanger/rel/BUILD.bazel +++ b/pkg/sql/schemachanger/rel/BUILD.bazel @@ -55,7 +55,10 @@ go_test( "rel_internal_test.go", "rel_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":rel"], deps = [ diff --git a/pkg/sql/schemachanger/scbuild/BUILD.bazel b/pkg/sql/schemachanger/scbuild/BUILD.bazel index 5f176f390e50..7dc45f83fe45 100644 --- a/pkg/sql/schemachanger/scbuild/BUILD.bazel +++ b/pkg/sql/schemachanger/scbuild/BUILD.bazel @@ -67,7 +67,10 @@ go_test( "builder_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), deps = [ ":scbuild", diff --git a/pkg/sql/schemachanger/scdecomp/BUILD.bazel b/pkg/sql/schemachanger/scdecomp/BUILD.bazel index 81e9c559619a..231102a56b06 100644 --- a/pkg/sql/schemachanger/scdecomp/BUILD.bazel +++ b/pkg/sql/schemachanger/scdecomp/BUILD.bazel @@ -40,7 +40,10 @@ go_test( "decomp_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), deps = [ "//pkg/base", diff --git a/pkg/sql/schemachanger/scexec/BUILD.bazel b/pkg/sql/schemachanger/scexec/BUILD.bazel index 8255001d3ffd..14a55589c529 100644 --- a/pkg/sql/schemachanger/scexec/BUILD.bazel +++ b/pkg/sql/schemachanger/scexec/BUILD.bazel @@ -56,7 +56,10 @@ go_test( "main_test.go", ":mock_scexec", # keep ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":scexec", "//pkg/base", diff --git a/pkg/sql/schemachanger/scexec/backfiller/BUILD.bazel b/pkg/sql/schemachanger/scexec/backfiller/BUILD.bazel index 7bac1e76cb5c..3a929bf84b9b 100644 --- a/pkg/sql/schemachanger/scexec/backfiller/BUILD.bazel +++ b/pkg/sql/schemachanger/scexec/backfiller/BUILD.bazel @@ -34,7 +34,10 @@ go_test( "periodic_progress_flusher_test.go", "tracker_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":backfiller"], deps = [ "//pkg/keys", diff --git a/pkg/sql/schemachanger/scplan/BUILD.bazel b/pkg/sql/schemachanger/scplan/BUILD.bazel index 39c120e40834..dd52bef62b3b 100644 --- a/pkg/sql/schemachanger/scplan/BUILD.bazel +++ b/pkg/sql/schemachanger/scplan/BUILD.bazel @@ -41,7 +41,10 @@ go_test( "main_test.go", "plan_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), deps = [ ":scplan", diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/BUILD.bazel b/pkg/sql/schemachanger/scplan/internal/opgen/BUILD.bazel index c9d788483249..8b5b007afa77 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/BUILD.bazel +++ b/pkg/sql/schemachanger/scplan/internal/opgen/BUILD.bazel @@ -102,7 +102,10 @@ go_test( name = "opgen_test", size = "small", srcs = ["register_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":opgen"], deps = ["//pkg/sql/schemachanger/scpb"], ) diff --git a/pkg/sql/schemachanger/scplan/internal/rules/current/BUILD.bazel b/pkg/sql/schemachanger/scplan/internal/rules/current/BUILD.bazel index eaa66f50e927..47556cb1eca7 100644 --- a/pkg/sql/schemachanger/scplan/internal/rules/current/BUILD.bazel +++ b/pkg/sql/schemachanger/scplan/internal/rules/current/BUILD.bazel @@ -43,7 +43,10 @@ go_test( "assertions_test.go", "rules_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":current"], deps = [ diff --git a/pkg/sql/schemachanger/scplan/internal/rules/release_22_2/BUILD.bazel b/pkg/sql/schemachanger/scplan/internal/rules/release_22_2/BUILD.bazel index b1998d175ce9..2e87453c7e3f 100644 --- a/pkg/sql/schemachanger/scplan/internal/rules/release_22_2/BUILD.bazel +++ b/pkg/sql/schemachanger/scplan/internal/rules/release_22_2/BUILD.bazel @@ -41,7 +41,10 @@ go_test( "assertions_test.go", "rules_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":release_22_2"], deps = [ diff --git a/pkg/sql/schemachanger/scplan/internal/scgraph/BUILD.bazel b/pkg/sql/schemachanger/scplan/internal/scgraph/BUILD.bazel index f8f83e00b02a..167decb85da7 100644 --- a/pkg/sql/schemachanger/scplan/internal/scgraph/BUILD.bazel +++ b/pkg/sql/schemachanger/scplan/internal/scgraph/BUILD.bazel @@ -33,7 +33,10 @@ go_test( "dep_edge_tree_test.go", "graph_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":scgraph"], deps = [ "//pkg/sql/catalog/descpb", diff --git a/pkg/sql/schemachanger/screl/BUILD.bazel b/pkg/sql/schemachanger/screl/BUILD.bazel index 0e2b08ddd320..f5e0c67be678 100644 --- a/pkg/sql/schemachanger/screl/BUILD.bazel +++ b/pkg/sql/schemachanger/screl/BUILD.bazel @@ -42,7 +42,10 @@ go_test( "scalars_test.go", "walk_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":screl"], deps = [ "//pkg/sql/catalog/catpb", diff --git a/pkg/sql/schemachanger/scrun/BUILD.bazel b/pkg/sql/schemachanger/scrun/BUILD.bazel index 2c3c86153ecc..757e3a438fc2 100644 --- a/pkg/sql/schemachanger/scrun/BUILD.bazel +++ b/pkg/sql/schemachanger/scrun/BUILD.bazel @@ -38,7 +38,10 @@ go_test( name = "scrun_test", size = "small", srcs = ["make_state_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":scrun"], deps = [ "//pkg/clusterversion", diff --git a/pkg/sql/sem/builtins/BUILD.bazel b/pkg/sql/sem/builtins/BUILD.bazel index d5587de065dd..e3941c00a14c 100644 --- a/pkg/sql/sem/builtins/BUILD.bazel +++ b/pkg/sql/sem/builtins/BUILD.bazel @@ -171,7 +171,10 @@ go_test( "show_create_all_tables_builtin_test.go", "window_frame_builtins_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":builtins"], deps = [ diff --git a/pkg/sql/sem/builtins/pgformat/BUILD.bazel b/pkg/sql/sem/builtins/pgformat/BUILD.bazel index 8c07f250437a..b4c7870ce3f3 100644 --- a/pkg/sql/sem/builtins/pgformat/BUILD.bazel +++ b/pkg/sql/sem/builtins/pgformat/BUILD.bazel @@ -22,7 +22,10 @@ go_test( "format_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":pgformat", "//pkg/base", diff --git a/pkg/sql/sem/cast/BUILD.bazel b/pkg/sql/sem/cast/BUILD.bazel index 873f50b187d7..cf1bc5d7ac6d 100644 --- a/pkg/sql/sem/cast/BUILD.bazel +++ b/pkg/sql/sem/cast/BUILD.bazel @@ -22,7 +22,10 @@ go_library( go_test( name = "cast_test", srcs = ["cast_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":cast"], deps = [ diff --git a/pkg/sql/sem/eval/BUILD.bazel b/pkg/sql/sem/eval/BUILD.bazel index 856c98b7a9c9..cb0c4f070bb2 100644 --- a/pkg/sql/sem/eval/BUILD.bazel +++ b/pkg/sql/sem/eval/BUILD.bazel @@ -111,7 +111,10 @@ go_test( "timeconv_test.go", "window_funcs_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":eval"], deps = [ diff --git a/pkg/sql/sem/eval/cast_test/BUILD.bazel b/pkg/sql/sem/eval/cast_test/BUILD.bazel index 2f3b8a8bb261..04ed8c20a888 100644 --- a/pkg/sql/sem/eval/cast_test/BUILD.bazel +++ b/pkg/sql/sem/eval/cast_test/BUILD.bazel @@ -7,7 +7,10 @@ go_test( "cast_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), deps = [ "//pkg/base", diff --git a/pkg/sql/sem/eval/eval_test/BUILD.bazel b/pkg/sql/sem/eval/eval_test/BUILD.bazel index 9c1b4af446ad..d92ba140ec87 100644 --- a/pkg/sql/sem/eval/eval_test/BUILD.bazel +++ b/pkg/sql/sem/eval/eval_test/BUILD.bazel @@ -8,7 +8,10 @@ go_test( "eval_test.go", "main_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = ["//pkg/sql/sem/eval:testdata"], deps = [ "//pkg/base", diff --git a/pkg/sql/sem/normalize/BUILD.bazel b/pkg/sql/sem/normalize/BUILD.bazel index a4b3dc72b289..714715ffb268 100644 --- a/pkg/sql/sem/normalize/BUILD.bazel +++ b/pkg/sql/sem/normalize/BUILD.bazel @@ -26,7 +26,10 @@ go_test( "constant_eval_test.go", "normalize_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":normalize", "//pkg/settings/cluster", diff --git a/pkg/sql/sem/tree/BUILD.bazel b/pkg/sql/sem/tree/BUILD.bazel index 57ad2f499559..a62c7dcf00f6 100644 --- a/pkg/sql/sem/tree/BUILD.bazel +++ b/pkg/sql/sem/tree/BUILD.bazel @@ -209,7 +209,10 @@ go_test( "udf_test.go", "var_expr_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]) + ["//pkg/sql/parser:sql.y"], embed = [":tree"], deps = [ diff --git a/pkg/sql/sessiondata/BUILD.bazel b/pkg/sql/sessiondata/BUILD.bazel index 3e64051df838..0cc84ee34df7 100644 --- a/pkg/sql/sessiondata/BUILD.bazel +++ b/pkg/sql/sessiondata/BUILD.bazel @@ -35,7 +35,10 @@ go_test( "search_path_test.go", "session_data_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":sessiondata"], deps = [ "//pkg/sql/sessiondatapb", diff --git a/pkg/sql/sessioninit/BUILD.bazel b/pkg/sql/sessioninit/BUILD.bazel index 1bcbba9fdde6..4538eb6fe5dc 100644 --- a/pkg/sql/sessioninit/BUILD.bazel +++ b/pkg/sql/sessioninit/BUILD.bazel @@ -32,7 +32,10 @@ go_test( "cache_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":sessioninit", "//pkg/base", diff --git a/pkg/sql/span/BUILD.bazel b/pkg/sql/span/BUILD.bazel index 5bedba26edfe..b8e43e81e64b 100644 --- a/pkg/sql/span/BUILD.bazel +++ b/pkg/sql/span/BUILD.bazel @@ -37,7 +37,10 @@ go_test( "main_test.go", "span_splitter_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":span", "//pkg/keys", diff --git a/pkg/sql/sqlinstance/instancestorage/BUILD.bazel b/pkg/sql/sqlinstance/instancestorage/BUILD.bazel index fc6385bc645c..aba7dcf5deed 100644 --- a/pkg/sql/sqlinstance/instancestorage/BUILD.bazel +++ b/pkg/sql/sqlinstance/instancestorage/BUILD.bazel @@ -61,7 +61,10 @@ go_test( "main_test.go", "row_codec_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":instancestorage"], deps = [ "//pkg/base", diff --git a/pkg/sql/sqlliveness/slinstance/BUILD.bazel b/pkg/sql/sqlliveness/slinstance/BUILD.bazel index 0c09cb9f3499..fcee6b330d73 100644 --- a/pkg/sql/sqlliveness/slinstance/BUILD.bazel +++ b/pkg/sql/sqlliveness/slinstance/BUILD.bazel @@ -29,7 +29,10 @@ go_test( name = "slinstance_test", size = "small", srcs = ["slinstance_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":slinstance", "//pkg/clusterversion", diff --git a/pkg/sql/sqlliveness/slstorage/BUILD.bazel b/pkg/sql/sqlliveness/slstorage/BUILD.bazel index b1794a9bab83..34d50cd106b9 100644 --- a/pkg/sql/sqlliveness/slstorage/BUILD.bazel +++ b/pkg/sql/sqlliveness/slstorage/BUILD.bazel @@ -54,7 +54,10 @@ go_test( "slstorage_internal_test.go", "slstorage_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":slstorage"], deps = [ "//pkg/base", diff --git a/pkg/sql/sqlstats/insights/BUILD.bazel b/pkg/sql/sqlstats/insights/BUILD.bazel index 2402c7392fe7..449503155e15 100644 --- a/pkg/sql/sqlstats/insights/BUILD.bazel +++ b/pkg/sql/sqlstats/insights/BUILD.bazel @@ -47,7 +47,10 @@ go_test( "sink_test.go", "store_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":insights"], deps = [ "//pkg/settings/cluster", diff --git a/pkg/sql/sqlstats/insights/integration/BUILD.bazel b/pkg/sql/sqlstats/insights/integration/BUILD.bazel index 2cb5dbbdefbf..68d1f30669b0 100644 --- a/pkg/sql/sqlstats/insights/integration/BUILD.bazel +++ b/pkg/sql/sqlstats/insights/integration/BUILD.bazel @@ -4,7 +4,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test") go_test( name = "integration_test", srcs = ["insights_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ "//pkg/base", "//pkg/security/securityassets", diff --git a/pkg/sql/sqlstats/persistedsqlstats/BUILD.bazel b/pkg/sql/sqlstats/persistedsqlstats/BUILD.bazel index 4aca0403cbc5..e6b0f0773360 100644 --- a/pkg/sql/sqlstats/persistedsqlstats/BUILD.bazel +++ b/pkg/sql/sqlstats/persistedsqlstats/BUILD.bazel @@ -67,7 +67,10 @@ go_test( "reader_test.go", "scheduled_sql_stats_compaction_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), shard_count = 16, deps = [ diff --git a/pkg/sql/sqlstats/persistedsqlstats/sqlstatsutil/BUILD.bazel b/pkg/sql/sqlstats/persistedsqlstats/sqlstatsutil/BUILD.bazel index a281f6430252..415879ae4d38 100644 --- a/pkg/sql/sqlstats/persistedsqlstats/sqlstatsutil/BUILD.bazel +++ b/pkg/sql/sqlstats/persistedsqlstats/sqlstatsutil/BUILD.bazel @@ -29,7 +29,10 @@ go_library( go_test( name = "sqlstatsutil_test", srcs = ["json_encoding_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":sqlstatsutil"], deps = [ "//pkg/sql/appstatspb", diff --git a/pkg/sql/sqlstats/sslocal/BUILD.bazel b/pkg/sql/sqlstats/sslocal/BUILD.bazel index e183bbee7c77..267dfd52321e 100644 --- a/pkg/sql/sqlstats/sslocal/BUILD.bazel +++ b/pkg/sql/sqlstats/sslocal/BUILD.bazel @@ -41,7 +41,10 @@ go_test( "main_test.go", "sql_stats_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":sslocal", "//pkg/base", diff --git a/pkg/sql/sqltestutils/BUILD.bazel b/pkg/sql/sqltestutils/BUILD.bazel index b7ca714b7025..d5b2248e6c43 100644 --- a/pkg/sql/sqltestutils/BUILD.bazel +++ b/pkg/sql/sqltestutils/BUILD.bazel @@ -49,7 +49,10 @@ go_library( go_test( name = "sqltestutils_test", srcs = ["large_schema_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":sqltestutils"], deps = [ diff --git a/pkg/sql/stats/BUILD.bazel b/pkg/sql/stats/BUILD.bazel index 3b2d9454f11e..b45f1f097b8c 100644 --- a/pkg/sql/stats/BUILD.bazel +++ b/pkg/sql/stats/BUILD.bazel @@ -83,7 +83,10 @@ go_test( "simple_linear_regression_test.go", "stats_cache_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":stats"], deps = [ "//pkg/base", diff --git a/pkg/sql/stmtdiagnostics/BUILD.bazel b/pkg/sql/stmtdiagnostics/BUILD.bazel index ecbcf0ee8a00..6c50e2387bb8 100644 --- a/pkg/sql/stmtdiagnostics/BUILD.bazel +++ b/pkg/sql/stmtdiagnostics/BUILD.bazel @@ -32,7 +32,10 @@ go_test( "statement_diagnostics_helpers_test.go", "statement_diagnostics_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":stmtdiagnostics"], tags = ["no-remote"], deps = [ diff --git a/pkg/sql/syntheticprivilege/BUILD.bazel b/pkg/sql/syntheticprivilege/BUILD.bazel index 721363d29536..6aa782960b10 100644 --- a/pkg/sql/syntheticprivilege/BUILD.bazel +++ b/pkg/sql/syntheticprivilege/BUILD.bazel @@ -27,7 +27,10 @@ go_library( go_test( name = "syntheticprivilege_test", srcs = ["synthetic_privilege_registry_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":syntheticprivilege"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/sql/tests/BUILD.bazel b/pkg/sql/tests/BUILD.bazel index c949b16c0d58..eefdeb266f11 100644 --- a/pkg/sql/tests/BUILD.bazel +++ b/pkg/sql/tests/BUILD.bazel @@ -59,7 +59,10 @@ go_test( "truncate_test.go", "virtual_table_test.go", ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), data = glob(["testdata/**"]), embed = [":tests"], shard_count = 16, diff --git a/pkg/sql/ttl/ttlbase/BUILD.bazel b/pkg/sql/ttl/ttlbase/BUILD.bazel index ee3ee6588bae..92880a3c3bc5 100644 --- a/pkg/sql/ttl/ttlbase/BUILD.bazel +++ b/pkg/sql/ttl/ttlbase/BUILD.bazel @@ -18,7 +18,10 @@ go_library( go_test( name = "ttlbase_test", srcs = ["ttl_helpers_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":ttlbase"], deps = [ "//pkg/sql/catalog/catenumpb", diff --git a/pkg/sql/ttl/ttljob/BUILD.bazel b/pkg/sql/ttl/ttljob/BUILD.bazel index 9c7b03a2498b..afa71793f305 100644 --- a/pkg/sql/ttl/ttljob/BUILD.bazel +++ b/pkg/sql/ttl/ttljob/BUILD.bazel @@ -62,7 +62,10 @@ go_test( "ttljob_query_builder_test.go", "ttljob_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":ttljob", "//pkg/base", diff --git a/pkg/sql/types/BUILD.bazel b/pkg/sql/types/BUILD.bazel index b718c4cdea0c..a3f21fe6c1fc 100644 --- a/pkg/sql/types/BUILD.bazel +++ b/pkg/sql/types/BUILD.bazel @@ -40,7 +40,10 @@ go_test( "types_test.go", "types_text_marshal_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":types"], deps = [ "//pkg/geo/geopb", diff --git a/pkg/storage/BUILD.bazel b/pkg/storage/BUILD.bazel index c44e54191ab5..638bd74638c0 100644 --- a/pkg/storage/BUILD.bazel +++ b/pkg/storage/BUILD.bazel @@ -141,7 +141,10 @@ go_test( "sst_writer_test.go", "temp_engine_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":storage"], deps = [ diff --git a/pkg/storage/enginepb/BUILD.bazel b/pkg/storage/enginepb/BUILD.bazel index a01a99313627..24aadee5e419 100644 --- a/pkg/storage/enginepb/BUILD.bazel +++ b/pkg/storage/enginepb/BUILD.bazel @@ -65,7 +65,10 @@ go_test( "mvcc3_test.go", "mvcc_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":enginepb"], deps = [ "//pkg/kv/kvserver/concurrency/isolation", diff --git a/pkg/storage/fs/BUILD.bazel b/pkg/storage/fs/BUILD.bazel index d94b0475e130..d5684e76ca28 100644 --- a/pkg/storage/fs/BUILD.bazel +++ b/pkg/storage/fs/BUILD.bazel @@ -25,7 +25,10 @@ go_test( "safewrite_test.go", "temp_dir_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":fs"], deps = [ "//pkg/util/leaktest", diff --git a/pkg/storage/metamorphic/BUILD.bazel b/pkg/storage/metamorphic/BUILD.bazel index a467888d004f..1ce35cf0f9fd 100644 --- a/pkg/storage/metamorphic/BUILD.bazel +++ b/pkg/storage/metamorphic/BUILD.bazel @@ -42,7 +42,10 @@ go_test( "meta_test.go", "parser_test.go", ], - args = ["-test.timeout=3595s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=3595s"], + }), data = glob(["testdata/**"]), embed = [":metamorphic"], shard_count = 8, diff --git a/pkg/storage/pebbleiter/BUILD.bazel b/pkg/storage/pebbleiter/BUILD.bazel index ab46ad360509..35feb3e8d253 100644 --- a/pkg/storage/pebbleiter/BUILD.bazel +++ b/pkg/storage/pebbleiter/BUILD.bazel @@ -39,7 +39,10 @@ genrule( go_test( name = "pebbleiter_test", srcs = ["crdb_test_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":pebbleiter"], # keep deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/testutils/BUILD.bazel b/pkg/testutils/BUILD.bazel index a98f5cc7464e..59c773557c99 100644 --- a/pkg/testutils/BUILD.bazel +++ b/pkg/testutils/BUILD.bazel @@ -47,7 +47,10 @@ go_test( "net_test.go", "soon_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":testutils"], deps = [ "//pkg/util", diff --git a/pkg/testutils/docker/BUILD.bazel b/pkg/testutils/docker/BUILD.bazel index 43755bec58a7..ad826b8c2251 100644 --- a/pkg/testutils/docker/BUILD.bazel +++ b/pkg/testutils/docker/BUILD.bazel @@ -5,10 +5,13 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_test( name = "docker_test", srcs = ["single_node_docker_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]) + [ "//pkg/testutils/docker:testdata", - "//pkg/testutils/docker/docker-fsnotify:docker-fsnotify", + "//pkg/testutils/docker/docker-fsnotify", ], gotags = ["docker"], tags = ["integration"], diff --git a/pkg/testutils/echotest/BUILD.bazel b/pkg/testutils/echotest/BUILD.bazel index 1ebdd88a85e0..fa2936e94489 100644 --- a/pkg/testutils/echotest/BUILD.bazel +++ b/pkg/testutils/echotest/BUILD.bazel @@ -16,7 +16,10 @@ go_library( go_test( name = "echotest_test", srcs = ["echotest_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":echotest"], deps = ["//pkg/testutils/datapathutils"], diff --git a/pkg/testutils/floatcmp/BUILD.bazel b/pkg/testutils/floatcmp/BUILD.bazel index 25aa17d166ff..bfbd90c74d6f 100644 --- a/pkg/testutils/floatcmp/BUILD.bazel +++ b/pkg/testutils/floatcmp/BUILD.bazel @@ -16,7 +16,10 @@ go_test( name = "floatcmp_test", size = "small", srcs = ["floatcmp_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":floatcmp"], ) diff --git a/pkg/testutils/keysutils/BUILD.bazel b/pkg/testutils/keysutils/BUILD.bazel index f168b42bb0f7..396ddc8b992e 100644 --- a/pkg/testutils/keysutils/BUILD.bazel +++ b/pkg/testutils/keysutils/BUILD.bazel @@ -20,7 +20,10 @@ go_test( name = "keysutils_test", size = "small", srcs = ["pretty_scanner_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":keysutils"], deps = [ "//pkg/keys", diff --git a/pkg/testutils/lint/BUILD.bazel b/pkg/testutils/lint/BUILD.bazel index ca29269326a2..a9b7eea3f98f 100644 --- a/pkg/testutils/lint/BUILD.bazel +++ b/pkg/testutils/lint/BUILD.bazel @@ -20,7 +20,10 @@ go_test( "lint_test.go", "nightly_lint_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":lint"], embedsrcs = ["gcassert_paths.txt"], diff --git a/pkg/testutils/lint/passes/errcmp/BUILD.bazel b/pkg/testutils/lint/passes/errcmp/BUILD.bazel index 0463e5629106..1663939b5479 100644 --- a/pkg/testutils/lint/passes/errcmp/BUILD.bazel +++ b/pkg/testutils/lint/passes/errcmp/BUILD.bazel @@ -17,7 +17,10 @@ go_library( go_test( name = "errcmp_test", srcs = ["errcmp_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]) + [ "@go_sdk//:files", ], diff --git a/pkg/testutils/lint/passes/errwrap/BUILD.bazel b/pkg/testutils/lint/passes/errwrap/BUILD.bazel index 118cd65248f4..0fa68a4374e8 100644 --- a/pkg/testutils/lint/passes/errwrap/BUILD.bazel +++ b/pkg/testutils/lint/passes/errwrap/BUILD.bazel @@ -20,7 +20,10 @@ go_library( go_test( name = "errwrap_test", srcs = ["errwrap_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]) + [ "@go_sdk//:files", ], diff --git a/pkg/testutils/lint/passes/fmtsafe/BUILD.bazel b/pkg/testutils/lint/passes/fmtsafe/BUILD.bazel index d6150430e8b2..a71a41ea0121 100644 --- a/pkg/testutils/lint/passes/fmtsafe/BUILD.bazel +++ b/pkg/testutils/lint/passes/fmtsafe/BUILD.bazel @@ -26,7 +26,10 @@ go_test( name = "fmtsafe_test", size = "small", srcs = ["fmtsafe_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]) + [ "@go_sdk//:files", ], diff --git a/pkg/testutils/lint/passes/forbiddenmethod/BUILD.bazel b/pkg/testutils/lint/passes/forbiddenmethod/BUILD.bazel index e78c29caa46c..bd1d99390135 100644 --- a/pkg/testutils/lint/passes/forbiddenmethod/BUILD.bazel +++ b/pkg/testutils/lint/passes/forbiddenmethod/BUILD.bazel @@ -32,7 +32,10 @@ go_test( "main_test.go", "naked_go_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = [ ":testdata", "@go_sdk//:files", diff --git a/pkg/testutils/lint/passes/hash/BUILD.bazel b/pkg/testutils/lint/passes/hash/BUILD.bazel index d1c623ed1238..a5ce01a7b9b8 100644 --- a/pkg/testutils/lint/passes/hash/BUILD.bazel +++ b/pkg/testutils/lint/passes/hash/BUILD.bazel @@ -16,7 +16,10 @@ go_test( name = "hash_test", size = "small", srcs = ["hash_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]) + [ "@go_sdk//:files", ], diff --git a/pkg/testutils/lint/passes/leaktestcall/BUILD.bazel b/pkg/testutils/lint/passes/leaktestcall/BUILD.bazel index 21cafff0b68d..71a972003066 100644 --- a/pkg/testutils/lint/passes/leaktestcall/BUILD.bazel +++ b/pkg/testutils/lint/passes/leaktestcall/BUILD.bazel @@ -16,7 +16,10 @@ go_library( go_test( name = "leaktestcall_test", srcs = ["leaktestcall_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]) + [ "@go_sdk//:files", ], diff --git a/pkg/testutils/lint/passes/loopvarcapture/BUILD.bazel b/pkg/testutils/lint/passes/loopvarcapture/BUILD.bazel index 42b1a18bb93e..9a9225508811 100644 --- a/pkg/testutils/lint/passes/loopvarcapture/BUILD.bazel +++ b/pkg/testutils/lint/passes/loopvarcapture/BUILD.bazel @@ -21,7 +21,10 @@ go_library( go_test( name = "loopvarcapture_test", srcs = ["loopvarcapture_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]) + [ "@go_sdk//:files", ], diff --git a/pkg/testutils/lint/passes/nilness/BUILD.bazel b/pkg/testutils/lint/passes/nilness/BUILD.bazel index 9880b3635428..349c590e300a 100644 --- a/pkg/testutils/lint/passes/nilness/BUILD.bazel +++ b/pkg/testutils/lint/passes/nilness/BUILD.bazel @@ -16,7 +16,10 @@ go_library( go_test( name = "nilness_test", srcs = ["nilness_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]) + [ "@go_sdk//:files", ], diff --git a/pkg/testutils/lint/passes/nocopy/BUILD.bazel b/pkg/testutils/lint/passes/nocopy/BUILD.bazel index 3815e3df61e8..ad040ed068e4 100644 --- a/pkg/testutils/lint/passes/nocopy/BUILD.bazel +++ b/pkg/testutils/lint/passes/nocopy/BUILD.bazel @@ -17,7 +17,10 @@ go_test( name = "nocopy_test", size = "small", srcs = ["nocopy_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]) + [ "@go_sdk//:files", ], diff --git a/pkg/testutils/lint/passes/passesutil/BUILD.bazel b/pkg/testutils/lint/passes/passesutil/BUILD.bazel index 60c74bcc8504..cdcfab4fa6f1 100644 --- a/pkg/testutils/lint/passes/passesutil/BUILD.bazel +++ b/pkg/testutils/lint/passes/passesutil/BUILD.bazel @@ -16,7 +16,10 @@ go_test( name = "passesutil_test", size = "small", srcs = ["passes_util_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = [ "//pkg/testutils/lint/passes/forbiddenmethod:testdata", "//pkg/testutils/lint/passes/unconvert:testdata", diff --git a/pkg/testutils/lint/passes/returnerrcheck/BUILD.bazel b/pkg/testutils/lint/passes/returnerrcheck/BUILD.bazel index c0eb187401af..15643735211f 100644 --- a/pkg/testutils/lint/passes/returnerrcheck/BUILD.bazel +++ b/pkg/testutils/lint/passes/returnerrcheck/BUILD.bazel @@ -19,7 +19,10 @@ go_test( name = "returnerrcheck_test", size = "small", srcs = ["returnerrcheck_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]) + [ "@go_sdk//:files", ], diff --git a/pkg/testutils/lint/passes/timer/BUILD.bazel b/pkg/testutils/lint/passes/timer/BUILD.bazel index 3a42c207f196..45726f7e7f6e 100644 --- a/pkg/testutils/lint/passes/timer/BUILD.bazel +++ b/pkg/testutils/lint/passes/timer/BUILD.bazel @@ -17,7 +17,10 @@ go_test( name = "timer_test", size = "small", srcs = ["timer_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]) + [ "@go_sdk//:files", ], diff --git a/pkg/testutils/lint/passes/unconvert/BUILD.bazel b/pkg/testutils/lint/passes/unconvert/BUILD.bazel index 6ccf259c1b97..09560d34ac03 100644 --- a/pkg/testutils/lint/passes/unconvert/BUILD.bazel +++ b/pkg/testutils/lint/passes/unconvert/BUILD.bazel @@ -24,7 +24,10 @@ go_test( name = "unconvert_test", size = "small", srcs = ["unconvert_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = [ ":testdata", "@go_sdk//:files", diff --git a/pkg/testutils/sqlutils/BUILD.bazel b/pkg/testutils/sqlutils/BUILD.bazel index c28688b2f3a8..1e3305c6174b 100644 --- a/pkg/testutils/sqlutils/BUILD.bazel +++ b/pkg/testutils/sqlutils/BUILD.bazel @@ -47,7 +47,10 @@ go_test( "sql_runner_test.go", "table_gen_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":sqlutils"], deps = [ "//pkg/base", diff --git a/pkg/testutils/testcluster/BUILD.bazel b/pkg/testutils/testcluster/BUILD.bazel index 24aacd45a891..62462b987368 100644 --- a/pkg/testutils/testcluster/BUILD.bazel +++ b/pkg/testutils/testcluster/BUILD.bazel @@ -49,7 +49,10 @@ go_test( "main_test.go", "testcluster_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":testcluster"], deps = [ "//pkg/base", diff --git a/pkg/testutils/zerofields/BUILD.bazel b/pkg/testutils/zerofields/BUILD.bazel index 8d44371cd153..533a180c12eb 100644 --- a/pkg/testutils/zerofields/BUILD.bazel +++ b/pkg/testutils/zerofields/BUILD.bazel @@ -13,7 +13,10 @@ go_test( name = "zerofields_test", size = "small", srcs = ["no_zero_field_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":zerofields"], deps = ["@com_github_cockroachdb_errors//:errors"], ) diff --git a/pkg/ts/BUILD.bazel b/pkg/ts/BUILD.bazel index f8b6877d3046..f5296bbbfc14 100644 --- a/pkg/ts/BUILD.bazel +++ b/pkg/ts/BUILD.bazel @@ -68,7 +68,10 @@ go_test( "server_test.go", "timeseries_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":ts"], deps = [ "//pkg/base", diff --git a/pkg/ts/testmodel/BUILD.bazel b/pkg/ts/testmodel/BUILD.bazel index c9b00fb7e741..aef870110823 100644 --- a/pkg/ts/testmodel/BUILD.bazel +++ b/pkg/ts/testmodel/BUILD.bazel @@ -21,7 +21,10 @@ go_test( "db_test.go", "functions_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":testmodel"], deps = ["//pkg/ts/tspb"], ) diff --git a/pkg/ui/BUILD.bazel b/pkg/ui/BUILD.bazel index 52ed7644956e..b852be11b541 100644 --- a/pkg/ui/BUILD.bazel +++ b/pkg/ui/BUILD.bazel @@ -60,7 +60,10 @@ test_suite( go_test( name = "ui_test", srcs = ["ui_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":ui"], deps = [ "//pkg/base", diff --git a/pkg/ui/workspaces/cluster-ui/BUILD.bazel b/pkg/ui/workspaces/cluster-ui/BUILD.bazel index 152d5bdedce5..bfe6224d0d8c 100644 --- a/pkg/ui/workspaces/cluster-ui/BUILD.bazel +++ b/pkg/ui/workspaces/cluster-ui/BUILD.bazel @@ -268,8 +268,8 @@ tsc_test( ) + [ "tsconfig.json", "tsconfig.linting.json", - "//pkg/ui/workspaces/db-console/src/js:crdb-protobuf-client", "//pkg/ui/workspaces/db-console/ccl/src/js:crdb-protobuf-client-ccl", + "//pkg/ui/workspaces/db-console/src/js:crdb-protobuf-client", "@npm_cluster_ui//@babel/parser", "@npm_cluster_ui//@babel/types", "@npm_cluster_ui//@cockroachlabs/icons", diff --git a/pkg/ui/workspaces/db-console/BUILD.bazel b/pkg/ui/workspaces/db-console/BUILD.bazel index 33d05101aa9f..cf9f8bf2f935 100644 --- a/pkg/ui/workspaces/db-console/BUILD.bazel +++ b/pkg/ui/workspaces/db-console/BUILD.bazel @@ -292,9 +292,9 @@ tsc_test( ) + [ "tsconfig.json", "tsconfig.linting.json", - "//pkg/ui/workspaces/cluster-ui:cluster-ui", - "//pkg/ui/workspaces/db-console/src/js:crdb-protobuf-client", + "//pkg/ui/workspaces/cluster-ui", "//pkg/ui/workspaces/db-console/ccl/src/js:crdb-protobuf-client-ccl", + "//pkg/ui/workspaces/db-console/src/js:crdb-protobuf-client", "@npm_db_console//@babel/parser", "@npm_db_console//@babel/types", "@npm_db_console//@cockroachlabs/design-tokens", diff --git a/pkg/upgrade/upgradecluster/BUILD.bazel b/pkg/upgrade/upgradecluster/BUILD.bazel index c2a6cf51d741..6076445d34ab 100644 --- a/pkg/upgrade/upgradecluster/BUILD.bazel +++ b/pkg/upgrade/upgradecluster/BUILD.bazel @@ -39,7 +39,10 @@ go_test( "main_test.go", "nodes_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":upgradecluster"], deps = [ "//pkg/roachpb", diff --git a/pkg/upgrade/upgrademanager/BUILD.bazel b/pkg/upgrade/upgrademanager/BUILD.bazel index 304a4c2a548b..e24131d9b940 100644 --- a/pkg/upgrade/upgrademanager/BUILD.bazel +++ b/pkg/upgrade/upgrademanager/BUILD.bazel @@ -46,7 +46,10 @@ go_test( "main_test.go", "manager_external_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ "//pkg/base", "//pkg/clusterversion", diff --git a/pkg/upgrade/upgrades/BUILD.bazel b/pkg/upgrade/upgrades/BUILD.bazel index 403fd2d1bc56..040292c63c35 100644 --- a/pkg/upgrade/upgrades/BUILD.bazel +++ b/pkg/upgrade/upgrades/BUILD.bazel @@ -127,7 +127,10 @@ go_test( "wait_for_del_range_in_gc_job_test.go", "web_sessions_table_user_id_migration_test.go", ], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), data = glob(["testdata/**"]), embed = [":upgrades"], shard_count = 16, diff --git a/pkg/util/BUILD.bazel b/pkg/util/BUILD.bazel index 574a89783972..d23d1b55026a 100644 --- a/pkg/util/BUILD.bazel +++ b/pkg/util/BUILD.bazel @@ -53,7 +53,10 @@ go_test( "topk_test.go", "unresolved_addr_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":util"], deps = [ "//pkg/util/randutil", diff --git a/pkg/util/admission/BUILD.bazel b/pkg/util/admission/BUILD.bazel index 3ed968ba72fa..d6b9b5972f76 100644 --- a/pkg/util/admission/BUILD.bazel +++ b/pkg/util/admission/BUILD.bazel @@ -60,7 +60,10 @@ go_test( "tokens_linear_model_test.go", "work_queue_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":admission"], deps = [ diff --git a/pkg/util/binfetcher/BUILD.bazel b/pkg/util/binfetcher/BUILD.bazel index b90396ab18a7..c83b71802704 100644 --- a/pkg/util/binfetcher/BUILD.bazel +++ b/pkg/util/binfetcher/BUILD.bazel @@ -21,7 +21,10 @@ go_test( name = "binfetcher_test", size = "small", srcs = ["binfetcher_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":binfetcher"], deps = [ "//pkg/testutils", diff --git a/pkg/util/bitarray/BUILD.bazel b/pkg/util/bitarray/BUILD.bazel index 87c7026774ca..3e6307b92139 100644 --- a/pkg/util/bitarray/BUILD.bazel +++ b/pkg/util/bitarray/BUILD.bazel @@ -17,7 +17,10 @@ go_test( name = "bitarray_test", size = "small", srcs = ["bitarray_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":bitarray"], deps = ["//pkg/util/randutil"], ) diff --git a/pkg/util/buildutil/BUILD.bazel b/pkg/util/buildutil/BUILD.bazel index 562b6e9a2fde..3f967fbdaeb9 100644 --- a/pkg/util/buildutil/BUILD.bazel +++ b/pkg/util/buildutil/BUILD.bazel @@ -34,7 +34,10 @@ genrule( go_test( name = "buildutil_test", srcs = ["crdb_test_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":buildutil"], # keep deps = [ "//pkg/build/bazel", diff --git a/pkg/util/bulk/BUILD.bazel b/pkg/util/bulk/BUILD.bazel index d5499ea483fe..b8bf52d25ae8 100644 --- a/pkg/util/bulk/BUILD.bazel +++ b/pkg/util/bulk/BUILD.bazel @@ -15,7 +15,10 @@ go_library( go_test( name = "bulk_test", srcs = ["tracing_aggregator_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":bulk", "//pkg/ccl/backupccl/backuppb", diff --git a/pkg/util/cache/BUILD.bazel b/pkg/util/cache/BUILD.bazel index 06b41c4b3c02..817cf6f4b096 100644 --- a/pkg/util/cache/BUILD.bazel +++ b/pkg/util/cache/BUILD.bazel @@ -16,7 +16,10 @@ go_test( name = "cache_test", size = "small", srcs = ["cache_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":cache"], deps = [ "//pkg/util/log", diff --git a/pkg/util/caller/BUILD.bazel b/pkg/util/caller/BUILD.bazel index 523ff632aec2..ee5a6a4e4a78 100644 --- a/pkg/util/caller/BUILD.bazel +++ b/pkg/util/caller/BUILD.bazel @@ -16,7 +16,10 @@ go_test( "main_test.go", "resolver_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":caller"], deps = [ "//pkg/util/log", diff --git a/pkg/util/cgroups/BUILD.bazel b/pkg/util/cgroups/BUILD.bazel index 843fe2b64e5b..e89704220e3f 100644 --- a/pkg/util/cgroups/BUILD.bazel +++ b/pkg/util/cgroups/BUILD.bazel @@ -18,7 +18,10 @@ go_test( name = "cgroups_test", size = "small", srcs = ["cgroups_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":cgroups"], deps = [ "//pkg/testutils", diff --git a/pkg/util/circuit/BUILD.bazel b/pkg/util/circuit/BUILD.bazel index 99a14247b9a0..c993586c66ff 100644 --- a/pkg/util/circuit/BUILD.bazel +++ b/pkg/util/circuit/BUILD.bazel @@ -21,7 +21,10 @@ go_library( go_test( name = "circuit_test", srcs = ["circuitbreaker_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":circuit"], deps = [ diff --git a/pkg/util/cloudinfo/BUILD.bazel b/pkg/util/cloudinfo/BUILD.bazel index 528c1e60fecb..556c9f5eeaca 100644 --- a/pkg/util/cloudinfo/BUILD.bazel +++ b/pkg/util/cloudinfo/BUILD.bazel @@ -13,7 +13,10 @@ go_test( name = "cloudinfo_test", size = "small", srcs = ["cloudinfo_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":cloudinfo"], deps = [ "//pkg/util/httputil", diff --git a/pkg/util/contextutil/BUILD.bazel b/pkg/util/contextutil/BUILD.bazel index 93a056013046..69cc43d6e583 100644 --- a/pkg/util/contextutil/BUILD.bazel +++ b/pkg/util/contextutil/BUILD.bazel @@ -25,7 +25,10 @@ go_test( "context_test.go", "timeout_error_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":contextutil"], deps = [ "@com_github_cockroachdb_errors//:errors", diff --git a/pkg/util/ctxgroup/BUILD.bazel b/pkg/util/ctxgroup/BUILD.bazel index e3498007166a..5c9313f2abed 100644 --- a/pkg/util/ctxgroup/BUILD.bazel +++ b/pkg/util/ctxgroup/BUILD.bazel @@ -13,7 +13,10 @@ go_test( name = "ctxgroup_test", size = "small", srcs = ["ctxgroup_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":ctxgroup"], deps = [ "//pkg/testutils", diff --git a/pkg/util/duration/BUILD.bazel b/pkg/util/duration/BUILD.bazel index 866538eea1bc..4779dae5377a 100644 --- a/pkg/util/duration/BUILD.bazel +++ b/pkg/util/duration/BUILD.bazel @@ -29,7 +29,10 @@ go_test( "duration_test.go", "parse_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":duration"], deps = [ "//pkg/sql/types", diff --git a/pkg/util/encoding/BUILD.bazel b/pkg/util/encoding/BUILD.bazel index 8339e0969c7b..cbc5ae9c5f9d 100644 --- a/pkg/util/encoding/BUILD.bazel +++ b/pkg/util/encoding/BUILD.bazel @@ -40,7 +40,10 @@ go_test( "main_test.go", "printer_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":encoding"], deps = [ "//pkg/geo", diff --git a/pkg/util/encoding/csv/BUILD.bazel b/pkg/util/encoding/csv/BUILD.bazel index 3ead3cf2b7ac..9cfcac63bd33 100644 --- a/pkg/util/encoding/csv/BUILD.bazel +++ b/pkg/util/encoding/csv/BUILD.bazel @@ -20,7 +20,10 @@ go_test( "reader_test.go", "writer_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":csv"], deps = [ "//pkg/util/log", diff --git a/pkg/util/envutil/BUILD.bazel b/pkg/util/envutil/BUILD.bazel index 61923e4538ca..c40011ef3096 100644 --- a/pkg/util/envutil/BUILD.bazel +++ b/pkg/util/envutil/BUILD.bazel @@ -17,7 +17,10 @@ go_test( name = "envutil_test", size = "small", srcs = ["env_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":envutil"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/util/errorutil/BUILD.bazel b/pkg/util/errorutil/BUILD.bazel index 4fe24ac16628..030b97d30c43 100644 --- a/pkg/util/errorutil/BUILD.bazel +++ b/pkg/util/errorutil/BUILD.bazel @@ -25,7 +25,10 @@ go_test( name = "errorutil_test", size = "small", srcs = ["error_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":errorutil"], ) diff --git a/pkg/util/errorutil/unimplemented/BUILD.bazel b/pkg/util/errorutil/unimplemented/BUILD.bazel index 8f8228d5c6ff..bd0ac252ff78 100644 --- a/pkg/util/errorutil/unimplemented/BUILD.bazel +++ b/pkg/util/errorutil/unimplemented/BUILD.bazel @@ -18,7 +18,10 @@ go_test( name = "unimplemented_test", size = "small", srcs = ["unimplemented_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":unimplemented"], deps = [ "//pkg/build", diff --git a/pkg/util/flagutil/BUILD.bazel b/pkg/util/flagutil/BUILD.bazel index 01946f44ebc9..ed90233dd726 100644 --- a/pkg/util/flagutil/BUILD.bazel +++ b/pkg/util/flagutil/BUILD.bazel @@ -17,7 +17,10 @@ go_test( name = "flagutil_test", size = "small", srcs = ["flagutil_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":flagutil"], deps = [ "//pkg/util/log", diff --git a/pkg/util/fsm/BUILD.bazel b/pkg/util/fsm/BUILD.bazel index 4c1eae419a67..1aa3758bf271 100644 --- a/pkg/util/fsm/BUILD.bazel +++ b/pkg/util/fsm/BUILD.bazel @@ -21,7 +21,10 @@ go_test( "fsm_test.go", "match_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":fsm"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/util/future/BUILD.bazel b/pkg/util/future/BUILD.bazel index 95321d7eeb9c..586777fe82ab 100644 --- a/pkg/util/future/BUILD.bazel +++ b/pkg/util/future/BUILD.bazel @@ -17,7 +17,10 @@ go_library( go_test( name = "future_test", srcs = ["future_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":future", "//pkg/testutils", diff --git a/pkg/util/fuzzystrmatch/BUILD.bazel b/pkg/util/fuzzystrmatch/BUILD.bazel index fb1c88de66e6..10bd4140d712 100644 --- a/pkg/util/fuzzystrmatch/BUILD.bazel +++ b/pkg/util/fuzzystrmatch/BUILD.bazel @@ -18,7 +18,10 @@ go_test( "leven_test.go", "soundex_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":fuzzystrmatch"], ) diff --git a/pkg/util/goschedstats/BUILD.bazel b/pkg/util/goschedstats/BUILD.bazel index 83c8fc3bc62f..7b1d7ffad4b1 100644 --- a/pkg/util/goschedstats/BUILD.bazel +++ b/pkg/util/goschedstats/BUILD.bazel @@ -19,7 +19,10 @@ go_library( go_test( name = "goschedstats_test", srcs = ["runnable_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":goschedstats"], deps = [ "//pkg/testutils", diff --git a/pkg/util/grpcutil/BUILD.bazel b/pkg/util/grpcutil/BUILD.bazel index 5acf87838757..8b7fcc253fa0 100644 --- a/pkg/util/grpcutil/BUILD.bazel +++ b/pkg/util/grpcutil/BUILD.bazel @@ -39,7 +39,10 @@ go_test( "grpc_log_test.go", "grpc_util_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":grpcutil"], deps = [ "//pkg/server", diff --git a/pkg/util/grunning/BUILD.bazel b/pkg/util/grunning/BUILD.bazel index 4e34a6cbda1e..1c0ea1cff9d4 100644 --- a/pkg/util/grunning/BUILD.bazel +++ b/pkg/util/grunning/BUILD.bazel @@ -18,7 +18,10 @@ go_test( "disabled_test.go", "enabled_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = select({ "@io_bazel_rules_go//go/platform:aix_ppc64": [ ":grunning", diff --git a/pkg/util/hlc/BUILD.bazel b/pkg/util/hlc/BUILD.bazel index 8f9f0b3865bb..ae8fb4cbb671 100644 --- a/pkg/util/hlc/BUILD.bazel +++ b/pkg/util/hlc/BUILD.bazel @@ -33,7 +33,10 @@ go_test( "hlc_test.go", "timestamp_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":hlc"], deps = [ "//pkg/cli/exit", diff --git a/pkg/util/httputil/BUILD.bazel b/pkg/util/httputil/BUILD.bazel index a3464f3f9026..25b968f7be6c 100644 --- a/pkg/util/httputil/BUILD.bazel +++ b/pkg/util/httputil/BUILD.bazel @@ -24,7 +24,10 @@ go_test( "compute_etags_test.go", "etag_handler_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":httputil"], deps = [ "//pkg/util/leaktest", diff --git a/pkg/util/humanizeutil/BUILD.bazel b/pkg/util/humanizeutil/BUILD.bazel index 2d8da0d31e57..3b5424222ef7 100644 --- a/pkg/util/humanizeutil/BUILD.bazel +++ b/pkg/util/humanizeutil/BUILD.bazel @@ -25,7 +25,10 @@ go_test( "duration_test.go", "humanize_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":humanizeutil"], deps = [ "//pkg/util/leaktest", diff --git a/pkg/util/interval/BUILD.bazel b/pkg/util/interval/BUILD.bazel index 72e39d0a09a0..d7670b51782e 100644 --- a/pkg/util/interval/BUILD.bazel +++ b/pkg/util/interval/BUILD.bazel @@ -27,7 +27,10 @@ go_test( "btree_based_interval_test.go", "range_group_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":interval"], deps = [ "//pkg/util/log", diff --git a/pkg/util/interval/generic/BUILD.bazel b/pkg/util/interval/generic/BUILD.bazel index 9bc27afe0eea..a9b2eef0681b 100644 --- a/pkg/util/interval/generic/BUILD.bazel +++ b/pkg/util/interval/generic/BUILD.bazel @@ -21,7 +21,10 @@ go_test( name = "generic_test", size = "large", srcs = [":example_interval_btree_test.go"], - args = ["-test.timeout=895s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=895s"], + "//conditions:default": ["-test.timeout=895s"], + }), embed = [":generic"], shard_count = 16, deps = [ diff --git a/pkg/util/intsets/BUILD.bazel b/pkg/util/intsets/BUILD.bazel index 6f01c77f16f3..f9061b28ffcf 100644 --- a/pkg/util/intsets/BUILD.bazel +++ b/pkg/util/intsets/BUILD.bazel @@ -25,7 +25,10 @@ go_test( "fast_test.go", "sparse_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":intsets"], deps = ["//pkg/util/randutil"], ) diff --git a/pkg/util/ipaddr/BUILD.bazel b/pkg/util/ipaddr/BUILD.bazel index 393833c252c0..6f8ce935631e 100644 --- a/pkg/util/ipaddr/BUILD.bazel +++ b/pkg/util/ipaddr/BUILD.bazel @@ -21,7 +21,10 @@ go_test( name = "ipaddr_test", size = "small", srcs = ["ipaddr_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":ipaddr"], deps = ["//pkg/util/uint128"], ) diff --git a/pkg/util/json/BUILD.bazel b/pkg/util/json/BUILD.bazel index be23c648d967..f914068710ad 100644 --- a/pkg/util/json/BUILD.bazel +++ b/pkg/util/json/BUILD.bazel @@ -46,7 +46,10 @@ go_test( "encode_test.go", "json_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":json"], deps = [ diff --git a/pkg/util/json/tokenizer/BUILD.bazel b/pkg/util/json/tokenizer/BUILD.bazel index 76deaa1f65dd..33a3265be4ce 100644 --- a/pkg/util/json/tokenizer/BUILD.bazel +++ b/pkg/util/json/tokenizer/BUILD.bazel @@ -19,7 +19,10 @@ go_test( "decoder_test.go", "scanner_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":tokenizer"], deps = ["@com_github_stretchr_testify//require"], diff --git a/pkg/util/limit/BUILD.bazel b/pkg/util/limit/BUILD.bazel index 69c8df413df1..f323411659e9 100644 --- a/pkg/util/limit/BUILD.bazel +++ b/pkg/util/limit/BUILD.bazel @@ -18,7 +18,10 @@ go_test( name = "limit_test", size = "small", srcs = ["limiter_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":limit"], deps = [ "//pkg/util/leaktest", diff --git a/pkg/util/log/BUILD.bazel b/pkg/util/log/BUILD.bazel index 86645315379c..d888d7d0dd48 100644 --- a/pkg/util/log/BUILD.bazel +++ b/pkg/util/log/BUILD.bazel @@ -158,7 +158,10 @@ go_test( "trace_test.go", ":mock_logsink", # keep ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":log"], deps = [ diff --git a/pkg/util/log/eventpb/BUILD.bazel b/pkg/util/log/eventpb/BUILD.bazel index e3c94b65e7a4..4bf10922a226 100644 --- a/pkg/util/log/eventpb/BUILD.bazel +++ b/pkg/util/log/eventpb/BUILD.bazel @@ -36,7 +36,10 @@ go_test( name = "eventpb_test", size = "small", srcs = ["event_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":eventpb"], deps = [ "//pkg/util/log/logpb", diff --git a/pkg/util/log/logconfig/BUILD.bazel b/pkg/util/log/logconfig/BUILD.bazel index 72545931d356..6c8928270095 100644 --- a/pkg/util/log/logconfig/BUILD.bazel +++ b/pkg/util/log/logconfig/BUILD.bazel @@ -42,7 +42,10 @@ go_test( "export_test.go", "validate_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":logconfig"], deps = [ diff --git a/pkg/util/log/logcrash/BUILD.bazel b/pkg/util/log/logcrash/BUILD.bazel index 68574497cf1a..5cb8c4378ae7 100644 --- a/pkg/util/log/logcrash/BUILD.bazel +++ b/pkg/util/log/logcrash/BUILD.bazel @@ -30,7 +30,10 @@ go_test( "crash_reporting_unix_test.go", "main_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":logcrash"], deps = [ "//pkg/base", diff --git a/pkg/util/log/testshout/BUILD.bazel b/pkg/util/log/testshout/BUILD.bazel index c6bef038cc6b..f3dacc2042dc 100644 --- a/pkg/util/log/testshout/BUILD.bazel +++ b/pkg/util/log/testshout/BUILD.bazel @@ -5,7 +5,10 @@ go_test( name = "testshout_test", size = "small", srcs = ["shout_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ "//pkg/util/log", "//pkg/util/log/logconfig", diff --git a/pkg/util/metric/BUILD.bazel b/pkg/util/metric/BUILD.bazel index e94462787b40..f3ae41905639 100644 --- a/pkg/util/metric/BUILD.bazel +++ b/pkg/util/metric/BUILD.bazel @@ -53,7 +53,10 @@ go_test( "registry_test.go", "rule_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":metric"], deps = [ diff --git a/pkg/util/metric/aggmetric/BUILD.bazel b/pkg/util/metric/aggmetric/BUILD.bazel index 5984de7e5154..0fbb666d0fe8 100644 --- a/pkg/util/metric/aggmetric/BUILD.bazel +++ b/pkg/util/metric/aggmetric/BUILD.bazel @@ -25,7 +25,10 @@ go_test( name = "aggmetric_test", size = "small", srcs = ["agg_metric_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), deps = [ ":aggmetric", diff --git a/pkg/util/mon/BUILD.bazel b/pkg/util/mon/BUILD.bazel index 808ad0152d1d..2e18d6a8818e 100644 --- a/pkg/util/mon/BUILD.bazel +++ b/pkg/util/mon/BUILD.bazel @@ -30,7 +30,10 @@ go_test( name = "mon_test", size = "small", srcs = ["bytes_usage_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":mon"], deps = [ "//pkg/settings/cluster", diff --git a/pkg/util/netutil/BUILD.bazel b/pkg/util/netutil/BUILD.bazel index a71e3522c5b3..a3dec3bcd8e3 100644 --- a/pkg/util/netutil/BUILD.bazel +++ b/pkg/util/netutil/BUILD.bazel @@ -30,7 +30,10 @@ go_test( "net_test.go", "srv_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":netutil"], deps = [ "//pkg/util/contextutil", diff --git a/pkg/util/netutil/addr/BUILD.bazel b/pkg/util/netutil/addr/BUILD.bazel index 2e59e9f816e9..63277416ec01 100644 --- a/pkg/util/netutil/addr/BUILD.bazel +++ b/pkg/util/netutil/addr/BUILD.bazel @@ -15,7 +15,10 @@ go_library( go_test( name = "addr_test", srcs = ["addr_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":addr", "//pkg/testutils", diff --git a/pkg/util/optional/BUILD.bazel b/pkg/util/optional/BUILD.bazel index ee6890a64e25..2229733cbe81 100644 --- a/pkg/util/optional/BUILD.bazel +++ b/pkg/util/optional/BUILD.bazel @@ -21,7 +21,10 @@ go_test( "duration_test.go", "uint_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":optional", "@com_github_stretchr_testify//require", diff --git a/pkg/util/parquet/BUILD.bazel b/pkg/util/parquet/BUILD.bazel index 9457cf1c2c26..4f446da145f5 100644 --- a/pkg/util/parquet/BUILD.bazel +++ b/pkg/util/parquet/BUILD.bazel @@ -35,7 +35,10 @@ go_test( "writer_bench_test.go", "writer_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":parquet"], deps = [ "//pkg/sql/randgen", diff --git a/pkg/util/pprofutil/BUILD.bazel b/pkg/util/pprofutil/BUILD.bazel index 891fd67df826..dcd7210cbab6 100644 --- a/pkg/util/pprofutil/BUILD.bazel +++ b/pkg/util/pprofutil/BUILD.bazel @@ -12,7 +12,10 @@ go_library( go_test( name = "pprofutil_test", srcs = ["labels_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":pprofutil"], deps = [ "@com_github_cockroachdb_logtags//:logtags", diff --git a/pkg/util/pretty/BUILD.bazel b/pkg/util/pretty/BUILD.bazel index 6bbf92014afd..7d1edee08b71 100644 --- a/pkg/util/pretty/BUILD.bazel +++ b/pkg/util/pretty/BUILD.bazel @@ -16,7 +16,10 @@ go_test( name = "pretty_test", size = "small", srcs = ["pretty_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [":pretty"], ) diff --git a/pkg/util/protoutil/BUILD.bazel b/pkg/util/protoutil/BUILD.bazel index d686fe5a25b0..993e130ad728 100644 --- a/pkg/util/protoutil/BUILD.bazel +++ b/pkg/util/protoutil/BUILD.bazel @@ -27,7 +27,10 @@ go_test( name = "protoutil_test", size = "small", srcs = ["clone_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":protoutil", "//pkg/config/zonepb", diff --git a/pkg/util/quantile/BUILD.bazel b/pkg/util/quantile/BUILD.bazel index 6922746eee75..05c96c669d86 100644 --- a/pkg/util/quantile/BUILD.bazel +++ b/pkg/util/quantile/BUILD.bazel @@ -11,7 +11,10 @@ go_library( go_test( name = "quantile_test", srcs = ["stream_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":quantile"], ) diff --git a/pkg/util/quotapool/BUILD.bazel b/pkg/util/quotapool/BUILD.bazel index bf3cddcb2347..d5969b7875ad 100644 --- a/pkg/util/quotapool/BUILD.bazel +++ b/pkg/util/quotapool/BUILD.bazel @@ -34,7 +34,10 @@ go_test( "notify_queue_test.go", "token_bucket_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":quotapool"], deps = [ "//pkg/testutils", diff --git a/pkg/util/randident/BUILD.bazel b/pkg/util/randident/BUILD.bazel index a595de307367..8c639ba86ec8 100644 --- a/pkg/util/randident/BUILD.bazel +++ b/pkg/util/randident/BUILD.bazel @@ -19,7 +19,10 @@ go_library( go_test( name = "randident_test", srcs = ["namegen_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":randident"], deps = ["@org_golang_x_text//unicode/norm"], ) diff --git a/pkg/util/randutil/BUILD.bazel b/pkg/util/randutil/BUILD.bazel index fb3515ef3287..d8ae6201a915 100644 --- a/pkg/util/randutil/BUILD.bazel +++ b/pkg/util/randutil/BUILD.bazel @@ -16,7 +16,10 @@ go_test( name = "randutil_test", size = "small", srcs = ["rand_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":randutil", "//pkg/util/log", diff --git a/pkg/util/rangedesc/BUILD.bazel b/pkg/util/rangedesc/BUILD.bazel index 5916b6037db1..b8e91c7ce86a 100644 --- a/pkg/util/rangedesc/BUILD.bazel +++ b/pkg/util/rangedesc/BUILD.bazel @@ -21,7 +21,10 @@ go_test( "main_test.go", "rangedesc_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), deps = [ ":rangedesc", diff --git a/pkg/util/retry/BUILD.bazel b/pkg/util/retry/BUILD.bazel index b41bf310507a..cd80b1afb60a 100644 --- a/pkg/util/retry/BUILD.bazel +++ b/pkg/util/retry/BUILD.bazel @@ -19,7 +19,10 @@ go_test( "main_test.go", "retry_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":retry"], deps = [ "//pkg/util/log", diff --git a/pkg/util/ring/BUILD.bazel b/pkg/util/ring/BUILD.bazel index c80844b7e250..2a79f4791a0f 100644 --- a/pkg/util/ring/BUILD.bazel +++ b/pkg/util/ring/BUILD.bazel @@ -15,7 +15,10 @@ go_test( "main_test.go", "ring_buffer_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":ring"], deps = [ "//pkg/util/leaktest", diff --git a/pkg/util/schedulerlatency/BUILD.bazel b/pkg/util/schedulerlatency/BUILD.bazel index dc71b0cf362f..c43c4634f944 100644 --- a/pkg/util/schedulerlatency/BUILD.bazel +++ b/pkg/util/schedulerlatency/BUILD.bazel @@ -28,7 +28,10 @@ go_test( "histogram_test.go", "scheduler_latency_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":schedulerlatency"], deps = [ diff --git a/pkg/util/sdnotify/BUILD.bazel b/pkg/util/sdnotify/BUILD.bazel index 28e98f79503b..69d3e12061ef 100644 --- a/pkg/util/sdnotify/BUILD.bazel +++ b/pkg/util/sdnotify/BUILD.bazel @@ -22,7 +22,10 @@ go_test( name = "sdnotify_test", size = "small", srcs = ["sdnotify_unix_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":sdnotify"], deps = select({ "@io_bazel_rules_go//go/platform:aix": [ diff --git a/pkg/util/search/BUILD.bazel b/pkg/util/search/BUILD.bazel index c7957eccaa4c..95d0312a23a7 100644 --- a/pkg/util/search/BUILD.bazel +++ b/pkg/util/search/BUILD.bazel @@ -13,7 +13,10 @@ go_test( name = "search_test", size = "small", srcs = ["search_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":search"], deps = [ "//pkg/util/timeutil", diff --git a/pkg/util/shuffle/BUILD.bazel b/pkg/util/shuffle/BUILD.bazel index 4ffd6b489548..f5b48d261c33 100644 --- a/pkg/util/shuffle/BUILD.bazel +++ b/pkg/util/shuffle/BUILD.bazel @@ -12,7 +12,10 @@ go_test( name = "shuffle_test", size = "small", srcs = ["shuffle_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":shuffle"], deps = ["//pkg/util/leaktest"], ) diff --git a/pkg/util/slidingwindow/BUILD.bazel b/pkg/util/slidingwindow/BUILD.bazel index 10446c16efc3..2f112ad0e94f 100644 --- a/pkg/util/slidingwindow/BUILD.bazel +++ b/pkg/util/slidingwindow/BUILD.bazel @@ -14,7 +14,10 @@ go_library( go_test( name = "slidingwindow_test", srcs = ["sliding_window_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":slidingwindow"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/util/span/BUILD.bazel b/pkg/util/span/BUILD.bazel index 819fac7615a2..b91646f20d83 100644 --- a/pkg/util/span/BUILD.bazel +++ b/pkg/util/span/BUILD.bazel @@ -19,7 +19,10 @@ go_test( name = "span_test", size = "small", srcs = ["frontier_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":span"], deps = [ "//pkg/roachpb", diff --git a/pkg/util/startup/BUILD.bazel b/pkg/util/startup/BUILD.bazel index 2acaeccc2236..2776fbd7efdf 100644 --- a/pkg/util/startup/BUILD.bazel +++ b/pkg/util/startup/BUILD.bazel @@ -23,7 +23,10 @@ go_test( "retry_test.go", "startup_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":startup"], deps = [ "//pkg/base", diff --git a/pkg/util/stop/BUILD.bazel b/pkg/util/stop/BUILD.bazel index 11ccee60623f..653d72552a4e 100644 --- a/pkg/util/stop/BUILD.bazel +++ b/pkg/util/stop/BUILD.bazel @@ -25,7 +25,10 @@ go_test( "main_test.go", "stopper_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":stop", "//pkg/kv/kvpb", diff --git a/pkg/util/stringarena/BUILD.bazel b/pkg/util/stringarena/BUILD.bazel index bc39512f90e9..fd0f07ee631c 100644 --- a/pkg/util/stringarena/BUILD.bazel +++ b/pkg/util/stringarena/BUILD.bazel @@ -13,7 +13,10 @@ go_test( name = "stringarena_test", size = "small", srcs = ["arena_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":stringarena"], ) diff --git a/pkg/util/strutil/BUILD.bazel b/pkg/util/strutil/BUILD.bazel index 3d6bf1ae2fe5..5d2d9dd17972 100644 --- a/pkg/util/strutil/BUILD.bazel +++ b/pkg/util/strutil/BUILD.bazel @@ -11,7 +11,10 @@ go_library( go_test( name = "strutil_test", srcs = ["util_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":strutil"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/util/syncutil/BUILD.bazel b/pkg/util/syncutil/BUILD.bazel index 955077e81b62..d2e757fb12db 100644 --- a/pkg/util/syncutil/BUILD.bazel +++ b/pkg/util/syncutil/BUILD.bazel @@ -27,7 +27,10 @@ go_test( "int_map_test.go", "mutex_sync_race_test.go", # keep ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":syncutil"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/util/syncutil/singleflight/BUILD.bazel b/pkg/util/syncutil/singleflight/BUILD.bazel index 47659aacc55e..a3642bc72336 100644 --- a/pkg/util/syncutil/singleflight/BUILD.bazel +++ b/pkg/util/syncutil/singleflight/BUILD.bazel @@ -22,7 +22,10 @@ go_test( name = "singleflight_test", size = "small", srcs = ["singleflight_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":singleflight"], deps = [ "//pkg/testutils", diff --git a/pkg/util/sysutil/BUILD.bazel b/pkg/util/sysutil/BUILD.bazel index de19a79164d2..c1606f33dcf4 100644 --- a/pkg/util/sysutil/BUILD.bazel +++ b/pkg/util/sysutil/BUILD.bazel @@ -71,7 +71,10 @@ go_test( "sysutil_test.go", "sysutil_unix_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":sysutil"], deps = [ "@com_github_cockroachdb_errors//:errors", diff --git a/pkg/util/targz/BUILD.bazel b/pkg/util/targz/BUILD.bazel index 597b591b2b75..1a1db6099ff0 100644 --- a/pkg/util/targz/BUILD.bazel +++ b/pkg/util/targz/BUILD.bazel @@ -15,7 +15,10 @@ go_library( go_test( name = "targz_test", srcs = ["targz_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":targz"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/util/timeofday/BUILD.bazel b/pkg/util/timeofday/BUILD.bazel index 0c723b337c29..58bc390aac9f 100644 --- a/pkg/util/timeofday/BUILD.bazel +++ b/pkg/util/timeofday/BUILD.bazel @@ -17,7 +17,10 @@ go_test( name = "timeofday_test", size = "small", srcs = ["time_of_day_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":timeofday"], deps = ["//pkg/util/duration"], ) diff --git a/pkg/util/timetz/BUILD.bazel b/pkg/util/timetz/BUILD.bazel index 4482dbdf540d..ba9f1bde0e6e 100644 --- a/pkg/util/timetz/BUILD.bazel +++ b/pkg/util/timetz/BUILD.bazel @@ -20,7 +20,10 @@ go_test( name = "timetz_test", size = "small", srcs = ["timetz_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":timetz"], deps = [ "//pkg/util/timeofday", diff --git a/pkg/util/timeutil/BUILD.bazel b/pkg/util/timeutil/BUILD.bazel index 3e901ec9c8b4..977eddfb5cd9 100644 --- a/pkg/util/timeutil/BUILD.bazel +++ b/pkg/util/timeutil/BUILD.bazel @@ -36,7 +36,10 @@ go_test( "time_zone_util_test.go", "timer_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":timeutil"], deps = [ "//pkg/util/leaktest", diff --git a/pkg/util/timeutil/pgdate/BUILD.bazel b/pkg/util/timeutil/pgdate/BUILD.bazel index daccda2cbba5..79fa4c845b14 100644 --- a/pkg/util/timeutil/pgdate/BUILD.bazel +++ b/pkg/util/timeutil/pgdate/BUILD.bazel @@ -40,7 +40,10 @@ go_test( "parsing_test.go", "pgdate_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":pgdate"], deps = [ "//pkg/util/timeutil", diff --git a/pkg/util/tochar/BUILD.bazel b/pkg/util/tochar/BUILD.bazel index e415f258819a..ea3050744d2f 100644 --- a/pkg/util/tochar/BUILD.bazel +++ b/pkg/util/tochar/BUILD.bazel @@ -27,7 +27,10 @@ go_test( "cache_test.go", "tochar_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), data = glob(["testdata/**"]), embed = [":tochar"], deps = [ diff --git a/pkg/util/tracing/BUILD.bazel b/pkg/util/tracing/BUILD.bazel index f8afe28aec87..63f5add27bba 100644 --- a/pkg/util/tracing/BUILD.bazel +++ b/pkg/util/tracing/BUILD.bazel @@ -66,7 +66,10 @@ go_test( "tracer_external_test.go", "tracer_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":tracing"], deps = [ "//pkg/base", diff --git a/pkg/util/tracing/collector/BUILD.bazel b/pkg/util/tracing/collector/BUILD.bazel index abfe0e138ec0..80749aec9112 100644 --- a/pkg/util/tracing/collector/BUILD.bazel +++ b/pkg/util/tracing/collector/BUILD.bazel @@ -24,7 +24,10 @@ go_test( "collector_test.go", "main_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":collector", "//pkg/base", diff --git a/pkg/util/tracing/grpcinterceptor/BUILD.bazel b/pkg/util/tracing/grpcinterceptor/BUILD.bazel index 7f04768b771f..83ac3292af02 100644 --- a/pkg/util/tracing/grpcinterceptor/BUILD.bazel +++ b/pkg/util/tracing/grpcinterceptor/BUILD.bazel @@ -21,7 +21,10 @@ go_library( go_test( name = "grpcinterceptor_test", srcs = ["grpc_interceptor_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":grpcinterceptor", "//pkg/testutils", diff --git a/pkg/util/tracing/service/BUILD.bazel b/pkg/util/tracing/service/BUILD.bazel index 79432f522ad1..2812fd88a2c9 100644 --- a/pkg/util/tracing/service/BUILD.bazel +++ b/pkg/util/tracing/service/BUILD.bazel @@ -16,7 +16,10 @@ go_library( go_test( name = "service_test", srcs = ["service_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":service"], deps = [ "//pkg/util/leaktest", diff --git a/pkg/util/treeprinter/BUILD.bazel b/pkg/util/treeprinter/BUILD.bazel index f7d2d6658724..318c51fd717f 100644 --- a/pkg/util/treeprinter/BUILD.bazel +++ b/pkg/util/treeprinter/BUILD.bazel @@ -12,7 +12,10 @@ go_test( name = "treeprinter_test", size = "small", srcs = ["tree_printer_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":treeprinter"], ) diff --git a/pkg/util/trigram/BUILD.bazel b/pkg/util/trigram/BUILD.bazel index 0143c6436a66..f9c9bbd10e07 100644 --- a/pkg/util/trigram/BUILD.bazel +++ b/pkg/util/trigram/BUILD.bazel @@ -11,7 +11,10 @@ go_library( go_test( name = "trigram_test", srcs = ["trigram_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":trigram"], deps = ["@com_github_stretchr_testify//assert"], ) diff --git a/pkg/util/tsearch/BUILD.bazel b/pkg/util/tsearch/BUILD.bazel index 01e25c3c2780..d77a64383d38 100644 --- a/pkg/util/tsearch/BUILD.bazel +++ b/pkg/util/tsearch/BUILD.bazel @@ -68,7 +68,10 @@ go_test( "tsquery_test.go", "tsvector_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":tsearch"], deps = [ "//pkg/sql/inverted", diff --git a/pkg/util/uint128/BUILD.bazel b/pkg/util/uint128/BUILD.bazel index eb0ebf4c7169..b545354408f3 100644 --- a/pkg/util/uint128/BUILD.bazel +++ b/pkg/util/uint128/BUILD.bazel @@ -13,7 +13,10 @@ go_test( name = "uint128_test", size = "small", srcs = ["uint128_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":uint128"], ) diff --git a/pkg/util/ulid/BUILD.bazel b/pkg/util/ulid/BUILD.bazel index 9a461366c741..cdea82868b47 100644 --- a/pkg/util/ulid/BUILD.bazel +++ b/pkg/util/ulid/BUILD.bazel @@ -15,7 +15,10 @@ go_library( go_test( name = "ulid_test", srcs = ["ulid_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), deps = [ ":ulid", "//pkg/util/syncutil", diff --git a/pkg/util/unique/BUILD.bazel b/pkg/util/unique/BUILD.bazel index b8d55a4a4418..783461cb6556 100644 --- a/pkg/util/unique/BUILD.bazel +++ b/pkg/util/unique/BUILD.bazel @@ -12,7 +12,10 @@ go_test( name = "unique_test", size = "small", srcs = ["unique_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":unique"], ) diff --git a/pkg/util/uuid/BUILD.bazel b/pkg/util/uuid/BUILD.bazel index fa39c7db5f89..32dc711d72c6 100644 --- a/pkg/util/uuid/BUILD.bazel +++ b/pkg/util/uuid/BUILD.bazel @@ -30,7 +30,10 @@ go_test( "sql_test.go", "uuid_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), data = glob(["testdata/**"]), embed = [":uuid"], deps = [ diff --git a/pkg/util/version/BUILD.bazel b/pkg/util/version/BUILD.bazel index c3ca9f406a2a..e858ddc6d7de 100644 --- a/pkg/util/version/BUILD.bazel +++ b/pkg/util/version/BUILD.bazel @@ -17,7 +17,10 @@ go_test( name = "version_test", size = "small", srcs = ["version_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":version"], ) diff --git a/pkg/workload/BUILD.bazel b/pkg/workload/BUILD.bazel index 2061f1ff4c5e..ff4e2b2f0585 100644 --- a/pkg/workload/BUILD.bazel +++ b/pkg/workload/BUILD.bazel @@ -48,7 +48,10 @@ go_test( "stats_test.go", "workload_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":workload"], deps = [ "//pkg/col/coldata", diff --git a/pkg/workload/bank/BUILD.bazel b/pkg/workload/bank/BUILD.bazel index a62500604581..fd298a9e7662 100644 --- a/pkg/workload/bank/BUILD.bazel +++ b/pkg/workload/bank/BUILD.bazel @@ -26,7 +26,10 @@ go_test( "bank_test.go", "main_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":bank"], deps = [ "//pkg/base", diff --git a/pkg/workload/cli/BUILD.bazel b/pkg/workload/cli/BUILD.bazel index d32901c4b6d0..08a94b1c0399 100644 --- a/pkg/workload/cli/BUILD.bazel +++ b/pkg/workload/cli/BUILD.bazel @@ -81,7 +81,10 @@ go_test( name = "cli_test", size = "small", srcs = ["format_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":cli"], deps = [ "//pkg/util/leaktest", diff --git a/pkg/workload/faker/BUILD.bazel b/pkg/workload/faker/BUILD.bazel index 02faa5ba5920..420b61a5bea1 100644 --- a/pkg/workload/faker/BUILD.bazel +++ b/pkg/workload/faker/BUILD.bazel @@ -19,7 +19,10 @@ go_test( name = "faker_test", size = "small", srcs = ["faker_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":faker"], deps = [ "@com_github_stretchr_testify//assert", diff --git a/pkg/workload/histogram/BUILD.bazel b/pkg/workload/histogram/BUILD.bazel index eb061df6dc4d..f66410cf4fad 100644 --- a/pkg/workload/histogram/BUILD.bazel +++ b/pkg/workload/histogram/BUILD.bazel @@ -18,7 +18,10 @@ go_library( go_test( name = "histogram_test", srcs = ["histogram_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":histogram"], deps = [ "//pkg/util/ctxgroup", diff --git a/pkg/workload/insights/BUILD.bazel b/pkg/workload/insights/BUILD.bazel index 287d52a35173..fe06a2c871b5 100644 --- a/pkg/workload/insights/BUILD.bazel +++ b/pkg/workload/insights/BUILD.bazel @@ -27,7 +27,10 @@ go_test( "insights_test.go", "main_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":insights"], deps = [ "//pkg/base", diff --git a/pkg/workload/kv/BUILD.bazel b/pkg/workload/kv/BUILD.bazel index f359ad7a587e..b406825cd5f9 100644 --- a/pkg/workload/kv/BUILD.bazel +++ b/pkg/workload/kv/BUILD.bazel @@ -28,7 +28,10 @@ go_library( go_test( name = "kv_test", srcs = ["kv_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":kv"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/workload/movr/BUILD.bazel b/pkg/workload/movr/BUILD.bazel index 5901e10e42ee..8798a64f8fde 100644 --- a/pkg/workload/movr/BUILD.bazel +++ b/pkg/workload/movr/BUILD.bazel @@ -26,7 +26,10 @@ go_test( name = "movr_test", size = "small", srcs = ["movr_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":movr"], deps = ["@com_github_stretchr_testify//require"], ) diff --git a/pkg/workload/rand/BUILD.bazel b/pkg/workload/rand/BUILD.bazel index f141872f44d9..5defc6290160 100644 --- a/pkg/workload/rand/BUILD.bazel +++ b/pkg/workload/rand/BUILD.bazel @@ -26,7 +26,10 @@ go_test( name = "rand_test", size = "small", srcs = ["rand_test.go"], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":rand"], deps = [ "//pkg/base", diff --git a/pkg/workload/tpcc/BUILD.bazel b/pkg/workload/tpcc/BUILD.bazel index 76044879a329..bdc7a7e6004b 100644 --- a/pkg/workload/tpcc/BUILD.bazel +++ b/pkg/workload/tpcc/BUILD.bazel @@ -54,7 +54,10 @@ go_test( "result_test.go", "stats_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":tpcc"], deps = [ "//pkg/testutils", diff --git a/pkg/workload/tpch/BUILD.bazel b/pkg/workload/tpch/BUILD.bazel index 8e681722a0c5..64eef34c17bb 100644 --- a/pkg/workload/tpch/BUILD.bazel +++ b/pkg/workload/tpch/BUILD.bazel @@ -32,7 +32,10 @@ go_library( go_test( name = "tpch_test", srcs = ["random_test.go"], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":tpch"], deps = [ "//pkg/util/bufalloc", diff --git a/pkg/workload/workloadimpl/BUILD.bazel b/pkg/workload/workloadimpl/BUILD.bazel index 4d5e00783fb3..6f5f261978a1 100644 --- a/pkg/workload/workloadimpl/BUILD.bazel +++ b/pkg/workload/workloadimpl/BUILD.bazel @@ -20,7 +20,10 @@ go_test( "precomputedrand_test.go", "random_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), deps = [ ":workloadimpl", "//pkg/util/timeutil", diff --git a/pkg/workload/workloadsql/BUILD.bazel b/pkg/workload/workloadsql/BUILD.bazel index a36c7f1eda9e..7f7dc45bea3a 100644 --- a/pkg/workload/workloadsql/BUILD.bazel +++ b/pkg/workload/workloadsql/BUILD.bazel @@ -32,7 +32,10 @@ go_test( "sliceslice_test.go", "workloadsql_test.go", ], - args = ["-test.timeout=55s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=55s"], + "//conditions:default": ["-test.timeout=55s"], + }), embed = [":workloadsql"], deps = [ "//pkg/base", diff --git a/pkg/workload/ycsb/BUILD.bazel b/pkg/workload/ycsb/BUILD.bazel index e43fba4f7495..e84403f1ec70 100644 --- a/pkg/workload/ycsb/BUILD.bazel +++ b/pkg/workload/ycsb/BUILD.bazel @@ -38,7 +38,10 @@ go_test( "main_test.go", "zipfgenerator_test.go", ], - args = ["-test.timeout=295s"], + args = select({ + "//pkg:use_ci_timeouts": ["-test.timeout=295s"], + "//conditions:default": ["-test.timeout=295s"], + }), embed = [":ycsb"], shard_count = 16, deps = [