From 6952e094326cf6092d12127ac1df48cb57de0d15 Mon Sep 17 00:00:00 2001 From: Raphael 'kena' Poss Date: Thu, 14 Sep 2023 23:29:02 +0200 Subject: [PATCH] wip: use tenants always, force list all failures This commit will be removed before the PR is merged. Release note: None --- build/teamcity/cockroach/ci/tests/unit_tests_ccl_impl.sh | 2 +- build/teamcity/cockroach/ci/tests/unit_tests_impl.sh | 2 +- pkg/testutils/serverutils/test_server_shim.go | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) 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 8b80cbdd7a32..9b29c517e892 100755 --- a/build/teamcity/cockroach/ci/tests/unit_tests_ccl_impl.sh +++ b/build/teamcity/cockroach/ci/tests/unit_tests_ccl_impl.sh @@ -17,4 +17,4 @@ fi $(bazel info bazel-bin --config=ci)/pkg/cmd/bazci/bazci_/bazci -- test --config=ci --config=use_ci_timeouts -c fastbuild \ //pkg:ccl_tests \ - --profile=/artifacts/profile.gz $EXTRA_PARAMS + --profile=/artifacts/profile.gz -k $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 7e80cb3d1ce8..f288884251f6 100755 --- a/build/teamcity/cockroach/ci/tests/unit_tests_impl.sh +++ b/build/teamcity/cockroach/ci/tests/unit_tests_impl.sh @@ -17,4 +17,4 @@ fi $(bazel info bazel-bin --config=ci)/pkg/cmd/bazci/bazci_/bazci -- test --config=ci --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 + --profile=/artifacts/profile.gz -k $EXTRA_PARAMS diff --git a/pkg/testutils/serverutils/test_server_shim.go b/pkg/testutils/serverutils/test_server_shim.go index acb4119ca460..d6abf7e1d76a 100644 --- a/pkg/testutils/serverutils/test_server_shim.go +++ b/pkg/testutils/serverutils/test_server_shim.go @@ -116,10 +116,12 @@ func ShouldStartDefaultTestTenant( return override } + const alwaysEnabled = true + // Note: we ask the metamorphic framework for a "disable" value, instead // of an "enable" value, because it probabilistically returns its default value // more often than not and that is what we want. - enabled := !util.ConstantWithMetamorphicTestBoolWithoutLogging("disable-test-tenant", false) + enabled := alwaysEnabled || !util.ConstantWithMetamorphicTestBoolWithoutLogging("disable-test-tenant", false) if enabled && t != nil { t.Log(defaultTestTenantMessage) }