Added mariadb migration tests for OS_VERSION 15.7 and 16.0

Author: rcmadhankumar

bci_tester/data.py

@@ -772,6 +772,7 @@ def create_BCI(
 _MARIADB_VERSION_OS_MATRIX: Tuple[Tuple[str, Tuple[str, ...]], ...] = (
     ("10.11", ("15.6",)),
     ("11.8", ("15.7",)),
+    ("11.8", ("16.0",)),
     ("latest", ("tumbleweed",)),
 )
 

tests/test_mariadb.py

@@ -304,7 +304,7 @@ def test_mariadb_healthcheck_galera_cluster_disabled(auto_container_per_test):
 
 @pytest.mark.parametrize("ctr_image", MARIADB_CONTAINERS)
 @pytest.mark.skipif(
-    OS_VERSION not in ("15.6",),
+    OS_VERSION not in ("15.7", "16.0"),
     reason="MariaDB upgrade scenario not supported",
 )
 def test_mariadb_upgrade(
@@ -317,9 +317,12 @@ def test_mariadb_upgrade(
     mounts: List[Union[BindMount, ContainerVolume]] = [
         BindMount(host_path=tmp_path, container_path="/var/lib/mysql")
     ]
+
+    # gosu was renamed to idexec from mariadb_version 10.11
+    gosu = "gosu" if OS_VERSION == "15.6" else "idexec"
     mariadb_old = DerivedContainer(
-        base="registry.suse.com/suse/mariadb:10.6",
-        containerfile='RUN set -euo pipefail; head -n -1 /usr/local/bin/gosu > /tmp/gosu;  echo \'exec setpriv --pdeathsig=keep --reuid="$u" --regid="$u" --clear-groups -- "$@"\' >> /tmp/gosu;  mv /tmp/gosu /usr/local/bin/gosu; chmod +x /usr/local/bin/gosu',
+        base="registry.suse.com/suse/mariadb:11.4",
+        containerfile=f'RUN set -euo pipefail; head -n -1 /usr/local/bin/{gosu} > /tmp/{gosu};  echo \'exec setpriv --pdeathsig=keep --reuid="$u" --regid="$u" --clear-groups -- "$@"\' >> /tmp/{gosu};  mv /tmp/{gosu} /usr/local/bin/{gosu}; chmod +x /usr/local/bin/{gosu}',
         volume_mounts=mounts,
         extra_environment_variables=_DB_ENV,
     )

tox.ini

@@ -47,7 +47,7 @@ passenv =
     XDG_CONFIG_HOME
     XDG_RUNTIME_DIR
 commands =
-    python -m pytest -vv tests/test_{envname}.py --junitxml={toxinidir}/junit_{envname}.xml --pytest-container-log-level=debug []
+    python -m pytest -vv tests/test_{envname}.py::test_mariadb_upgrade --junitxml={toxinidir}/junit_{envname}.xml --pytest-container-log-level=debug []
 
 [testenv:{py36,py39,py310,py311,py312,py313}-unit]
 commands =