Commit a9f35f57 authored by Raphael 'kena' Poss's avatar Raphael 'kena' Poss

roachtest: make roachtest aware of 20.1 and the 20.2 tag

Release note: None
parent ea00c03d
...@@ -168,9 +168,12 @@ var enabledDjangoTests = []string{ ...@@ -168,9 +168,12 @@ var enabledDjangoTests = []string{
var djangoBlacklists = blacklistsForVersion{ var djangoBlacklists = blacklistsForVersion{
{"v19.2", "djangoBlacklist19_2", djangoBlacklist19_2, "djangoIgnoreList19_2", djangoIgnoreList19_2}, {"v19.2", "djangoBlacklist19_2", djangoBlacklist19_2, "djangoIgnoreList19_2", djangoIgnoreList19_2},
{"v20.1", "djangoBlacklist20_1", djangoBlacklist20_1, "djangoIgnoreList20_1", djangoIgnoreList20_1}, {"v20.1", "djangoBlacklist20_1", djangoBlacklist20_1, "djangoIgnoreList20_1", djangoIgnoreList20_1},
{"v20.2", "djangoBlacklist20_2", djangoBlacklist20_2, "djangoIgnoreList20_2", djangoIgnoreList20_2},
} }
// Maintain that this list is alphabetized. // Maintain that this list is alphabetized.
var djangoBlacklist20_2 = blacklist{}
var djangoBlacklist20_1 = blacklist{} var djangoBlacklist20_1 = blacklist{}
var djangoBlacklist19_2 = blacklist{ var djangoBlacklist19_2 = blacklist{
...@@ -215,6 +218,8 @@ var djangoBlacklist19_2 = blacklist{ ...@@ -215,6 +218,8 @@ var djangoBlacklist19_2 = blacklist{
//"postgres_tests.test_array.TestOtherTypesExactQuerying.test_exact_decimals": "23468", //"postgres_tests.test_array.TestOtherTypesExactQuerying.test_exact_decimals": "23468",
} }
var djangoIgnoreList20_2 = blacklist{}
var djangoIgnoreList20_1 = blacklist{} var djangoIgnoreList20_1 = blacklist{}
var djangoIgnoreList19_2 = blacklist{} var djangoIgnoreList19_2 = blacklist{}
...@@ -13,6 +13,7 @@ package main ...@@ -13,6 +13,7 @@ package main
var gopgBlacklists = blacklistsForVersion{ var gopgBlacklists = blacklistsForVersion{
{"v19.2", "gopgBlackList19_2", gopgBlackList19_2, "gopgIgnoreList19_2", gopgIgnoreList19_2}, {"v19.2", "gopgBlackList19_2", gopgBlackList19_2, "gopgIgnoreList19_2", gopgIgnoreList19_2},
{"v20.1", "gopgBlackList20_1", gopgBlackList20_1, "gopgIgnoreList20_1", gopgIgnoreList20_1}, {"v20.1", "gopgBlackList20_1", gopgBlackList20_1, "gopgIgnoreList20_1", gopgIgnoreList20_1},
{"v20.2", "gopgBlackList20_2", gopgBlackList20_2, "gopgIgnoreList20_2", gopgIgnoreList20_2},
} }
// These are lists of known gopg test errors and failures. // These are lists of known gopg test errors and failures.
...@@ -24,6 +25,8 @@ var gopgBlacklists = blacklistsForVersion{ ...@@ -24,6 +25,8 @@ var gopgBlacklists = blacklistsForVersion{
// After a failed run, an updated version of this blacklist should be available // After a failed run, an updated version of this blacklist should be available
// in the test log. // in the test log.
var gopgBlackList20_2 = gopgBlackList20_1
var gopgBlackList20_1 = blacklist{ var gopgBlackList20_1 = blacklist{
"pg | CopyFrom/CopyTo | copies corrupted data to a table": "41608", "pg | CopyFrom/CopyTo | copies corrupted data to a table": "41608",
"pg | CopyFrom/CopyTo | copies data from a table and to a table": "41608", "pg | CopyFrom/CopyTo | copies data from a table and to a table": "41608",
...@@ -90,6 +93,8 @@ var gopgBlackList19_2 = blacklist{ ...@@ -90,6 +93,8 @@ var gopgBlackList19_2 = blacklist{
"v9.TestUnixSocket": "31113", "v9.TestUnixSocket": "31113",
} }
var gopgIgnoreList20_2 = gopgIgnoreList20_1
var gopgIgnoreList20_1 = gopgIgnoreList19_2 var gopgIgnoreList20_1 = gopgIgnoreList19_2
var gopgIgnoreList19_2 = blacklist{ var gopgIgnoreList19_2 = blacklist{
......
...@@ -17,11 +17,14 @@ var hibernateBlacklists = blacklistsForVersion{ ...@@ -17,11 +17,14 @@ var hibernateBlacklists = blacklistsForVersion{
{"v19.1", "hibernateBlackList19_1", hibernateBlackList19_1, "", nil}, {"v19.1", "hibernateBlackList19_1", hibernateBlackList19_1, "", nil},
{"v19.2", "hibernateBlackList19_2", hibernateBlackList19_2, "", nil}, {"v19.2", "hibernateBlackList19_2", hibernateBlackList19_2, "", nil},
{"v20.1", "hibernateBlackList20_1", hibernateBlackList20_1, "", nil}, {"v20.1", "hibernateBlackList20_1", hibernateBlackList20_1, "", nil},
{"v20.2", "hibernateBlackList20_2", hibernateBlackList20_2, "", nil},
} }
// Please keep these lists alphabetized for easy diffing. // Please keep these lists alphabetized for easy diffing.
// After a failed run, an updated version of this blacklist should be available // After a failed run, an updated version of this blacklist should be available
// in the test log. // in the test log.
var hibernateBlackList20_2 = blacklist{}
var hibernateBlackList20_1 = blacklist{} var hibernateBlackList20_1 = blacklist{}
var hibernateBlackList19_2 = blacklist{} var hibernateBlackList19_2 = blacklist{}
......
...@@ -13,8 +13,11 @@ package main ...@@ -13,8 +13,11 @@ package main
var libPQBlacklists = blacklistsForVersion{ var libPQBlacklists = blacklistsForVersion{
{"v19.2", "libPQBlacklist19_2", libPQBlacklist19_2, "libPQIgnorelist19_2", libPQIgnorelist19_2}, {"v19.2", "libPQBlacklist19_2", libPQBlacklist19_2, "libPQIgnorelist19_2", libPQIgnorelist19_2},
{"v20.1", "libPQBlacklist20_1", libPQBlacklist20_1, "libPQIgnorelist20_1", libPQIgnorelist20_1}, {"v20.1", "libPQBlacklist20_1", libPQBlacklist20_1, "libPQIgnorelist20_1", libPQIgnorelist20_1},
{"v20.2", "libPQBlacklist20_2", libPQBlacklist20_2, "libPQIgnorelist20_2", libPQIgnorelist20_2},
} }
var libPQBlacklist20_2 = libPQBlacklist20_1
var libPQBlacklist20_1 = blacklist{ var libPQBlacklist20_1 = blacklist{
"pq.TestBinaryByteSliceToInt": "41547", "pq.TestBinaryByteSliceToInt": "41547",
"pq.TestBinaryByteSlicetoUUID": "41547", "pq.TestBinaryByteSlicetoUUID": "41547",
...@@ -98,6 +101,8 @@ var libPQBlacklist19_2 = blacklist{ ...@@ -98,6 +101,8 @@ var libPQBlacklist19_2 = blacklist{
"pq.TestTimestampWithTimeZone": "41565", "pq.TestTimestampWithTimeZone": "41565",
} }
var libPQIgnorelist20_2 = libPQIgnorelist20_1
var libPQIgnorelist20_1 = libPQIgnorelist19_2 var libPQIgnorelist20_1 = libPQIgnorelist19_2
var libPQIgnorelist19_2 = blacklist{ var libPQIgnorelist19_2 = blacklist{
......
...@@ -17,11 +17,14 @@ var pgjdbcBlacklists = blacklistsForVersion{ ...@@ -17,11 +17,14 @@ var pgjdbcBlacklists = blacklistsForVersion{
{"v19.1", "pgjdbcBlackList19_1", pgjdbcBlackList19_1, "", pgjdbcIgnoreList19_1}, {"v19.1", "pgjdbcBlackList19_1", pgjdbcBlackList19_1, "", pgjdbcIgnoreList19_1},
{"v19.2", "pgjdbcBlackList19_2", pgjdbcBlackList19_2, "pgjdbcIgnoreList19_2", pgjdbcIgnoreList19_2}, {"v19.2", "pgjdbcBlackList19_2", pgjdbcBlackList19_2, "pgjdbcIgnoreList19_2", pgjdbcIgnoreList19_2},
{"v20.1", "pgjdbcBlackList20_1", pgjdbcBlackList20_1, "pgjdbcIgnoreList20_1", pgjdbcIgnoreList20_1}, {"v20.1", "pgjdbcBlackList20_1", pgjdbcBlackList20_1, "pgjdbcIgnoreList20_1", pgjdbcIgnoreList20_1},
{"v20.2", "pgjdbcBlackList20_2", pgjdbcBlackList20_2, "pgjdbcIgnoreList20_2", pgjdbcIgnoreList20_2},
} }
// Please keep these lists alphabetized for easy diffing. // Please keep these lists alphabetized for easy diffing.
// After a failed run, an updated version of this blacklist should be available // After a failed run, an updated version of this blacklist should be available
// in the test log. // in the test log.
var pgjdbcBlackList20_2 = pgjdbcBlackList20_1
var pgjdbcBlackList20_1 = blacklist{ var pgjdbcBlackList20_1 = blacklist{
"org.postgresql.jdbc.DeepBatchedInsertStatementTest.testDeepInternalsBatchedQueryDecorator": "26508", "org.postgresql.jdbc.DeepBatchedInsertStatementTest.testDeepInternalsBatchedQueryDecorator": "26508",
"org.postgresql.jdbc.DeepBatchedInsertStatementTest.testUnspecifiedParameterType": "26508", "org.postgresql.jdbc.DeepBatchedInsertStatementTest.testUnspecifiedParameterType": "26508",
...@@ -5617,6 +5620,8 @@ var pgjdbcBlackList2_0 = blacklist{ ...@@ -5617,6 +5620,8 @@ var pgjdbcBlackList2_0 = blacklist{
"org.postgresql.test.jdbc42.GetObject310InfinityTests.test[binary = REGULAR, expr = infinity, pgType = timestamp, klass = class java.time.OffsetDateTime]": "41786", "org.postgresql.test.jdbc42.GetObject310InfinityTests.test[binary = REGULAR, expr = infinity, pgType = timestamp, klass = class java.time.OffsetDateTime]": "41786",
} }
var pgjdbcIgnoreList20_2 = pgjdbcIgnoreList20_1
var pgjdbcIgnoreList20_1 = pgjdbcIgnoreList19_2 var pgjdbcIgnoreList20_1 = pgjdbcIgnoreList19_2
var pgjdbcIgnoreList19_2 = blacklist{ var pgjdbcIgnoreList19_2 = blacklist{
...@@ -13,11 +13,14 @@ package main ...@@ -13,11 +13,14 @@ package main
var pgxBlacklists = blacklistsForVersion{ var pgxBlacklists = blacklistsForVersion{
{"v19.2", "pgxBlacklist19_2", pgxBlacklist19_2, "pgxIgnorelist19_2", pgxIgnorelist19_2}, {"v19.2", "pgxBlacklist19_2", pgxBlacklist19_2, "pgxIgnorelist19_2", pgxIgnorelist19_2},
{"v20.1", "pgxBlacklist20_1", pgxBlacklist20_1, "pgxIgnorelist20_1", pgxIgnorelist20_1}, {"v20.1", "pgxBlacklist20_1", pgxBlacklist20_1, "pgxIgnorelist20_1", pgxIgnorelist20_1},
{"v20.2", "pgxBlacklist20_2", pgxBlacklist20_2, "pgxIgnorelist20_2", pgxIgnorelist20_2},
} }
// Please keep these lists alphabetized for easy diffing. // Please keep these lists alphabetized for easy diffing.
// After a failed run, an updated version of this blacklist should be available // After a failed run, an updated version of this blacklist should be available
// in the test log. // in the test log.
var pgxBlacklist20_2 = pgxBlacklist20_1
var pgxBlacklist20_1 = blacklist{ var pgxBlacklist20_1 = blacklist{
"v4.Example_CustomType": "27796", "v4.Example_CustomType": "27796",
"v4.TestConnBeginBatchDeferredError": "31632", "v4.TestConnBeginBatchDeferredError": "31632",
...@@ -60,6 +63,8 @@ var pgxBlacklist20_1 = blacklist{ ...@@ -60,6 +63,8 @@ var pgxBlacklist20_1 = blacklist{
"v4.TestUnregisteredTypeUsableAsStringArgumentAndBaseResult": "27796", "v4.TestUnregisteredTypeUsableAsStringArgumentAndBaseResult": "27796",
} }
var pgxIgnorelist20_2 = pgxIgnorelist20_1
var pgxIgnorelist20_1 = blacklist{ var pgxIgnorelist20_1 = blacklist{
"v4.TestBeginIsoLevels": "We don't support isolation levels", "v4.TestBeginIsoLevels": "We don't support isolation levels",
"v4.TestQueryEncodeError": "This test checks the exact error message", "v4.TestQueryEncodeError": "This test checks the exact error message",
......
...@@ -15,6 +15,7 @@ var psycopgBlacklists = blacklistsForVersion{ ...@@ -15,6 +15,7 @@ var psycopgBlacklists = blacklistsForVersion{
{"v19.1", "psycopgBlackList19_1", psycopgBlackList19_1, "psycopgIgnoreList19_1", psycopgIgnoreList19_1}, {"v19.1", "psycopgBlackList19_1", psycopgBlackList19_1, "psycopgIgnoreList19_1", psycopgIgnoreList19_1},
{"v19.2", "psycopgBlackList19_2", psycopgBlackList19_2, "psycopgIgnoreList19_2", psycopgIgnoreList19_2}, {"v19.2", "psycopgBlackList19_2", psycopgBlackList19_2, "psycopgIgnoreList19_2", psycopgIgnoreList19_2},
{"v20.1", "psycopgBlackList20_1", psycopgBlackList20_1, "psycopgIgnoreList20_1", psycopgIgnoreList20_1}, {"v20.1", "psycopgBlackList20_1", psycopgBlackList20_1, "psycopgIgnoreList20_1", psycopgIgnoreList20_1},
{"v20.2", "psycopgBlackList20_2", psycopgBlackList20_2, "psycopgIgnoreList20_2", psycopgIgnoreList20_2},
} }
// These are lists of known psycopg test errors and failures. // These are lists of known psycopg test errors and failures.
...@@ -28,6 +29,8 @@ var psycopgBlacklists = blacklistsForVersion{ ...@@ -28,6 +29,8 @@ var psycopgBlacklists = blacklistsForVersion{
// Please keep these lists alphabetized for easy diffing. // Please keep these lists alphabetized for easy diffing.
// After a failed run, an updated version of this blacklist should be available // After a failed run, an updated version of this blacklist should be available
// in the test log. // in the test log.
var psycopgBlackList20_2 = psycopgBlackList20_1
var psycopgBlackList20_1 = blacklist{ var psycopgBlackList20_1 = blacklist{
"tests.test_async.AsyncTests.test_async_callproc": "44701", "tests.test_async.AsyncTests.test_async_callproc": "44701",
"tests.test_async.AsyncTests.test_error": "44706", "tests.test_async.AsyncTests.test_error": "44706",
...@@ -816,6 +819,8 @@ var psycopgBlackList19_1 = blacklist{ ...@@ -816,6 +819,8 @@ var psycopgBlackList19_1 = blacklist{
"tests.test_with.WithCursorTestCase.test_named_with_noop": "30352", "tests.test_with.WithCursorTestCase.test_named_with_noop": "30352",
} }
var psycopgIgnoreList20_2 = psycopgIgnoreList20_1
var psycopgIgnoreList20_1 = psycopgIgnoreList19_2 var psycopgIgnoreList20_1 = psycopgIgnoreList19_2
var psycopgIgnoreList19_2 = psycopgIgnoreList19_1 var psycopgIgnoreList19_2 = psycopgIgnoreList19_1
......
...@@ -15,8 +15,11 @@ var sqlAlchemyBlacklists = blacklistsForVersion{ ...@@ -15,8 +15,11 @@ var sqlAlchemyBlacklists = blacklistsForVersion{
{"v19.1", "sqlAlchemyBlacklist", sqlAlchemyBlacklist, "sqlAlchemyIgnoreList", sqlAlchemyIgnoreList}, {"v19.1", "sqlAlchemyBlacklist", sqlAlchemyBlacklist, "sqlAlchemyIgnoreList", sqlAlchemyIgnoreList},
{"v19.2", "sqlAlchemyBlacklist", sqlAlchemyBlacklist, "sqlAlchemyIgnoreList", sqlAlchemyIgnoreList}, {"v19.2", "sqlAlchemyBlacklist", sqlAlchemyBlacklist, "sqlAlchemyIgnoreList", sqlAlchemyIgnoreList},
{"v20.1", "sqlAlchemyBlacklist20_1", sqlAlchemyBlacklist20_1, "sqlAlchemyIgnoreList20_1", sqlAlchemyIgnoreList20_1}, {"v20.1", "sqlAlchemyBlacklist20_1", sqlAlchemyBlacklist20_1, "sqlAlchemyIgnoreList20_1", sqlAlchemyIgnoreList20_1},
{"v20.2", "sqlAlchemyBlacklist20_2", sqlAlchemyBlacklist20_2, "sqlAlchemyIgnoreList20_2", sqlAlchemyIgnoreList20_2},
} }
var sqlAlchemyBlacklist20_2 = sqlAlchemyBlacklist20_1
var sqlAlchemyBlacklist20_1 = blacklist{ var sqlAlchemyBlacklist20_1 = blacklist{
"test/dialect/test_suite.py::ComponentReflectionTest_cockroachdb+psycopg2_9_5_0::test_autoincrement_col": "5807", "test/dialect/test_suite.py::ComponentReflectionTest_cockroachdb+psycopg2_9_5_0::test_autoincrement_col": "5807",
"test/dialect/test_suite.py::ComponentReflectionTest_cockroachdb+psycopg2_9_5_0::test_deprecated_get_primary_keys": "5807", "test/dialect/test_suite.py::ComponentReflectionTest_cockroachdb+psycopg2_9_5_0::test_deprecated_get_primary_keys": "5807",
...@@ -157,6 +160,8 @@ var sqlAlchemyBlacklist = blacklist{ ...@@ -157,6 +160,8 @@ var sqlAlchemyBlacklist = blacklist{
"test/dialect/test_suite.py::TableDDLTest_cockroachdb+psycopg2_9_5_0::test_create_table_schema": "26443", "test/dialect/test_suite.py::TableDDLTest_cockroachdb+psycopg2_9_5_0::test_create_table_schema": "26443",
} }
var sqlAlchemyIgnoreList20_2 = sqlAlchemyIgnoreList
var sqlAlchemyIgnoreList20_1 = sqlAlchemyIgnoreList var sqlAlchemyIgnoreList20_1 = sqlAlchemyIgnoreList
var sqlAlchemyIgnoreList = blacklist{ var sqlAlchemyIgnoreList = blacklist{
......
...@@ -38,6 +38,7 @@ type crdbVersion int ...@@ -38,6 +38,7 @@ type crdbVersion int
const ( const (
tpchVecVersion19_2 crdbVersion = iota tpchVecVersion19_2 crdbVersion = iota
tpchVecVersion20_1 tpchVecVersion20_1
tpchVecVersion20_2
) )
func toCRDBVersion(v string) (crdbVersion, error) { func toCRDBVersion(v string) (crdbVersion, error) {
...@@ -45,6 +46,8 @@ func toCRDBVersion(v string) (crdbVersion, error) { ...@@ -45,6 +46,8 @@ func toCRDBVersion(v string) (crdbVersion, error) {
return tpchVecVersion19_2, nil return tpchVecVersion19_2, nil
} else if strings.HasPrefix(v, "v20.1") { } else if strings.HasPrefix(v, "v20.1") {
return tpchVecVersion20_1, nil return tpchVecVersion20_1, nil
} else if strings.HasPrefix(v, "v20.2") {
return tpchVecVersion20_2, nil
} else { } else {
return 0, errors.Errorf("unrecognized version: %s", v) return 0, errors.Errorf("unrecognized version: %s", v)
} }
...@@ -54,6 +57,7 @@ var ( ...@@ -54,6 +57,7 @@ var (
vectorizeOnOptionByVersion = map[crdbVersion]string{ vectorizeOnOptionByVersion = map[crdbVersion]string{
tpchVecVersion19_2: "experimental_on", tpchVecVersion19_2: "experimental_on",
tpchVecVersion20_1: "on", tpchVecVersion20_1: "on",
tpchVecVersion20_2: "on",
} }
// queriesToSkipByVersion is a map keyed by version that contains query numbers // queriesToSkipByVersion is a map keyed by version that contains query numbers
...@@ -77,6 +81,7 @@ var ( ...@@ -77,6 +81,7 @@ var (
slownessThresholdByVersion = map[crdbVersion]float64{ slownessThresholdByVersion = map[crdbVersion]float64{
tpchVecVersion19_2: 1.5, tpchVecVersion19_2: 1.5,
tpchVecVersion20_1: 1.2, tpchVecVersion20_1: 1.2,
tpchVecVersion20_2: 1.2,
} }
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment