Merge #37011

37011: roachtest: skip crdb/{crdb,sink}-chaos on 2.1 and 19.1 r=tbg a=danhhz They're known to be flaky until #36852 gets backported but that won't happen for another week. Release note: None Co-authored-by: Daniel Harrison <daniel.harrison@gmail.com>
cockroachdb · Apr 23, 2019 · 43c3cf3 · 43c3cf3
2 parents b215057 + bd9bf4d
commit 43c3cf3
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/pkg/cmd/roachtest/cdc.go b/pkg/cmd/roachtest/cdc.go
@@ -512,8 +512,10 @@ func registerCDC(r *registry) {
 		},
 	})
 	r.Add(testSpec{
-		Name:       fmt.Sprintf("cdc/sink-chaos/rangefeed=%t", useRangeFeed),
-		MinVersion: "v2.1.0",
+		Name: fmt.Sprintf("cdc/sink-chaos/rangefeed=%t", useRangeFeed),
+		// TODO(dan): Re-enable this test on 2.1 and 19.1 once #36852 is backported.
+		// MinVersion: "v2.1.0",
+		MinVersion: "v19.2.0",
 		Cluster:    makeClusterSpec(4, cpu(16)),
 		Run: func(ctx context.Context, t *test, c *cluster) {
 			cdcBasicTest(ctx, t, c, cdcTestArgs{
@@ -528,8 +530,10 @@ func registerCDC(r *registry) {
 		},
 	})
 	r.Add(testSpec{
-		Name:       fmt.Sprintf("cdc/crdb-chaos/rangefeed=%t", useRangeFeed),
-		MinVersion: "v2.1.0",
+		Name: fmt.Sprintf("cdc/crdb-chaos/rangefeed=%t", useRangeFeed),
+		// TODO(dan): Re-enable this test on 2.1 and 19.1 once #36852 is backported.
+		// MinVersion: "v2.1.0",
+		MinVersion: "v19.2.0",
 		Cluster:    makeClusterSpec(4, cpu(16)),
 		Run: func(ctx context.Context, t *test, c *cluster) {
 			cdcBasicTest(ctx, t, c, cdcTestArgs{