From b62a59cf5ae39eba2110ae7385350337478a4f4d Mon Sep 17 00:00:00 2001
From: Andrew Klychkov <aklychko@redhat.com>
Date: Fri, 24 Jun 2022 13:50:19 +0200
Subject: [PATCH] Update mariadb to 10.6.8 in test matrix (#370)

* Update mariadb to 10.6.8 in test matrix

* try 10.8.3

* change tarball path

* Change tarball name

* Add mariadb 10.8

* Fix

* Fix

* Fix
---
 .github/workflows/ansible-test-plugins.yml          | 11 +++++++++--
 tests/integration/targets/setup_mysql/vars/main.yml |  5 +++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ansible-test-plugins.yml b/.github/workflows/ansible-test-plugins.yml
index c6363b1..1acca5d 100644
--- a/.github/workflows/ansible-test-plugins.yml
+++ b/.github/workflows/ansible-test-plugins.yml
@@ -58,7 +58,9 @@ jobs:
           - mysql_5.7.31
           - mysql_8.0.22
           - mariadb_10.3.34
-          - mariadb_10.5.9
+          # When adding later versions below,
+          # also change the "Set MariaDB URL sub dir" task
+          - mariadb_10.8.3
         ansible:
           - stable-2.11
           - stable-2.12
@@ -74,7 +76,7 @@ jobs:
         exclude:
           - db_engine_version: mysql_8.0.22
             connector: pymysql==0.7.10
-          - db_engine_version: mariadb_10.5.9
+          - db_engine_version: mariadb_10.8.3
             connector: pymysql==0.7.10
           - python: 3.8
             ansible: stable-2.11
@@ -112,6 +114,11 @@ jobs:
           sed -i -e "s/^mariadb_version:.*/mariadb_version: $DB_VERSION/g" -e 's/^mariadb_install: false/mariadb_install: true/g' ${{ env.mysql_version_file }}
         if: ${{ startsWith(matrix.db_engine_version, 'mariadb') }}
 
+      - name: Set MariaDB URL sub dir
+        run: |
+          sed -i -e "s/^mariadb_url_subdir:.*/mariadb_url_subdir: linux-systemd/g" ${{ env.connector_version_file }}
+        if: matrix.db_engine_version == 'mariadb_10.8.3'
+
       - name: Set Connector version (${{ matrix.connector }})
         run: "sed -i 's/^python_packages:.*/python_packages: [${{ matrix.connector }}]/' ${{ env.connector_version_file }}"
 
diff --git a/tests/integration/targets/setup_mysql/vars/main.yml b/tests/integration/targets/setup_mysql/vars/main.yml
index 94b43b4..ba316f7 100644
--- a/tests/integration/targets/setup_mysql/vars/main.yml
+++ b/tests/integration/targets/setup_mysql/vars/main.yml
@@ -24,5 +24,6 @@ install_python_prereqs:
 
 mysql_tarball: "mysql-{{ mysql_version }}-linux-glibc2.12-x86_64.tar.{{ mysql_compression_extension }}"
 mysql_src: "https://dev.mysql.com/get/Downloads/MySQL-{{ mysql_major_version }}/{{ mysql_tarball }}"
-mariadb_tarball: "mariadb-{{ mariadb_version }}-linux-x86_64.tar.gz"
-mariadb_src: "https://downloads.mariadb.com/MariaDB/mariadb-{{ mariadb_version }}/bintar-linux-x86_64/{{ mariadb_tarball }}"
+mariadb_url_subdir: "linux"
+mariadb_tarball: "mariadb-{{ mariadb_version }}-{{ mariadb_url_subdir }}-x86_64.tar.gz"
+mariadb_src: "https://downloads.mariadb.com/MariaDB/mariadb-{{ mariadb_version }}/bintar-{{ mariadb_url_subdir }}-x86_64/{{ mariadb_tarball }}"