Merge branches 'tests-cockroachdb-eol', 'tests-postgres-17', 'tests-mongodb', 'tests-firebird-eol' and 'tests-clickhouse-lts' into tests-fix

joschi · joschi · commit e856498ea9ce · 2024-12-09T17:21:10.000+01:00
diff --git a/database/clickhouse/clickhouse_test.go b/database/clickhouse/clickhouse_test.go
@@ -26,7 +26,7 @@ var (
 		PortRequired: true, ReadyFunc: isReady,
 	}
 	specs = []dktesting.ContainerSpec{
-		{ImageName: "yandex/clickhouse-server:21.3", Options: opts},
+		{ImageName: "clickhouse:24.8", Options: opts},
 	}
 )
 
diff --git a/database/firebird/firebird_test.go b/database/firebird/firebird_test.go
@@ -38,8 +38,9 @@ var (
 		},
 	}
 	specs = []dktesting.ContainerSpec{
-		{ImageName: "jacobalberty/firebird:2.5-ss", Options: opts},
-		{ImageName: "jacobalberty/firebird:3.0", Options: opts},
+		{ImageName: "jacobalberty/firebird:v3.0", Options: opts},
+		{ImageName: "jacobalberty/firebird:v4.0", Options: opts},
+		{ImageName: "jacobalberty/firebird:v5.0", Options: opts},
 	}
 )
 
diff --git a/database/mongodb/mongodb_test.go b/database/mongodb/mongodb_test.go
@@ -32,10 +32,10 @@ var (
 	opts = dktest.Options{PortRequired: true, ReadyFunc: isReady}
 	// Supported versions: https://www.mongodb.com/support-policy
 	specs = []dktesting.ContainerSpec{
-		{ImageName: "mongo:3.4", Options: opts},
-		{ImageName: "mongo:3.6", Options: opts},
-		{ImageName: "mongo:4.0", Options: opts},
-		{ImageName: "mongo:4.2", Options: opts},
+		{ImageName: "mongo:5.0", Options: opts},
+		{ImageName: "mongo:6.0", Options: opts},
+		{ImageName: "mongo:7.0", Options: opts},
+		{ImageName: "mongo:8.0", Options: opts},
 	}
 )
 
diff --git a/database/pgx/pgx_test.go b/database/pgx/pgx_test.go
@@ -34,11 +34,11 @@ var (
 		PortRequired: true, ReadyFunc: isReady}
 	// Supported versions: https://www.postgresql.org/support/versioning/
 	specs = []dktesting.ContainerSpec{
-		{ImageName: "postgres:12", Options: opts},
 		{ImageName: "postgres:13", Options: opts},
 		{ImageName: "postgres:14", Options: opts},
 		{ImageName: "postgres:15", Options: opts},
 		{ImageName: "postgres:16", Options: opts},
+		{ImageName: "postgres:17", Options: opts},
 	}
 )
 
diff --git a/database/pgx/v5/pgx_test.go b/database/pgx/v5/pgx_test.go
@@ -35,11 +35,11 @@ var (
 		PortRequired: true, ReadyFunc: isReady}
 	// Supported versions: https://www.postgresql.org/support/versioning/
 	specs = []dktesting.ContainerSpec{
-		{ImageName: "postgres:12", Options: opts},
 		{ImageName: "postgres:13", Options: opts},
 		{ImageName: "postgres:14", Options: opts},
 		{ImageName: "postgres:15", Options: opts},
 		{ImageName: "postgres:16", Options: opts},
+		{ImageName: "postgres:17", Options: opts},
 	}
 )
 
diff --git a/database/postgres/postgres_test.go b/database/postgres/postgres_test.go
@@ -35,11 +35,11 @@ var (
 		PortRequired: true, ReadyFunc: isReady}
 	// Supported versions: https://www.postgresql.org/support/versioning/
 	specs = []dktesting.ContainerSpec{
-		{ImageName: "postgres:12", Options: opts},
 		{ImageName: "postgres:13", Options: opts},
 		{ImageName: "postgres:14", Options: opts},
 		{ImageName: "postgres:15", Options: opts},
 		{ImageName: "postgres:16", Options: opts},
+		{ImageName: "postgres:17", Options: opts},
 	}
 )
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ var (`
`26`	`26`	`PortRequired: true, ReadyFunc: isReady,`
`27`	`27`	`}`
`28`	`28`	`specs = []dktesting.ContainerSpec{`
`29`		`- {ImageName: "yandex/clickhouse-server:21.3", Options: opts},`
	`29`	`+ {ImageName: "clickhouse:24.8", Options: opts},`
`30`	`30`	`}`
`31`	`31`	`)`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,9 @@ var (`
`38`	`38`	`},`
`39`	`39`	`}`
`40`	`40`	`specs = []dktesting.ContainerSpec{`
`41`		`- {ImageName: "jacobalberty/firebird:2.5-ss", Options: opts},`
`42`		`- {ImageName: "jacobalberty/firebird:3.0", Options: opts},`
	`41`	`+ {ImageName: "jacobalberty/firebird:v3.0", Options: opts},`
	`42`	`+ {ImageName: "jacobalberty/firebird:v4.0", Options: opts},`
	`43`	`+ {ImageName: "jacobalberty/firebird:v5.0", Options: opts},`
`43`	`44`	`}`
`44`	`45`	`)`
`45`	`46`
Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,10 @@ var (`
`32`	`32`	`opts = dktest.Options{PortRequired: true, ReadyFunc: isReady}`
`33`	`33`	`// Supported versions: https://www.mongodb.com/support-policy`
`34`	`34`	`specs = []dktesting.ContainerSpec{`
`35`		`- {ImageName: "mongo:3.4", Options: opts},`
`36`		`- {ImageName: "mongo:3.6", Options: opts},`
`37`		`- {ImageName: "mongo:4.0", Options: opts},`
`38`		`- {ImageName: "mongo:4.2", Options: opts},`
	`35`	`+ {ImageName: "mongo:5.0", Options: opts},`
	`36`	`+ {ImageName: "mongo:6.0", Options: opts},`
	`37`	`+ {ImageName: "mongo:7.0", Options: opts},`
	`38`	`+ {ImageName: "mongo:8.0", Options: opts},`
`39`	`39`	`}`
`40`	`40`	`)`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,11 @@ var (`
`34`	`34`	`PortRequired: true, ReadyFunc: isReady}`
`35`	`35`	`// Supported versions: https://www.postgresql.org/support/versioning/`
`36`	`36`	`specs = []dktesting.ContainerSpec{`
`37`		`- {ImageName: "postgres:12", Options: opts},`
`38`	`37`	`{ImageName: "postgres:13", Options: opts},`
`39`	`38`	`{ImageName: "postgres:14", Options: opts},`
`40`	`39`	`{ImageName: "postgres:15", Options: opts},`
`41`	`40`	`{ImageName: "postgres:16", Options: opts},`
	`41`	`+ {ImageName: "postgres:17", Options: opts},`
`42`	`42`	`}`
`43`	`43`	`)`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,11 @@ var (`
`35`	`35`	`PortRequired: true, ReadyFunc: isReady}`
`36`	`36`	`// Supported versions: https://www.postgresql.org/support/versioning/`
`37`	`37`	`specs = []dktesting.ContainerSpec{`
`38`		`- {ImageName: "postgres:12", Options: opts},`
`39`	`38`	`{ImageName: "postgres:13", Options: opts},`
`40`	`39`	`{ImageName: "postgres:14", Options: opts},`
`41`	`40`	`{ImageName: "postgres:15", Options: opts},`
`42`	`41`	`{ImageName: "postgres:16", Options: opts},`
	`42`	`+ {ImageName: "postgres:17", Options: opts},`
`43`	`43`	`}`
`44`	`44`	`)`
`45`	`45`