From dadda8f6fe56ddbf9e8acc9da0cb2dfca67b1a16 Mon Sep 17 00:00:00 2001
From: David Taylor <tinystatemachine@gmail.com>
Date: Thu, 8 Sep 2022 05:11:16 +0000
Subject: [PATCH] upgrades: skip TestRoleIDMigration15000Users under race

It consistently times out under race.

Release note: none.
---
 pkg/upgrade/upgrades/role_id_migration_test.go      | 1 +
 pkg/upgrade/upgrades/role_options_migration_test.go | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkg/upgrade/upgrades/role_id_migration_test.go b/pkg/upgrade/upgrades/role_id_migration_test.go
index c6f2e81fa857..c747fce47a9b 100644
--- a/pkg/upgrade/upgrades/role_id_migration_test.go
+++ b/pkg/upgrade/upgrades/role_id_migration_test.go
@@ -205,6 +205,7 @@ func TestRoleIDMigration100User(t *testing.T) {
 
 func TestRoleIDMigration15000Users(t *testing.T) {
 	skip.UnderStress(t)
+	skip.UnderRace(t)
 	// 15000 is 1.5x the batch size used in the migration.
 	runTestRoleIDMigration(t, 15000)
 }
diff --git a/pkg/upgrade/upgrades/role_options_migration_test.go b/pkg/upgrade/upgrades/role_options_migration_test.go
index 2c05d62d51b8..458c0613f1b0 100644
--- a/pkg/upgrade/upgrades/role_options_migration_test.go
+++ b/pkg/upgrade/upgrades/role_options_migration_test.go
@@ -214,6 +214,7 @@ func TestRoleOptionsMigration100User(t *testing.T) {
 
 func TestRoleOptionsMigration15000User(t *testing.T) {
 	skip.UnderStress(t)
+	skip.UnderRace(t)
 	runTestRoleOptionsMigration(t, 15000)
 }