Added mariadb migration tests for OS_VERSION 15.7 and 16.0 by rcmadhankumar · Pull Request #908 · SUSE/BCI-tests

rcmadhankumar · 2025-09-22T10:17:13Z

[CI:TOXENVS] mariadb

dirkmueller · 2025-09-22T12:35:04Z

tests/test_mariadb.py

+        base=mariadb_old_images.get(
+            OS_VERSION, "registry.suse.com/suse/mariadb:10.6"
+        ),
+        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}',


we don't need that anymore for :10.11 ? can we remove that part alltogher?

what did you remove? the line is still there.

missed to push the latest code last time.
changes are pushed now.
(I removed tests for mariadb 10.x and switched to mariadb 11.x)

right but the gosu overwrite is still there. that should be removed for 11.4.

tests/test_mariadb.py

dirkmueller · 2025-10-01T08:20:15Z

tests/test_mariadb.py

    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=mariadb_old_images.get(OS_VERSION),


it is always the same start image now - just hardcode it here rather than having that dict-lookup indirection?

hard coded.

dirkmueller

needs

--- a/tests/test_mariadb.py
+++ b/tests/test_mariadb.py
@@ -317,15 +317,8 @@ def test_mariadb_upgrade(
     mounts: List[Union[BindMount, ContainerVolume]] = [
         BindMount(host_path=tmp_path, container_path="/var/lib/mysql")
     ]
-    mariadb_old_images = {
-        "15.7": "registry.suse.com/suse/mariadb:11.4",
-        "16.0": "registry.suse.com/suse/mariadb:11.4",
-    }
-    # gosu was renamed to idexec from mariadb_version 10.11
-    gosu = "gosu" if OS_VERSION == "15.6" else "idexec"
     mariadb_old = DerivedContainer(
-        base=mariadb_old_images.get(OS_VERSION),
-        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}',
+        base="registry.suse.com/suse/mariadb:11.4",
         volume_mounts=mounts,
         extra_environment_variables=_DB_ENV,
     )

also, did you actually test the upgrade? it fails for me with OS_VERSION=16.0 tox -e mariadb -- -k upgrade

the new mariadb is not coming up:

DEBUG    pytest_container:container.py:1160 Launching container via: ['podman', 'run', '-d', '--cidfile=/tmp/dmueller/ab8708ba-2721-422a-a871-fc34c904cd73', '-e', 'MARIADB_USER=foo', '-e', 'MARIADB_PASSWORD=baz', '-e', 'MARIADB_DATABASE=bcitest', '-e', "MARIADB_ROOT_PASSWORD='88tpw-n!t-s$$cr`t!", '-e', 'MARIADB_AUTO_UPGRADE=1', '-v=/tmp/dmueller/pytest-of-dmueller/pytest-40/test_mariadb_upgrade_local_sus0:/var/lib/mysql:Z', '-it', 'registry.opensuse.org/devel/bci/16.0/containerfile/suse/mariadb:11.8']
DEBUG    pytest_container:container.py:1193 Started container with b9a58bbeff48368ed8420c430059324e5244c117f3a0422bce4e09c90e7a1bb4 at 2025-10-01 10:24:31.658486
DEBUG    testinfra:base.py:323 RUN CommandResult(backend=<testinfra.backend.podman.PodmanBackend object at 0x7f455c8316d0>, exit_status=1, command=b"podman exec b9a58bbeff48368ed8420c430059324e5244c117f3a0422bce4e09c90e7a1bb4 /bin/sh -c 'healthcheck.sh --connect'", _stdout=b'', _stderr=b"ERROR 2002 (HY000): Can't connect to local server through socket '/run/mysql/mysql.sock' (2)\nhealthcheck connect failed\n")
DEBUG    testinfra:base.py:323 RUN CommandResult(backend=<testinfra.backend.podman.PodmanBackend object at 0x7f455c8316d0>, exit_status=1, command=b"podman exec b9a58bbeff48368ed8420c430059324e5244c117f3a0422bce4e09c90e7a1bb4 /bin/sh -c 'healthcheck.sh --connect'", _stdout=b'', _stderr=b'healthcheck connect failed\n')
DEBUG    testinfra:base.py:323 RUN CommandResult(backend=<testinfra.backend.podman.PodmanBackend object at 0x7f455c8316d0>, exit_status=1, command=b"podman exec b9a58bbeff48368ed8420c430059324e5244c117f3a0422bce4e09c90e7a1bb4 /bin/sh -c 'healthcheck.sh --connect'", _stdout=b'', _stderr=b'healthcheck connect failed\n')
DEBUG    testinfra:base.py:323 RUN CommandResult(backend=<testinfra.backend.podman.PodmanBackend object at 0x7f455c8316d0>, exit_status=1, command=b"podman exec b9a58bbeff48368ed8420c430059324e5244c117f3a0422bce4e09c90e7a1bb4 /bin/sh -c 'healthcheck.sh --connect'", _stdout=b'', _stderr=b'healthcheck connect failed\n')
DEBUG    testinfra:base.py:323 RUN CommandResult(backend=<testinfra.backend.podman.PodmanBackend object at 0x7f455c8316d0>, exit_status=1, command=b"podman exec b9a58bbeff48368ed8420c430059324e5244c117f3a0422bce4e09c90e7a1bb4 /bin/sh -c 'healthcheck.sh --connect'", _stdout=b'', _stderr=b'healthcheck connect failed\n')

dirkmueller

see prev comment

rcmadhankumar · 2025-10-13T09:57:07Z

SLE 16 tests are passing for me.

madhan@localhost:~/repo/mysql_migration/BCI-tests> export OS_VERSION=16.0
madhan@localhost:~/repo/mysql_migration/BCI-tests> tox -e mariadb -- -k upgrade
mariadb: commands[0]> python -m pytest -vv tests/test_mariadb.py --junitxml=/home/madhan/repo/mysql_migration/BCI-tests/junit_mariadb.xml --pytest-container-log-level=debug -k upgrade
===================================================================================== test session starts ======================================================================================
platform linux -- Python 3.13.7, pytest-8.4.2, pluggy-1.6.0 -- /home/madhan/repo/mysql_migration/BCI-tests/.tox/mariadb/bin/python
cachedir: .tox/mariadb/.pytest_cache
rootdir: /home/madhan/repo/mysql_migration/BCI-tests
configfile: pyproject.toml
plugins: xdist-3.8.0, testinfra-10.2.2, rerunfailures-16.0.1, pytest_container-0.4.4
collected 88 items / 84 deselected / 4 selected                                                                                                                                                

tests/test_mariadb.py::test_mariadb_upgrade[local-suse/mariadb:10.11 from registry.opensuse.org/devel/bci/16.0/containerfile/suse/mariadb:10.11] SKIPPED (This container is not
available for 16.0, only for 15.6)                                                                                                                                                       [ 25%]
tests/test_mariadb.py::test_mariadb_upgrade[local-suse/mariadb:11.8 from registry.opensuse.org/devel/bci/16.0/containerfile/suse/mariadb:11.8_0] SKIPPED (This container is not
available for 16.0, only for 15.7)                                                                                                                                                       [ 50%]
tests/test_mariadb.py::test_mariadb_upgrade[local-suse/mariadb:11.8 from registry.opensuse.org/devel/bci/16.0/containerfile/suse/mariadb:11.8_1] PASSED                                  [ 75%]
tests/test_mariadb.py::test_mariadb_upgrade[local-suse/mariadb:latest from registry.opensuse.org/devel/bci/16.0/containerfile/suse/mariadb:latest] SKIPPED (This container is not
available for 16.0, only for tumbleweed)                                                                                                                                                 [100%]

------------------------------------------------------ generated xml file: /home/madhan/repo/mysql_migration/BCI-tests/junit_mariadb.xml -------------------------------------------------------
========================================================================= 1 passed, 3 skipped, 84 deselected in 32.56s =========================================================================
  mariadb: OK (32.82=setup[0.03]+cmd[32.79] seconds)
  congratulations :) (32.87 seconds)

dirkmueller · 2026-02-16T15:03:19Z

tox.ini

    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 []


please remove this part.

dirkmueller

see inline

dirkmueller reviewed Sep 22, 2025

View reviewed changes

tests/test_mariadb.py Outdated Show resolved Hide resolved

rcmadhankumar force-pushed the mariadb-migration branch 3 times, most recently from 370fe8c to 840c93d Compare September 29, 2025 14:04

dirkmueller reviewed Oct 1, 2025

View reviewed changes

dirkmueller requested changes Oct 1, 2025

View reviewed changes

rcmadhankumar force-pushed the mariadb-migration branch 2 times, most recently from 6fedd0c to c9b221d Compare October 13, 2025 09:02

dirkmueller reviewed Feb 16, 2026

View reviewed changes

dirkmueller requested changes Feb 16, 2026

View reviewed changes

rcmadhankumar force-pushed the mariadb-migration branch 3 times, most recently from c55a0aa to 97041ce Compare February 25, 2026 06:11

Added mariadb migration tests for OS_VERSION 15.7 and 16.0

82fee20

rcmadhankumar force-pushed the mariadb-migration branch from 97041ce to 82fee20 Compare February 25, 2026 06:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added mariadb migration tests for OS_VERSION 15.7 and 16.0#908

Added mariadb migration tests for OS_VERSION 15.7 and 16.0#908
rcmadhankumar wants to merge 1 commit intoSUSE:mainfrom
rcmadhankumar:mariadb-migration

rcmadhankumar commented Sep 22, 2025

Uh oh!

dirkmueller Sep 22, 2025

Uh oh!

rcmadhankumar Sep 29, 2025

Uh oh!

dirkmueller Oct 1, 2025

Uh oh!

rcmadhankumar Oct 13, 2025

Uh oh!

dirkmueller Feb 16, 2026

Uh oh!

Uh oh!

dirkmueller Oct 1, 2025

Uh oh!

rcmadhankumar Oct 13, 2025

Uh oh!

dirkmueller left a comment

Uh oh!

dirkmueller left a comment

Uh oh!

rcmadhankumar commented Oct 13, 2025

Uh oh!

dirkmueller Feb 16, 2026

Uh oh!

dirkmueller left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

rcmadhankumar commented Sep 22, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dirkmueller left a comment

Choose a reason for hiding this comment

Uh oh!

dirkmueller left a comment

Choose a reason for hiding this comment

Uh oh!

rcmadhankumar commented Oct 13, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dirkmueller left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants