roachtest: make roachtest recognize 21.1

pkg/cmd/roachtest/activerecord_blocklist.go

@@ -13,6 +13,7 @@ package main
 var activeRecordBlocklists = blocklistsForVersion{
 	{"v20.1", "activeRecordBlockList20_1", activeRecordBlockList20_1, "activeRecordIgnoreList20_1", activeRecordIgnoreList20_1},
 	{"v20.2", "activeRecordBlockList20_2", activeRecordBlockList20_2, "activeRecordIgnoreList20_2", activeRecordIgnoreList20_2},
+	{"v21.1", "activeRecordBlockList21_1", activeRecordBlockList21_1, "activeRecordIgnoreList21_1", activeRecordIgnoreList21_1},
 }
 
 // These are lists of known activerecord test errors and failures.
@@ -26,10 +27,16 @@ var activeRecordBlocklists = blocklistsForVersion{
 // Please keep these lists alphabetized for easy diffing.
 // After a failed run, an updated version of this blocklist should be available
 // in the test log.
+var activeRecordBlockList21_1 = blocklist{}
+
 var activeRecordBlockList20_2 = blocklist{}
 
 var activeRecordBlockList20_1 = blocklist{}
 
+var activeRecordIgnoreList21_1 = blocklist{
+	"FixturesTest#test_create_fixtures": "flaky - FK constraint violated sometimes when loading all fixture data",
+}
+
 var activeRecordIgnoreList20_2 = blocklist{
 	"FixturesTest#test_create_fixtures": "flaky - FK constraint violated sometimes when loading all fixture data",
 }

pkg/cmd/roachtest/django_blocklist.go

@@ -164,15 +164,20 @@ var enabledDjangoTests = []string{
 var djangoBlocklists = blocklistsForVersion{
 	{"v20.1", "djangoBlocklist20_1", djangoBlocklist20_1, "djangoIgnoreList20_1", djangoIgnoreList20_1},
 	{"v20.2", "djangoBlocklist20_2", djangoBlocklist20_2, "djangoIgnoreList20_2", djangoIgnoreList20_2},
+	{"v21.1", "djangoBlocklist21_1", djangoBlocklist21_1, "djangoIgnoreList21_1", djangoIgnoreList21_1},
 }
 
 // Maintain that this list is alphabetized.
+var djangoBlocklist21_1 = blocklist{}
+
 var djangoBlocklist20_2 = blocklist{}
 
 var djangoBlocklist20_1 = blocklist{
 	"inspectdb.tests.InspectDBTestCase.test_json_field": "unknown",
 }
 
+var djangoIgnoreList21_1 = djangoIgnoreList20_2
+
 var djangoIgnoreList20_2 = djangoIgnoreList20_1
 
 var djangoIgnoreList20_1 = blocklist{

pkg/cmd/roachtest/gopg_blocklist.go

@@ -14,6 +14,7 @@ var gopgBlocklists = blocklistsForVersion{
 	{"v19.2", "gopgBlockList19_2", gopgBlockList19_2, "gopgIgnoreList19_2", gopgIgnoreList19_2},
 	{"v20.1", "gopgBlockList20_1", gopgBlockList20_1, "gopgIgnoreList20_1", gopgIgnoreList20_1},
 	{"v20.2", "gopgBlockList20_2", gopgBlockList20_2, "gopgIgnoreList20_2", gopgIgnoreList20_2},
+	{"v21.1", "gopgBlockList21_1", gopgBlockList21_1, "gopgIgnoreList21_1", gopgIgnoreList21_1},
 }
 
 // These are lists of known gopg test errors and failures.
@@ -25,6 +26,8 @@ var gopgBlocklists = blocklistsForVersion{
 // After a failed run, an updated version of this blocklist should be available
 // in the test log.
 
+var gopgBlockList21_1 = gopgBlockList20_2
+
 var gopgBlockList20_2 = gopgBlockList20_1
 
 var gopgBlockList20_1 = blocklist{
@@ -107,6 +110,8 @@ var gopgBlockList19_2 = blocklist{
 	"v10.TestUnixSocket":      "31113",
 }
 
+var gopgIgnoreList21_1 = gopgIgnoreList20_2
+
 var gopgIgnoreList20_2 = gopgIgnoreList20_1
 
 var gopgIgnoreList20_1 = gopgIgnoreList19_2

pkg/cmd/roachtest/hibernate_blocklist.go

@@ -18,11 +18,14 @@ var hibernateBlocklists = blocklistsForVersion{
 	{"v19.2", "hibernateBlockList19_2", hibernateBlockList19_2, "", nil},
 	{"v20.1", "hibernateBlockList20_1", hibernateBlockList20_1, "", nil},
 	{"v20.2", "hibernateBlockList20_2", hibernateBlockList20_2, "", nil},
+	{"v21.1", "hibernateBlockList21_1", hibernateBlockList21_1, "", nil},
 }
 
 // Please keep these lists alphabetized for easy diffing.
 // After a failed run, an updated version of this blocklist should be available
 // in the test log.
+var hibernateBlockList21_1 = blocklist{}
+
 var hibernateBlockList20_2 = blocklist{}
 
 var hibernateBlockList20_1 = blocklist{

pkg/cmd/roachtest/libpq_blocklist.go

@@ -14,8 +14,11 @@ var libPQBlocklists = blocklistsForVersion{
 	{"v19.2", "libPQBlocklist19_2", libPQBlocklist19_2, "libPQIgnorelist19_2", libPQIgnorelist19_2},
 	{"v20.1", "libPQBlocklist20_1", libPQBlocklist20_1, "libPQIgnorelist20_1", libPQIgnorelist20_1},
 	{"v20.2", "libPQBlocklist20_2", libPQBlocklist20_2, "libPQIgnorelist20_2", libPQIgnorelist20_2},
+	{"v21.1", "libPQBlocklist21_1", libPQBlocklist21_1, "libPQIgnorelist21_1", libPQIgnorelist21_1},
 }
 
+var libPQBlocklist21_1 = libPQBlocklist20_2
+
 var libPQBlocklist20_2 = blocklist{
 	"pq.ExampleConnectorWithNoticeHandler":           "unknown",
 	"pq.TestBinaryByteSliceToInt":                    "41547",
@@ -169,6 +172,8 @@ var libPQBlocklist19_2 = blocklist{
 	"pq.TestTimestampWithTimeZone":                                        "41565",
 }
 
+var libPQIgnorelist21_1 = libPQIgnorelist20_2
+
 var libPQIgnorelist20_2 = libPQIgnorelist20_1
 
 var libPQIgnorelist20_1 = libPQIgnorelist19_2

pkg/cmd/roachtest/pgjdbc_blocklist.go

@@ -17,11 +17,14 @@ var pgjdbcBlocklists = blocklistsForVersion{
 	{"v19.2", "pgjdbcBlockList19_2", pgjdbcBlockList19_2, "pgjdbcIgnoreList19_2", pgjdbcIgnoreList19_2},
 	{"v20.1", "pgjdbcBlockList20_1", pgjdbcBlockList20_1, "pgjdbcIgnoreList20_1", pgjdbcIgnoreList20_1},
 	{"v20.2", "pgjdbcBlockList20_2", pgjdbcBlockList20_2, "pgjdbcIgnoreList20_2", pgjdbcIgnoreList20_2},
+	{"v21.1", "pgjdbcBlockList21_1", pgjdbcBlockList21_1, "pgjdbcIgnoreList21_1", pgjdbcIgnoreList21_1},
 }
 
 // Please keep these lists alphabetized for easy diffing.
 // After a failed run, an updated version of this blocklist should be available
 // in the test log.
+var pgjdbcBlockList21_1 = pgjdbcBlockList20_2
+
 var pgjdbcBlockList20_2 = blocklist{
 	"org.postgresql.jdbc.DeepBatchedInsertStatementTest.testDeepInternalsBatchedQueryDecorator": "26508",
 	"org.postgresql.jdbc.DeepBatchedInsertStatementTest.testUnspecifiedParameterType":           "26508",
@@ -6324,6 +6327,8 @@ var pgjdbcBlockList2_1 = blocklist{
 	"org.postgresql.test.xa.XADataSourceTest.testWrapperEquals":                                                                                                                "22329",
 }
 
+var pgjdbcIgnoreList21_1 = pgjdbcIgnoreList20_2
+
 var pgjdbcIgnoreList20_2 = pgjdbcIgnoreList20_1
 
 var pgjdbcIgnoreList20_1 = pgjdbcIgnoreList19_2

pkg/cmd/roachtest/pgx_blocklist.go

@@ -14,11 +14,14 @@ var pgxBlocklists = blocklistsForVersion{
 	{"v19.2", "pgxBlocklist19_2", pgxBlocklist19_2, "pgxIgnorelist19_2", pgxIgnorelist19_2},
 	{"v20.1", "pgxBlocklist20_1", pgxBlocklist20_1, "pgxIgnorelist20_1", pgxIgnorelist20_1},
 	{"v20.2", "pgxBlocklist20_2", pgxBlocklist20_2, "pgxIgnorelist20_2", pgxIgnorelist20_2},
+	{"v21.1", "pgxBlocklist21_1", pgxBlocklist21_1, "pgxIgnorelist21_1", pgxIgnorelist21_1},
 }
 
 // Please keep these lists alphabetized for easy diffing.
 // After a failed run, an updated version of this blocklist should be available
 // in the test log.
+var pgxBlocklist21_1 = pgxBlocklist20_2
+
 var pgxBlocklist20_2 = blocklist{
 	"v4.Example_CustomType":                                        "27796",
 	"v4.TestConnBeginBatchDeferredError":                           "31632",
@@ -157,6 +160,8 @@ var pgxBlocklist19_2 = blocklist{
 	"v4.TestUnregisteredTypeUsableAsStringArgumentAndBaseResult":              "27796",
 }
 
+var pgxIgnorelist21_1 = pgxIgnorelist20_2
+
 var pgxIgnorelist20_2 = pgxIgnorelist20_1
 
 var pgxIgnorelist20_1 = blocklist{

pkg/cmd/roachtest/psycopg_blocklist.go

@@ -14,6 +14,7 @@ var psycopgBlocklists = blocklistsForVersion{
 	{"v19.2", "psycopgBlockList19_2", psycopgBlockList19_2, "psycopgIgnoreList19_2", psycopgIgnoreList19_2},
 	{"v20.1", "psycopgBlockList20_1", psycopgBlockList20_1, "psycopgIgnoreList20_1", psycopgIgnoreList20_1},
 	{"v20.2", "psycopgBlockList20_2", psycopgBlockList20_2, "psycopgIgnoreList20_2", psycopgIgnoreList20_2},
+	{"v21.1", "psycopgBlockList21_1", psycopgBlockList21_1, "psycopgIgnoreList21_1", psycopgIgnoreList21_1},
 }
 
 // These are lists of known psycopg test errors and failures.
@@ -27,6 +28,10 @@ var psycopgBlocklists = blocklistsForVersion{
 // Please keep these lists alphabetized for easy diffing.
 // After a failed run, an updated version of this blocklist should be available
 // in the test log.
+var psycopgBlockList21_1 = blocklist{
+	"tests.test_async_keyword.CancelTests.test_async_cancel": "41335",
+}
+
 var psycopgBlockList20_2 = blocklist{
 	"tests.test_async_keyword.CancelTests.test_async_cancel": "41335",
 }
@@ -140,6 +145,8 @@ var psycopgBlockList19_2 = blocklist{
 	"tests.test_types_basic.TypesBasicTests.testEmptyArray":                                                  "23299",
 }
 
+var psycopgIgnoreList21_1 = psycopgIgnoreList20_2
+
 var psycopgIgnoreList20_2 = psycopgIgnoreList20_1
 
 var psycopgIgnoreList20_1 = psycopgIgnoreList19_2

pkg/cmd/roachtest/sqlalchemy_blocklist.go

@@ -16,8 +16,11 @@ var sqlAlchemyBlocklists = blocklistsForVersion{
 	{"v19.2", "sqlAlchemyBlocklist", sqlAlchemyBlocklist, "sqlAlchemyIgnoreList", sqlAlchemyIgnoreList},
 	{"v20.1", "sqlAlchemyBlocklist20_1", sqlAlchemyBlocklist20_1, "sqlAlchemyIgnoreList20_1", sqlAlchemyIgnoreList20_1},
 	{"v20.2", "sqlAlchemyBlocklist20_2", sqlAlchemyBlocklist20_2, "sqlAlchemyIgnoreList20_2", sqlAlchemyIgnoreList20_2},
+	{"v21.1", "sqlAlchemyBlocklist21_1", sqlAlchemyBlocklist21_1, "sqlAlchemyIgnoreList21_1", sqlAlchemyIgnoreList21_1},
 }
 
+var sqlAlchemyBlocklist21_1 = blocklist{}
+
 var sqlAlchemyBlocklist20_2 = blocklist{}
 
 var sqlAlchemyBlocklist20_1 = blocklist{
@@ -28,6 +31,8 @@ var sqlAlchemyBlocklist = blocklist{
 	"test/dialect/test_suite.py::ExpandingBoundInTest_cockroachdb+psycopg2_9_5_0::test_null_in_empty_set_is_false": "41596",
 }
 
+var sqlAlchemyIgnoreList21_1 = sqlAlchemyIgnoreList
+
 var sqlAlchemyIgnoreList20_2 = sqlAlchemyIgnoreList
 
 var sqlAlchemyIgnoreList20_1 = sqlAlchemyIgnoreList

pkg/cmd/roachtest/tpchvec.go

@@ -36,16 +36,20 @@ const (
 	tpchVecVersion19_2 crdbVersion = iota
 	tpchVecVersion20_1
 	tpchVecVersion20_2
+	tpchVecVersion21_1
 )
 
 func toCRDBVersion(v string) (crdbVersion, error) {
-	if strings.HasPrefix(v, "v19.2") {
+	switch {
+	case strings.HasPrefix(v, "v19.2"):
 		return tpchVecVersion19_2, nil
-	} else if strings.HasPrefix(v, "v20.1") {
+	case strings.HasPrefix(v, "v20.1"):
 		return tpchVecVersion20_1, nil
-	} else if strings.HasPrefix(v, "v20.2") {
+	case strings.HasPrefix(v, "v20.2"):
 		return tpchVecVersion20_2, nil
-	} else {
+	case strings.HasPrefix(v, "v21.1"):
+		return tpchVecVersion21_1, nil
+	default:
 		return 0, errors.Errorf("unrecognized version: %s", v)
 	}
 }