diff --git a/pkg/ccl/kvccl/kvtenantccl/tenant_upgrade_test.go b/pkg/ccl/kvccl/kvtenantccl/tenant_upgrade_test.go index ba272c146d2d..b7b5eaaf214c 100644 --- a/pkg/ccl/kvccl/kvtenantccl/tenant_upgrade_test.go +++ b/pkg/ccl/kvccl/kvtenantccl/tenant_upgrade_test.go @@ -403,6 +403,7 @@ func TestTenantUpgradeFailure(t *testing.T) { // is too low. func TestTenantUpgradeInterlock(t *testing.T) { defer leaktest.AfterTest(t)() + skip.WithIssue(t, 98987) // Times out under stress race skip.UnderStressRace(t) // Test takes 30s to run diff --git a/pkg/ccl/multiregionccl/datadriven_test.go b/pkg/ccl/multiregionccl/datadriven_test.go index 9e2f8532a54e..3a1c80074801 100644 --- a/pkg/ccl/multiregionccl/datadriven_test.go +++ b/pkg/ccl/multiregionccl/datadriven_test.go @@ -131,6 +131,11 @@ func TestMultiRegionDataDriven(t *testing.T) { var recCh chan tracingpb.Recording datadriven.RunTest(t, path, func(t *testing.T, d *datadriven.TestData) string { switch d.Cmd { + case "skip": + var issue int + d.ScanArgs(t, "issue-num", &issue) + skip.WithIssue(t, issue) + return "" case "sleep-for-follower-read": time.Sleep(time.Second) case "new-cluster": diff --git a/pkg/ccl/multiregionccl/testdata/regional_by_table b/pkg/ccl/multiregionccl/testdata/regional_by_table index 5ca7e3631be2..c4a9df370f47 100644 --- a/pkg/ccl/multiregionccl/testdata/regional_by_table +++ b/pkg/ccl/multiregionccl/testdata/regional_by_table @@ -1,3 +1,6 @@ +skip issue-num=98020 +---- + new-cluster localities=us-east-1,us-east-1,us-east-1,us-west-1,us-west-1,us-west-1,us-central-1,eu-central-1,eu-west-1 ---- diff --git a/pkg/ccl/multiregionccl/testdata/secondary_region b/pkg/ccl/multiregionccl/testdata/secondary_region index 9fb454dab0cb..16a3c9fc94da 100644 --- a/pkg/ccl/multiregionccl/testdata/secondary_region +++ b/pkg/ccl/multiregionccl/testdata/secondary_region @@ -1,3 +1,6 @@ +skip issue-num=98020 +---- + new-cluster localities=us-east-1,us-east-1,us-west-1,us-west-1,us-central-1,us-central-1,us-central-1,eu-west-1,eu-west-1,eu-west-1 ---- diff --git a/pkg/cmd/roachtest/tests/versionupgrade.go b/pkg/cmd/roachtest/tests/versionupgrade.go index d4321e007aeb..de2667af10b8 100644 --- a/pkg/cmd/roachtest/tests/versionupgrade.go +++ b/pkg/cmd/roachtest/tests/versionupgrade.go @@ -134,6 +134,10 @@ func runVersionUpgrade(ctx context.Context, t test.Test, c cluster.Cluster) { mvt.InMixedVersion( "test schema change step", func(ctx context.Context, l *logger.Logger, rng *rand.Rand, h *mixedversion.Helper) error { + if c.IsLocal() { + l.Printf("skipping step in bors builds while failures are handled -- #99115") + return nil + } l.Printf("running schema workload step") runCmd := roachtestutil.NewCommand("./workload run schemachange").Flag("verbose", 1).Flag("max-ops", 10).Flag("concurrency", 2).Arg("{pgurl:1-%d}", len(c.All())) randomNode := h.RandomNode(rng, c.All()) diff --git a/pkg/kv/kvserver/client_replica_test.go b/pkg/kv/kvserver/client_replica_test.go index 98fd7f39d304..8bb5f860d9da 100644 --- a/pkg/kv/kvserver/client_replica_test.go +++ b/pkg/kv/kvserver/client_replica_test.go @@ -2686,6 +2686,8 @@ func TestSystemZoneConfigs(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) + skip.WithIssue(t, 98905) + // This test is relatively slow and resource intensive. When run under // stressrace on a loaded machine (as in the nightly tests), sometimes the // SucceedsSoon conditions below take longer than the allotted time (#25273). diff --git a/pkg/upgrade/upgrades/schema_changes_external_test.go b/pkg/upgrade/upgrades/schema_changes_external_test.go index b98303aa6600..85c2ce76b5a6 100644 --- a/pkg/upgrade/upgrades/schema_changes_external_test.go +++ b/pkg/upgrade/upgrades/schema_changes_external_test.go @@ -69,6 +69,7 @@ type schemaChangeTestCase struct { // exponential backoff to the system.jobs table, but was retrofitted to prevent // regressions. func TestMigrationWithFailures(t *testing.T) { + skip.WithIssue(t, 98564) const createTableBefore = ` CREATE TABLE test.test_table ( id INT8 DEFAULT unique_rowid() PRIMARY KEY, @@ -173,6 +174,8 @@ CREATE TABLE test.test_table ( // alters a column in a table multiple times with failures at different stages // of the migration. func TestMigrationWithFailuresMultipleAltersOnSameColumn(t *testing.T) { + skip.WithIssue(t, 98991) + const createTableBefore = ` CREATE TABLE test.test_table ( username STRING NOT NULL