From 7bd78f604a81ff52b7282f968e692654a0a19d88 Mon Sep 17 00:00:00 2001
From: Miquel Simon <msimonma@redhat.com>
Date: Tue, 10 Jan 2023 17:37:27 +0100
Subject: [PATCH] Added MariaDB to Legacy Store IT. (#16157)

---
 .github/workflows/ci.yml                            | 2 +-
 pom.xml                                             | 2 +-
 testsuite/integration-arquillian/pom.xml            | 2 +-
 testsuite/integration-arquillian/tests/base/pom.xml | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 52b52739fe..88079c369d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -271,7 +271,7 @@ jobs:
     timeout-minutes: 45
     strategy:
       matrix:
-        db: [postgres, mysql, oracle, mssql] # 'mariadb' is not always shutting down
+        db: [postgres, mysql, oracle, mssql, mariadb]
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
diff --git a/pom.xml b/pom.xml
index e8545c3ac9..eafbb5e63a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@
         <mysql-jdbc.version>8.0.30</mysql-jdbc.version>
         <postgresql.version>13.2</postgresql.version>
         <postgresql-jdbc.version>42.5.1</postgresql-jdbc.version>
-        <mariadb.version>10.3.27</mariadb.version>
+        <mariadb.version>10.6</mariadb.version>
         <mariadb-jdbc.version>2.7.2</mariadb-jdbc.version>
         <mssql.version>2019-latest</mssql.version>
         <mssql-jdbc.version>9.2.0.jre8</mssql-jdbc.version>
diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
index 1e7bb6cd01..29f6c8b162 100644
--- a/testsuite/integration-arquillian/pom.xml
+++ b/testsuite/integration-arquillian/pom.xml
@@ -535,7 +535,7 @@
                 <jdbc.mvn.groupId>org.mariadb.jdbc</jdbc.mvn.groupId>
                 <jdbc.mvn.artifactId>mariadb-java-client</jdbc.mvn.artifactId>
                 <jdbc.mvn.version>${mariadb-jdbc.version}</jdbc.mvn.version>
-                <docker.database.image>mariadb:${mariadb.version}</docker.database.image>
+                <docker.database.image>docker.io/mariadb:${mariadb.version}</docker.database.image>
                 <docker.database.port>3306</docker.database.port>
                 <docker.database.skip>false</docker.database.skip>
                 <!-- Need to explicitly enable utf8 as it is not the default settings in the mariadb docker image -->
diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml
index cc095d4ebc..160555f044 100644
--- a/testsuite/integration-arquillian/tests/base/pom.xml
+++ b/testsuite/integration-arquillian/tests/base/pom.xml
@@ -366,6 +366,7 @@
                                             <!-- Do not use waiting for port since that is unreliable, sometimes port is listening before DB is ready to serve -->
                                             <log>${docker.database.wait-for-log-regex}</log>
                                             <time>300000</time>
+                                            <kill>10000</kill>
                                             <exec>
                                               <postStart>${docker.database.postStart}</postStart>
                                               <breakOnError>true</breakOnError>