fix mtr runner suites path

Author: RazvanLiviuVarzaru

configuration/builders/sequences/foundry/autobake.py

@@ -120,7 +120,11 @@ def deb(config: DockerConfig, repo_file_url: str):
     )
     sequence.add_step(
         InContainer(
-            ShellStep(command=RunPluginMTRSuite("/usr/share/mysql/mysql-test")),
+            ShellStep(
+                command=RunPluginMTRSuite(
+                    ["/usr/share/mariadb-test", "/usr/share/mysql/mysql-test"]
+                )
+            ),
             docker_environment=config,
         )
     )
@@ -170,7 +174,11 @@ def rpm(config: DockerConfig, repo_file_url: str):
     )
     sequence.add_step(
         InContainer(
-            ShellStep(command=RunPluginMTRSuite("/usr/share/mysql-test")),
+            ShellStep(
+                command=RunPluginMTRSuite(
+                    ["/usr/share/mariadb-test", "/usr/share/mysql-test"]
+                )
+            ),
             docker_environment=config,
         )
     )

configuration/steps/commands/foundry.py

@@ -43,25 +43,42 @@ class RunPluginMTRSuite(Command):
     # the plugin's fetched source (<plugin>.build/) that has a suite.opt --
     # copies them into the installed suite tree, and runs them. A plugin
     # with no MTR suite is skipped rather than failing the build.
-    def __init__(self, mtr_base_dir: str, workdir: PurePath = PurePath(".")):
-        self.mtr_base_dir = mtr_base_dir
+    def __init__(self, candidate_mtr_dirs: list[str], workdir: PurePath = PurePath(".")):
+        # candidate_mtr_dirs: possible install locations for
+        # mysql-test-run.pl, since the exact path varies across MariaDB
+        # package versions/layouts -- the first one that actually exists
+        # (post MariaDB-test/mariadb-test install) is used.
+        self.candidate_mtr_dirs = candidate_mtr_dirs
         super().__init__(name="Run plugin MTR suite", workdir=workdir, user="root")
 
     def as_cmd_arg(self) -> list[str]:
+        candidates = " ".join(self.candidate_mtr_dirs)
         return [
             "bash",
             "-exc",
             util.Interpolate(
                 f"""
 set -euo pipefail
 
+mtr_base_dir=""
+for candidate in {candidates}; do
+    if [ -f "$candidate/mysql-test-run.pl" ]; then
+        mtr_base_dir="$candidate"
+        break
+    fi
+done
+if [ -z "$mtr_base_dir" ]; then
+    echo "Could not find mysql-test-run.pl in any of: {candidates}" >&2
+    exit 1
+fi
+
 plugin_build="%(prop:plugin)s.build"
 suites=""
 for mt in $(find "$plugin_build" -type d -name mysql-test 2>/dev/null); do
     for d in "$mt"/*/ "$mt"/suite/*/; do
         [ -f "${{d}}suite.opt" ] || continue
         name=$(basename "$d")
-        cp -r "$d" "{self.mtr_base_dir}/suite/$name"
+        cp -r "$d" "$mtr_base_dir/suite/$name"
         suites="$suites,$name"
     done
 done
@@ -72,7 +89,7 @@ def as_cmd_arg(self) -> list[str]:
     exit 0
 fi
 
-perl {self.mtr_base_dir}/mysql-test-run.pl --suite="$suites" --user=root
+perl "$mtr_base_dir/mysql-test-run.pl" --suite="$suites" --user=root
 """
             ),
         ]