Container version update

* Removing microrelease version numbers from image tags to pick up latest minors * Bumping RHSSO 7.4 to 7.5 * Bumping RHSCL PostgreSQL to 13 * Bumping Oracle XE to 21
quarkus-qe · Jan 19, 2022 · 95313bb · 95313bb
1 parent e0ccf94
commit 95313bb
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 31 deletions.
diff --git a/...ications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopHeroesIT.java b/...ications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopHeroesIT.java
@@ -39,7 +39,7 @@ public class OpenShiftWorkshopHeroesIT {
 
     private static final int POSTGRESQL_PORT = 5432;
 
-    @Container(image = "${postgresql.12.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
+    @Container(image = "${postgresql.13.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
     static PostgresqlService database = new PostgresqlService();
 
     @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-workshops.git", contextDir = "quarkus-workshop-super-heroes/super-heroes/rest-hero", mavenArgs = "-Dquarkus.package.type=uber-jar -DskipTests -Dquarkus.platform.artifact-id=quarkus-bom")

diff --git a/...ations/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopVillainsIT.java b/...ations/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopVillainsIT.java
@@ -40,7 +40,7 @@ public class OpenShiftWorkshopVillainsIT {
 
     private static final int POSTGRESQL_PORT = 5432;
 
-    @Container(image = "${postgresql.12.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
+    @Container(image = "${postgresql.13.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
     static PostgresqlService database = new PostgresqlService();
 
     @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-workshops.git", contextDir = "quarkus-workshop-super-heroes/super-heroes/rest-villain", mavenArgs = "-Dquarkus.package.type=uber-jar -DskipTests")

diff --git a/pom.xml b/pom.xml
@@ -200,19 +200,19 @@
                                 <!-- Services used in test suite -->
                                 <keycloak.image>quay.io/keycloak/keycloak:15.0.1</keycloak.image>
                                 <rhsso.73.image>registry.access.redhat.com/redhat-sso-7/sso73-openshift</rhsso.73.image>
-                                <postgresql.13.image>quay.io/bitnami/postgresql:13.4.0</postgresql.13.image>
+                                <postgresql.13.image>quay.io/bitnami/postgresql:13.5.0</postgresql.13.image>
                                 <mysql.57.image>quay.io/bitnami/mysql:5.7.32</mysql.57.image>
                                 <mysql.80.image>registry.access.redhat.com/rhscl/mysql-80-rhel7</mysql.80.image>
-                                <mariadb.10.image>quay.io/quarkusqeteam/mariadb:10.6.4</mariadb.10.image>
+                                <mariadb.10.image>quay.io/bitnami/mariadb:10.6</mariadb.10.image>
                                 <mariadb.102.image>registry.access.redhat.com/rhscl/mariadb-102-rhel7</mariadb.102.image>
-                                <mssql.image>mcr.microsoft.com/mssql/rhel/server</mssql.image>
-                                <oracle.image>gvenzl/oracle-xe:18.4.0-slim</oracle.image>
+                                <mssql.image>mcr.microsoft.com/mssql/rhel/server:2019-latest</mssql.image>
+                                <oracle.image>gvenzl/oracle-xe:21-slim</oracle.image>
                                 <db2.image>quay.io/quarkusqeteam/db2:11.5.5.0</db2.image>
-                                <mongodb.image>quay.io/bitnami/mongodb:5.0.2</mongodb.image>
+                                <mongodb.image>quay.io/bitnami/mongodb:5.0</mongodb.image>
                                 <redis.image>quay.io/bitnami/redis:6.0</redis.image>
                                 <wiremock.image>quay.io/ocpmetal/wiremock</wiremock.image>
-                                <consul.image>quay.io/bitnami/consul:1.9.3</consul.image>
-                                <infinispan.image>infinispan/server:12.1</infinispan.image>
+                                <consul.image>quay.io/bitnami/consul:1.10</consul.image>
+                                <infinispan.image>quay.io/infinispan/server:12.1</infinispan.image>
                                 <infinispan.expected-log>Infinispan Server.*started in</infinispan.expected-log>
                                 <spring.cloud.server.image>quay.io/quarkusqeteam/spring-cloud-config-server:3.0</spring.cloud.server.image>
                             </systemPropertyVariables>
@@ -587,9 +587,9 @@
                             <systemPropertyVariables>
                                 <ts.redhat.registry.enabled>true</ts.redhat.registry.enabled>
                                 <!-- Product Services -->
-                                <rhsso.74.image>registry.redhat.io/rh-sso-7/sso74-openshift-rhel8</rhsso.74.image>
+                                <rhsso.75.image>registry.redhat.io/rh-sso-7/sso75-openshift-rhel8</rhsso.75.image>
                                 <postgresql.10.image>registry.redhat.io/rhscl/postgresql-10-rhel7</postgresql.10.image>
-                                <postgresql.12.image>registry.redhat.io/rhscl/postgresql-12-rhel7</postgresql.12.image>
+                                <postgresql.13.image>registry.redhat.io/rhscl/postgresql-13-rhel7</postgresql.13.image>
                                 <mariadb.103.image>registry.redhat.io/rhscl/mariadb-103-rhel7</mariadb.103.image>
                                 <amq-streams.image>registry.redhat.io/amq7/amq-streams-kafka-27-rhel7</amq-streams.image>
                                 <amq-streams.version>1.7.0</amq-streams.version>

diff --git a/...uthz/OpenShiftRhSso74AuthzSecurityIT.java → ...uthz/OpenShiftRhSso75AuthzSecurityIT.java b/...uthz/OpenShiftRhSso74AuthzSecurityIT.java → ...uthz/OpenShiftRhSso75AuthzSecurityIT.java
@@ -10,11 +10,11 @@
 
 @OpenShiftScenario
 @EnabledIfSystemProperty(named = "ts.redhat.registry.enabled", matches = "true")
-public class OpenShiftRhSso74AuthzSecurityIT extends BaseAuthzSecurityIT {
+public class OpenShiftRhSso75AuthzSecurityIT extends BaseAuthzSecurityIT {
 
     static final int KEYCLOAK_PORT = 8080;
 
-    @Container(image = "${rhsso.74.image}", expectedLog = "Http management interface listening", port = KEYCLOAK_PORT)
+    @Container(image = "${rhsso.75.image}", expectedLog = "Http management interface listening", port = KEYCLOAK_PORT)
     static KeycloakService keycloak = new KeycloakService(REALM_DEFAULT)
             .withProperty("SSO_IMPORT_FILE", "resource::/keycloak-realm.json");
 

diff --git a/...uthz/OpenShiftRhSso74AuthzSecurityIT.java → ...uthz/OpenShiftRhSso75AuthzSecurityIT.java b/...uthz/OpenShiftRhSso74AuthzSecurityIT.java → ...uthz/OpenShiftRhSso75AuthzSecurityIT.java
@@ -10,11 +10,11 @@
 
 @OpenShiftScenario
 @EnabledIfSystemProperty(named = "ts.redhat.registry.enabled", matches = "true")
-public class OpenShiftRhSso74AuthzSecurityIT extends BaseAuthzSecurityIT {
+public class OpenShiftRhSso75AuthzSecurityIT extends BaseAuthzSecurityIT {
 
     static final int KEYCLOAK_PORT = 8080;
 
-    @Container(image = "${rhsso.74.image}", expectedLog = "Http management interface listening", port = KEYCLOAK_PORT)
+    @Container(image = "${rhsso.75.image}", expectedLog = "Http management interface listening", port = KEYCLOAK_PORT)
     static KeycloakService keycloak = new KeycloakService(REALM_DEFAULT)
             .withProperty("SSO_IMPORT_FILE", "resource::/keycloak-realm.json");
 

diff --git a/...wt/OpenShiftRhSso74OidcJwtSecurityIT.java → ...wt/OpenShiftRhSso75OidcJwtSecurityIT.java b/...wt/OpenShiftRhSso74OidcJwtSecurityIT.java → ...wt/OpenShiftRhSso75OidcJwtSecurityIT.java
@@ -10,11 +10,11 @@
 
 @OpenShiftScenario
 @EnabledIfSystemProperty(named = "ts.redhat.registry.enabled", matches = "true")
-public class OpenShiftRhSso74OidcJwtSecurityIT extends BaseOidcJwtSecurityIT {
+public class OpenShiftRhSso75OidcJwtSecurityIT extends BaseOidcJwtSecurityIT {
 
     static final int KEYCLOAK_PORT = 8080;
 
-    @Container(image = "${rhsso.74.image}", expectedLog = "Http management interface listening", port = KEYCLOAK_PORT)
+    @Container(image = "${rhsso.75.image}", expectedLog = "Http management interface listening", port = KEYCLOAK_PORT)
     static KeycloakService keycloak = new KeycloakService(REALM_DEFAULT)
             .withProperty("SSO_IMPORT_FILE", "resource::/keycloak-realm.json");
 

diff --git a/...penShiftRhSso74MultiTenantSecurityIT.java → ...penShiftRhSso75MultiTenantSecurityIT.java b/...penShiftRhSso74MultiTenantSecurityIT.java → ...penShiftRhSso75MultiTenantSecurityIT.java
@@ -10,11 +10,11 @@
 
 @OpenShiftScenario
 @EnabledIfSystemProperty(named = "ts.redhat.registry.enabled", matches = "true")
-public class OpenShiftRhSso74MultiTenantSecurityIT extends BaseMultiTenantSecurityIT {
+public class OpenShiftRhSso75MultiTenantSecurityIT extends BaseMultiTenantSecurityIT {
 
     static final int KEYCLOAK_PORT = 8080;
 
-    @Container(image = "${rhsso.74.image}", expectedLog = "Http management interface listening", port = KEYCLOAK_PORT)
+    @Container(image = "${rhsso.75.image}", expectedLog = "Http management interface listening", port = KEYCLOAK_PORT)
     static KeycloakService keycloak = new KeycloakService(REALM_DEFAULT)
             .withProperty("SSO_IMPORT_FILE", "resource::/keycloak-realm.json");
 

diff --git a/...ity/OpenShiftRhSso74Oauth2SecurityIT.java → ...ity/OpenShiftRhSso75Oauth2SecurityIT.java b/...ity/OpenShiftRhSso74Oauth2SecurityIT.java → ...ity/OpenShiftRhSso75Oauth2SecurityIT.java
@@ -10,11 +10,11 @@
 
 @OpenShiftScenario
 @EnabledIfSystemProperty(named = "ts.redhat.registry.enabled", matches = "true")
-public class OpenShiftRhSso74Oauth2SecurityIT extends BaseOauth2SecurityIT {
+public class OpenShiftRhSso75Oauth2SecurityIT extends BaseOauth2SecurityIT {
 
     static final int KEYCLOAK_PORT = 8080;
 
-    @Container(image = "${rhsso.74.image}", expectedLog = "Http management interface listening", port = KEYCLOAK_PORT)
+    @Container(image = "${rhsso.75.image}", expectedLog = "Http management interface listening", port = KEYCLOAK_PORT)
     static KeycloakService keycloak = new KeycloakService(REALM_DEFAULT)
             .withProperty("SSO_IMPORT_FILE", "resource::/keycloak-realm.json");
 

diff --git a/...OpenShiftRhSso74OidcClientSecurityIT.java → ...OpenShiftRhSso75OidcClientSecurityIT.java b/...OpenShiftRhSso74OidcClientSecurityIT.java → ...OpenShiftRhSso75OidcClientSecurityIT.java
@@ -10,11 +10,11 @@
 
 @OpenShiftScenario
 @EnabledIfSystemProperty(named = "ts.redhat.registry.enabled", matches = "true")
-public class OpenShiftRhSso74OidcClientSecurityIT extends BaseOidcClientSecurityIT {
+public class OpenShiftRhSso75OidcClientSecurityIT extends BaseOidcClientSecurityIT {
 
     static final int KEYCLOAK_PORT = 8080;
 
-    @Container(image = "${rhsso.74.image}", expectedLog = "Http management interface listening", port = KEYCLOAK_PORT)
+    @Container(image = "${rhsso.75.image}", expectedLog = "Http management interface listening", port = KEYCLOAK_PORT)
     static KeycloakService keycloak = new KeycloakService(REALM_DEFAULT)
             .withProperty("SSO_IMPORT_FILE", "resource::/keycloak-realm.json");
 

diff --git a/...app/OpenShiftRhSso74WebappSecurityIT.java → ...app/OpenShiftRhSso75WebappSecurityIT.java b/...app/OpenShiftRhSso74WebappSecurityIT.java → ...app/OpenShiftRhSso75WebappSecurityIT.java
@@ -10,11 +10,11 @@
 
 @OpenShiftScenario
 @EnabledIfSystemProperty(named = "ts.redhat.registry.enabled", matches = "true")
-public class OpenShiftRhSso74WebappSecurityIT extends BaseWebappSecurityIT {
+public class OpenShiftRhSso75WebappSecurityIT extends BaseWebappSecurityIT {
 
     static final int KEYCLOAK_PORT = 8080;
 
-    @Container(image = "${rhsso.74.image}", expectedLog = "Http management interface listening", port = KEYCLOAK_PORT)
+    @Container(image = "${rhsso.75.image}", expectedLog = "Http management interface listening", port = KEYCLOAK_PORT)
     static KeycloakService keycloak = new KeycloakService(REALM_DEFAULT)
             .withProperty("SSO_IMPORT_FILE", "resource::/keycloak-realm.json");
 

diff --git a/...urity/OpenShiftRhSso74OidcSecurityIT.java → ...urity/OpenShiftRhSso75OidcSecurityIT.java b/...urity/OpenShiftRhSso74OidcSecurityIT.java → ...urity/OpenShiftRhSso75OidcSecurityIT.java
@@ -10,11 +10,11 @@
 
 @OpenShiftScenario
 @EnabledIfSystemProperty(named = "ts.redhat.registry.enabled", matches = "true")
-public class OpenShiftRhSso74OidcSecurityIT extends BaseOidcSecurityIT {
+public class OpenShiftRhSso75OidcSecurityIT extends BaseOidcSecurityIT {
 
     static final int KEYCLOAK_PORT = 8080;
 
-    @Container(image = "${rhsso.74.image}", expectedLog = "Http management interface listening", port = KEYCLOAK_PORT)
+    @Container(image = "${rhsso.75.image}", expectedLog = "Http management interface listening", port = KEYCLOAK_PORT)
     static KeycloakService keycloak = new KeycloakService(REALM_DEFAULT)
             .withProperty("SSO_IMPORT_FILE", "resource::/keycloak-realm.json");
 

diff --git a/...ple-pus/src/test/java/io/quarkus/ts/sqldb/multiplepus/OpenShiftMultiplePersistenceIT.java b/...ple-pus/src/test/java/io/quarkus/ts/sqldb/multiplepus/OpenShiftMultiplePersistenceIT.java
@@ -17,7 +17,7 @@ public class OpenShiftMultiplePersistenceIT extends AbstractMultiplePersistenceI
     @Container(image = "${mariadb.103.image}", port = MYSQL_PORT, expectedLog = "Only MySQL server logs after this point")
     static MariaDbService mariadb = new MariaDbService();
 
-    @Container(image = "${postgresql.12.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
+    @Container(image = "${postgresql.13.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
     static PostgresqlService postgresql = new PostgresqlService();
 
     @QuarkusApplication

diff --git a/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MariaDB10DatabaseIT.java b/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MariaDB10DatabaseIT.java
@@ -11,7 +11,7 @@ public class MariaDB10DatabaseIT extends AbstractSqlDatabaseIT {
 
     static final int MARIADB_PORT = 3306;
 
-    @Container(image = "${mariadb.10.image}", port = MARIADB_PORT, expectedLog = "MariaDB init process done. Ready for start up")
+    @Container(image = "${mariadb.10.image}", port = MARIADB_PORT, expectedLog = "/opt/bitnami/mariadb/sbin/mysqld: ready for connections.")
     static MariaDbService database = new MariaDbService();
 
     @QuarkusApplication

diff --git a/...lapp/OpenShiftPostgresql12DatabaseIT.java → ...lapp/OpenShiftPostgresql13DatabaseIT.java b/...lapp/OpenShiftPostgresql12DatabaseIT.java → ...lapp/OpenShiftPostgresql13DatabaseIT.java
@@ -10,11 +10,11 @@
 
 @OpenShiftScenario
 @EnabledIfSystemProperty(named = "ts.redhat.registry.enabled", matches = "true")
-public class OpenShiftPostgresql12DatabaseIT extends AbstractSqlDatabaseIT {
+public class OpenShiftPostgresql13DatabaseIT extends AbstractSqlDatabaseIT {
 
     static final int POSTGRESQL_PORT = 5432;
 
-    @Container(image = "${postgresql.12.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
+    @Container(image = "${postgresql.13.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
     static PostgresqlService database = new PostgresqlService();
 
     @QuarkusApplication