Add mariadb 10.8

.github/workflows/ansible-test-plugins.yml

@@ -55,9 +55,9 @@ jobs:
       fail-fast: false
       matrix:
         db_engine_version:
-          #- mysql_5.7.31
-          #- mysql_8.0.22
-          #- mariadb_10.3.34
+          - mysql_5.7.31
+          - mysql_8.0.22
+          - mariadb_10.3.34
           - mariadb_10.8.3
         ansible:
           - stable-2.11
@@ -71,11 +71,17 @@ jobs:
           - pymysql==0.7.10
           - pymysql==0.9.3
           - mysqlclient==2.0.1
+        maria_url_subdir:
+          - linux
+          - linux-systemd
         exclude:
-          #- db_engine_version: mysql_8.0.22
-          #  connector: pymysql==0.7.10
+          - db_engine_version: mysql_8.0.22
+            connector: pymysql==0.7.10
           - db_engine_version: mariadb_10.8.3
             connector: pymysql==0.7.10
+            maria_url_subdir: linux
+          - db_engine_version: mariadb_10.3.34
+            maria_url_subdir: linux-systemd
           - python: 3.8
             ansible: stable-2.11
           - python: 3.6
@@ -110,6 +116,7 @@ jobs:
         run: |
           export DB_VERSION=$(echo "${{ matrix.db_engine_version }}" | awk -F_ '{print $2}')
           sed -i -e "s/^mariadb_version:.*/mariadb_version: $DB_VERSION/g" -e 's/^mariadb_install: false/mariadb_install: true/g' ${{ env.mysql_version_file }}
+          sed -i -e "s/^mariadb_url_subdir:.*/mariadb_url_subdir: ${{ matrix.maria_url_subdir }}/g" ${{ env.mysql_version_file }}
         if: ${{ startsWith(matrix.db_engine_version, 'mariadb') }}
 
       - name: Set Connector version (${{ matrix.connector }})

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-systemd-x86_64.tar.gz"
-mariadb_src: "https://downloads.mariadb.com/MariaDB/mariadb-{{ mariadb_version }}/bintar-linux-systemd-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 }}"