libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Align database versions in Quarkus integration tests with the root pom (#21512)

Browse source 
Now it is using the same version that is used in the integration test and which is stated in the docs as the tested version.

Closes: #15411
This commit is contained in:
Alexander Schwartz 2023-07-10 16:59:26 +02:00 committed by GitHub
parent 609673e507
commit a25df4afea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
quarkus/tests/integration/pom.xml
View file

@ -152,9 +152,11 @@
<systemPropertyVariables> <systemPropertyVariables>
<kc.test.storage.database>true</kc.test.storage.database> <kc.test.storage.database>true</kc.test.storage.database>
<!--DB Container --> <!--DB Container -->
<kc.db.postgresql.container.image>postgres:alpine</kc.db.postgresql.container.image> <kc.db.postgresql.container.image>postgres:${postgresql.version}</kc.db.postgresql.container.image>
<kc.db.mariadb.container.image>mariadb:10.5.9</kc.db.mariadb.container.image> <kc.db.mariadb.container.image>mariadb:${mariadb.version}</kc.db.mariadb.container.image>
<kc.db.mysql.container.image>mysql:${mysql.version}</kc.db.mysql.container.image>
<kc.infinispan.container.image>quay.io/infinispan/server:${infinispan.version}</kc.infinispan.container.image> <kc.infinispan.container.image>quay.io/infinispan/server:${infinispan.version}</kc.infinispan.container.image>
<kc.db.mssql.container.image>mcr.microsoft.com/mssql/server:${mssql.version}</kc.db.mssql.container.image>
</systemPropertyVariables> </systemPropertyVariables>
</configuration> </configuration>
</plugin> </plugin>

2
quarkus/tests/integration/src/test/resources/container-license-acceptance.txt
View file

@ -1 +1 @@
mcr.microsoft.com/mssql/server:2019-latest mcr.microsoft.com/mssql/server:2022-latest

27
quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/DatabaseContainer.java
View file

@ -103,28 +103,27 @@ public class DatabaseContainer {
} }
private GenericContainer<?> createContainer() { private GenericContainer<?> createContainer() {
String POSTGRES_IMAGE = System.getProperty("kc.db.postgresql.container.image", "postgres:alpine"); String POSTGRES_IMAGE = System.getProperty("kc.db.postgresql.container.image");
String MARIADB_IMAGE = System.getProperty("kc.db.mariadb.container.image", "mariadb:10.5.9"); String MARIADB_IMAGE = System.getProperty("kc.db.mariadb.container.image");
String MYSQL_IMAGE = System.getProperty("kc.db.mysql.container.image", "mysql:latest"); String MYSQL_IMAGE = System.getProperty("kc.db.mysql.container.image");
String INFINISPAN_IMAGE = System.getProperty("kc.infinispan.container.image"); String INFINISPAN_IMAGE = System.getProperty("kc.infinispan.container.image");
String MSSQL_IMAGE = System.getProperty("kc.db.mssql.container.image", "mcr.microsoft.com/mssql/server:2019-latest"); String MSSQL_IMAGE = System.getProperty("kc.db.mssql.container.image");
DockerImageName POSTGRES = DockerImageName.parse(POSTGRES_IMAGE).asCompatibleSubstituteFor("postgres");
DockerImageName MARIADB = DockerImageName.parse(MARIADB_IMAGE).asCompatibleSubstituteFor("mariadb");
DockerImageName MYSQL = DockerImageName.parse(MYSQL_IMAGE).asCompatibleSubstituteFor("mysql");
DockerImageName MSSQL = DockerImageName.parse(MSSQL_IMAGE).asCompatibleSubstituteFor("sqlserver");
switch (alias) { switch (alias) {
case "postgres": case "postgres":
return configureJdbcContainer(new PostgreSQLContainer(POSTGRES)); DockerImageName POSTGRES = DockerImageName.parse(POSTGRES_IMAGE).asCompatibleSubstituteFor("postgres");
return configureJdbcContainer(new PostgreSQLContainer<>(POSTGRES));
case "mariadb": case "mariadb":
return configureJdbcContainer(new MariaDBContainer(MARIADB)); DockerImageName MARIADB = DockerImageName.parse(MARIADB_IMAGE).asCompatibleSubstituteFor("mariadb");
return configureJdbcContainer(new MariaDBContainer<>(MARIADB));
case "mysql": case "mysql":
return configureJdbcContainer(new MySQLContainer(MYSQL)); DockerImageName MYSQL = DockerImageName.parse(MYSQL_IMAGE).asCompatibleSubstituteFor("mysql");
return configureJdbcContainer(new MySQLContainer<>(MYSQL));
case "mssql": case "mssql":
return configureJdbcContainer(new MSSQLServerContainer(MSSQL)); DockerImageName MSSQL = DockerImageName.parse(MSSQL_IMAGE).asCompatibleSubstituteFor("sqlserver");
return configureJdbcContainer(new MSSQLServerContainer<>(MSSQL));
case "infinispan": case "infinispan":
return configureInfinispanUser(new GenericContainer(INFINISPAN_IMAGE)) return configureInfinispanUser(new GenericContainer<>(INFINISPAN_IMAGE))
.withExposedPorts(11222); .withExposedPorts(11222);
default: default:
throw new RuntimeException("Unsupported database: " + alias); throw new RuntimeException("Unsupported database: " + alias);