try apt; try standard paths for mtr plugin suites

Author: RazvanLiviuVarzaru

configuration/steps/commands/foundry.py

@@ -43,14 +43,8 @@ def as_cmd_arg(self) -> list[str]:
 done
 """
         else:
-            # apt-get/apt's dependency resolver can silently refuse to add a
-            # local .deb to its changeset when the filename contains a ":"
-            # (as ours does, from the Debian epoch) -- dpkg -i installs the
-            # file directly with no such ambiguity, then apt -f pulls in
-            # anything it couldn't resolve on its own.
             script = """
-dpkg -i ./*.deb || true
-apt-get install -f -y
+apt-get install -y ./*.deb
 for f in ./*.deb; do
     pkg=$(dpkg-deb -f "$f" Package)
     dpkg -s "$pkg" >/dev/null 2>&1 || { echo "Package $pkg from $f was not installed" >&2; exit 1; }
@@ -60,18 +54,18 @@ def as_cmd_arg(self) -> list[str]:
 
 
 class RunPluginMTRSuite(Command):
-    # MARIADB_ADD_PLUGIN's INSTALL_MYSQL_TEST (cmake/plugin.cmake) always
-    # installs a plugin's mysql-test/ contents -- suite/ included -- under
-    # <mtr_base_dir>/plugin/<X>/, so the suite ends up at
-    # plugin/<X>/suite/<name>, not plugin/<X>/<name>. <X> is the plugin's own
-    # CMake project/target name, which isn't always the same as the Foundry
+    # MARIADB_ADD_PLUGIN's INSTALL_MYSQL_TEST (cmake/plugin.cmake) installs
+    # a plugin's mysql-test suite(s) under <mtr_base_dir>/plugin/<X>/<name>/,
+    # e.g. plugin/rocksdb/rocksdb/suite.pm or
+    # plugin/columnstore/columnstore/suite.pm. <X> is the plugin's own CMake
+    # project/target name, which isn't always the same as the Foundry
     # "plugin" property (e.g. tidesql's CMake target is actually "tidesdb"),
     # so rather than guess it, discover whatever actually landed under
-    # plugin/*/suite/* -- exactly one plugin gets installed per build.
-    # mtr_cases.pm's short-name lookup for `--suite=NAME` doesn't account for
-    # the extra suite/ level either way, so we pass MTR the full relative
-    # path instead, which it accepts directly. A plugin with no suite/ dir
-    # at all is skipped rather than failing the build.
+    # plugin/*/*/suite.pm -- exactly one plugin gets installed per build.
+    # mtr_cases.pm resolves a bare suite name (e.g. "rocksdb") by searching
+    # under plugin/*/ itself, so passing just the suite's short name is
+    # enough -- no need to spell out the plugin/<X>/ prefix. A plugin with no
+    # suite.pm anywhere under it is skipped rather than failing the build.
     def __init__(self, package_type: str, workdir: PurePath = PurePath(".")):
         self.package_type = package_type
         super().__init__(name="Run plugin MTR suite", workdir=workdir, user="root")
@@ -101,14 +95,10 @@ def as_cmd_arg(self) -> list[str]:
 mtr_base_dir=$(dirname "$mtr_script")
 
 suites=""
-for suite_dir in "$mtr_base_dir"/plugin/*/suite; do
-    [ -d "$suite_dir" ] || continue
-    plugin_dir=$(basename "$(dirname "$suite_dir")")
-    for d in "$suite_dir"/*/; do
-        [ -d "$d" ] || continue
-        name=$(basename "$d")
-        suites="$suites,plugin/$plugin_dir/suite/$name"
-    done
+for suite_pm in "$mtr_base_dir"/plugin/*/*/suite.pm; do
+    [ -f "$suite_pm" ] || continue
+    name=$(basename "$(dirname "$suite_pm")")
+    suites="$suites,$name"
 done
 suites=$(echo "$suites" | sed 's/^,//')