From 39807bd50fc4d608d0704b058520974ed7ecc371 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Fri, 5 Apr 2024 11:36:33 +0200
Subject: [PATCH 1/3] Integration tests: use more descriptive matrix variable
 names

---
 .github/workflows/integration-tests.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index ba6a7bf5f..160028ea2 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -15,12 +15,12 @@ jobs:
       fail-fast: false
       matrix:
         database:
-          - name: mysql
-            pretty_name: MySQL
-          - name: pgsql
-            pretty_name: PostgreSQL
+          - name: MySQL
+            type: mysql
+          - name: PostgreSQL
+            type: pgsql
 
-    name: ${{ matrix.database.pretty_name }}
+    name: ${{ matrix.database.name }}
     runs-on: ubuntu-latest
 
     steps:
@@ -40,7 +40,7 @@ jobs:
       - name: Run Integration Tests
         run: ./icingadb-test -icingatesting.debuglog debug.log -test.v
         env:
-          ICINGADB_TESTS_DATABASE_TYPE: ${{ matrix.database.name }}
+          ICINGADB_TESTS_DATABASE_TYPE: ${{ matrix.database.type }}
           ICINGA_TESTING_ICINGADB_BINARY: ${{ github.workspace }}/icingadb
           ICINGA_TESTING_ICINGADB_SCHEMA_MYSQL: ${{ github.workspace }}/schema/mysql/schema.sql
           ICINGA_TESTING_ICINGADB_SCHEMA_PGSQL: ${{ github.workspace }}/schema/pgsql/schema.sql
@@ -51,6 +51,6 @@ jobs:
         if: ${{ always() }}
         uses: actions/upload-artifact@v6
         with:
-          name: ${{ matrix.database.name }}-debug.log.xz
+          name: ${{ matrix.database.type }}-debug.log.xz
           path: debug.log.xz
           retention-days: 1

From 62c48af813c4aa06a77f05bdd6616c3653950b7d Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Fri, 5 Apr 2024 12:36:02 +0200
Subject: [PATCH 2/3] Integration tests: include MariaDB as well

just to be sure we're compatible with this RDBMS and not only MySQL.
---
 .github/workflows/integration-tests.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 160028ea2..ee112a759 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -16,9 +16,14 @@ jobs:
       matrix:
         database:
           - name: MySQL
-            type: mysql
+            type: MYSQL
+            image: mysql:latest
+          - name: MariaDB
+            type: MYSQL
+            image: mariadb:latest
           - name: PostgreSQL
-            type: pgsql
+            type: PGSQL
+            image: postgres:latest
 
     name: ${{ matrix.database.name }}
     runs-on: ubuntu-latest
@@ -41,6 +46,7 @@ jobs:
         run: ./icingadb-test -icingatesting.debuglog debug.log -test.v
         env:
           ICINGADB_TESTS_DATABASE_TYPE: ${{ matrix.database.type }}
+          ICINGA_TESTING_${{ matrix.database.type }}_IMAGE: ${{ matrix.database.image }}
           ICINGA_TESTING_ICINGADB_BINARY: ${{ github.workspace }}/icingadb
           ICINGA_TESTING_ICINGADB_SCHEMA_MYSQL: ${{ github.workspace }}/schema/mysql/schema.sql
           ICINGA_TESTING_ICINGADB_SCHEMA_PGSQL: ${{ github.workspace }}/schema/pgsql/schema.sql
@@ -51,6 +57,6 @@ jobs:
         if: ${{ always() }}
         uses: actions/upload-artifact@v6
         with:
-          name: ${{ matrix.database.type }}-debug.log.xz
+          name: ${{ matrix.database.name }}-debug.log.xz
           path: debug.log.xz
           retention-days: 1

From 47dda14f58d171714778264a2978a6dbf6f1e9f7 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Mon, 15 Sep 2025 14:34:14 +0200
Subject: [PATCH 3/3] Integration tests: include minimum required RDBMS
 versions

---
 .github/workflows/integration-tests.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index ee112a759..9376ba860 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -18,12 +18,22 @@ jobs:
           - name: MySQL
             type: MYSQL
             image: mysql:latest
+          - name: MySQL (minimum required version)
+            type: MYSQL
+            image: mysql:8.0.0
           - name: MariaDB
             type: MYSQL
             image: mariadb:latest
+          - name: MariaDB (minimum required version)
+            type: MYSQL
+            # Actually we support v10.2.2+, but Docker Hub doesn't.
+            image: mariadb:10.2.5
           - name: PostgreSQL
             type: PGSQL
             image: postgres:latest
+          - name: PostgreSQL (minimum required version)
+            type: PGSQL
+            image: postgres:9.6.0
 
     name: ${{ matrix.database.name }}
     runs-on: ubuntu-latest