DPDK: install path fixes for meson and Ubuntu 24.04

lisa/operating_system.py

@@ -2094,6 +2094,35 @@ def _initialize_package_installation(self) -> None:
                 "There are no enabled repositories defined in this image.",
             )
 
+    def _uninstall_packages(
+        self,
+        packages: List[str],
+        signed: bool = True,
+        timeout: int = 600,
+        extra_args: Optional[List[str]] = None,
+    ) -> None:
+        add_args = self._process_extra_package_args(extra_args)
+        command = f"zypper --non-interactive {add_args}"
+        if not signed:
+            command += " --no-gpg-checks "
+        command += f" rm {' '.join(packages)}"
+        self.wait_running_process("zypper")
+        install_result = self._node.execute(
+            command, shell=True, sudo=True, timeout=timeout
+        )
+        if install_result.exit_code in (1, 100):
+            raise LisaException(
+                f"Failed to install {packages}. exit_code: {install_result.exit_code}, "
+                f"stderr: {install_result.stderr}"
+            )
+        elif install_result.exit_code == 0:
+            self._log.debug(f"{packages} is/are installed successfully.")
+        else:
+            self._log.debug(
+                f"{packages} is/are installed."
+                " A system reboot or package manager restart might be required."
+            )
+
     def _install_packages(
         self,
         packages: List[str],

lisa/tools/meson.py

@@ -30,9 +30,25 @@ def can_install(self) -> bool:
     def _install(self) -> bool:
         posix_os: Posix = cast(Posix, self.node.os)
         # use pip to make sure we install a recent version
-        if (not posix_os.package_exists("meson")) or posix_os.get_package_information(
-            "meson", use_cached=False
-        ) < "0.52.0":
+
+        package_installed = ""
+        package_available = ""
+        for pkg in ["meson", "python3-meson"]:
+            if (
+                posix_os.package_exists(pkg)
+                and posix_os.get_package_information(pkg, use_cached=False) >= "0.52.0"
+            ):
+                package_installed = pkg
+                break
+            elif posix_os.is_package_in_repo(pkg):
+                package_available = pkg
+                break
+
+        if package_installed:
+            return self._check_exists()
+        if package_available:
+            posix_os.install_packages(package_available)
+        else:
             username = self.node.tools[Whoami].get_username()
             self.node.tools[Pip].install_packages("meson", install_to_user=True)
             # environment variables won't expand even when using shell=True :\
@@ -48,6 +64,7 @@ def _install(self) -> bool:
                 no_info_log=True,
                 no_error_log=True,
             )
+
         return self._check_exists()
 
     def setup(self, args: str, cwd: PurePath, build_dir: str = "build") -> PurePath:

microsoft/testsuites/dpdk/common.py

@@ -39,10 +39,12 @@ def __init__(
         matcher: Callable[[Posix], bool],
         packages: Optional[Sequence[Union[str, Tool, Type[Tool]]]] = None,
         stop_on_match: bool = False,
+        requires_reboot: bool = False,
     ) -> None:
         self.matcher = matcher
         self.packages = packages
         self.stop_on_match = stop_on_match
+        self.requires_reboot = requires_reboot
 
 
 class DependencyInstaller:
@@ -65,6 +67,10 @@ def install_required_packages(
         for requirement in self.requirements:
             if requirement.matcher(os) and requirement.packages:
                 packages += requirement.packages
+                if requirement.requires_reboot:
+                    os.install_packages(packages=packages, extra_args=extra_args)
+                    packages = []
+                    node.reboot()
                 if requirement.stop_on_match:
                     break
         os.install_packages(packages=packages, extra_args=extra_args)

microsoft/testsuites/dpdk/dpdktestpmd.py

@@ -63,6 +63,7 @@
             and bool(x.get_kernel_information().version >= "5.15.0")
             and x.is_package_in_repo("linux-modules-extra-azure"),
             packages=["linux-modules-extra-azure"],
+            requires_reboot=True,
         ),
         OsPackageDependencies(
             matcher=lambda x: isinstance(x, Debian),
@@ -226,7 +227,8 @@ def _setup_node(self) -> None:
         # which breaks when another tool checks for it's existence before building...
         # like cmake, meson, make, autoconf, etc.
         self._node.tools[Ninja].install()
-        self._node.tools[Pip].install_packages("pyelftools")
+        if not isinstance(self._os, Debian):
+            self._node.tools[Pip].install_packages("pyelftools")
 
     def _uninstall(self) -> None:
         # undo source installation (thanks ninja)