From d59fa1cd0005d068d0fd4d7a431c558986ee87cc Mon Sep 17 00:00:00 2001
From: Adam Storm <storm@cockroachlabs.com>
Date: Tue, 17 Oct 2023 10:02:30 -0400
Subject: [PATCH] upgrade: Increase timeout for TestTenantAutoUpgrade under
 stress

Test times out under stress. With updated timeout it now passes on a local
repro.

Fixes: #112158

Release note: None
---
 pkg/ccl/kvccl/kvtenantccl/upgradeccl/tenant_upgrade_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/ccl/kvccl/kvtenantccl/upgradeccl/tenant_upgrade_test.go b/pkg/ccl/kvccl/kvtenantccl/upgradeccl/tenant_upgrade_test.go
index 5ee719c93ca5..ceb89c53cd9b 100644
--- a/pkg/ccl/kvccl/kvtenantccl/upgradeccl/tenant_upgrade_test.go
+++ b/pkg/ccl/kvccl/kvtenantccl/upgradeccl/tenant_upgrade_test.go
@@ -233,7 +233,7 @@ func TestTenantAutoUpgrade(t *testing.T) {
 		UpgradeTo roachpb.Version
 	}
 	succeedsSoon := 20 * time.Second
-	if util.RaceEnabled {
+	if util.RaceEnabled || skip.Stress() {
 		succeedsSoon = 60 * time.Second
 	}
 	// Wait for auto upgrade status to be received by the testing knob.