Migrate to POM and upgrade hardcoded Mysql image in MySqlDatabaseTest…

…Resource
quarkus-qe · Dec 18, 2023 · e70240a · e70240a
1 parent b9fc7bc
commit e70240a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -57,6 +57,7 @@
         <exclude.quarkus.devmode.tests>no</exclude.quarkus.devmode.tests>
         <!-- Docker images used by both surefire and failsafe plugin -->
         <postgresql.latest.image>docker.io/library/postgres:15</postgresql.latest.image>
+        <mysql.80.image>registry.access.redhat.com/rhscl/mysql-80-rhel7</mysql.80.image>
         <wiremock-jre8.version>2.35.1</wiremock-jre8.version>
         <build-reporter-maven-extension.version>3.3.1</build-reporter-maven-extension.version>
     </properties>
@@ -228,6 +229,7 @@
                         <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                         <!-- Services used in test suite -->
                         <postgresql.latest.image>${postgresql.latest.image}</postgresql.latest.image>
+                        <mysql.80.image>${mysql.80.image}</mysql.80.image>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
@@ -265,7 +267,7 @@
                                 <elastic.7x.image>docker.io/library/elasticsearch:7.17.12</elastic.7x.image>
                                 <mysql.57.image>docker.io/library/mysql:5.7.42</mysql.57.image>
                                 <mysql.upstream.80.image>docker.io/library/mysql:8.0</mysql.upstream.80.image>
-                                <mysql.80.image>registry.access.redhat.com/rhscl/mysql-80-rhel7</mysql.80.image>
+                                <mysql.80.image>${mysql.80.image}</mysql.80.image>
                                 <mariadb.10.image>docker.io/library/mariadb:10.10</mariadb.10.image>
                                 <mssql.image>mcr.microsoft.com/mssql/rhel/server:2022-latest</mssql.image>
                                 <!-- Oracle image - we aim to use same version as Dev Services for Oracle so that we only download one image -->

diff --git a/...way/src/test/java/io/quarkus/ts/sqldb/panacheflyway/dbpool/MySqlDatabaseTestResource.java b/...way/src/test/java/io/quarkus/ts/sqldb/panacheflyway/dbpool/MySqlDatabaseTestResource.java
@@ -25,8 +25,10 @@ public class MySqlDatabaseTestResource implements QuarkusTestResourceLifecycleMa
 
     @Override
     public Map<String, String> start() {
+        String image = System.getProperty("mysql.80.image");
+
         container = new MySQLContainer<>(
-                DockerImageName.parse("registry.access.redhat.com/rhscl/mysql-80-rhel7").asCompatibleSubstituteFor(MYSQL));
+                DockerImageName.parse(image).asCompatibleSubstituteFor(MYSQL));
         container.withUrlParam("currentSchema", DEFAULT_SCHEMA);
         container.start();