From 54a17498d44341cbe819a684422ba2818d066200 Mon Sep 17 00:00:00 2001 From: Aditya Nagesh Date: Tue, 12 Nov 2024 15:20:36 +0530 Subject: [PATCH 1/3] Git Tool: Add support for .mbx patches Update apply method to accept .mbx files. These are generated by b4 tool. --- lisa/tools/git.py | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/lisa/tools/git.py b/lisa/tools/git.py index d1577f404e..a463d2fe63 100644 --- a/lisa/tools/git.py +++ b/lisa/tools/git.py @@ -191,14 +191,25 @@ def apply( cwd: pathlib.PurePath, patches: pathlib.PurePath, ) -> None: - result = self.run( - f"apply {patches}", - shell=True, - cwd=cwd, - force_run=True, - no_info_log=True, - no_error_log=True, - ) + file_extension = patches.suffix + if file_extension == ".mbx": + result = self.run( + f"am {patches}", + shell=True, + cwd=cwd, + force_run=True, + no_info_log=True, + no_error_log=True, + ) + else: + result = self.run( + f"apply {patches}", + shell=True, + cwd=cwd, + force_run=True, + no_info_log=True, + no_error_log=True, + ) result.assert_exit_code(message=f"failed on applying patches. {result.stdout}") def list_tags(self, cwd: pathlib.PurePath) -> List[str]: From 6557afef4108c29c3394ab5ece07a8795cca6fe7 Mon Sep 17 00:00:00 2001 From: Aditya Nagesh Date: Tue, 12 Nov 2024 15:15:51 +0530 Subject: [PATCH 2/3] Add B4 Tool --- lisa/tools/__init__.py | 2 ++ lisa/tools/b4.py | 54 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 lisa/tools/b4.py diff --git a/lisa/tools/__init__.py b/lisa/tools/__init__.py index 0516a6cae6..b9422e96bf 100644 --- a/lisa/tools/__init__.py +++ b/lisa/tools/__init__.py @@ -16,6 +16,7 @@ ) from .aria import Aria +from .b4 import B4 from .blkid import Blkid from .bzip2 import Bzip2 from .cargo import Cargo @@ -129,6 +130,7 @@ __all__ = [ "AptAddRepository", "Aria", + "B4", "Blkid", "Bzip2", "Cargo", diff --git a/lisa/tools/b4.py b/lisa/tools/b4.py new file mode 100644 index 0000000000..14b513d629 --- /dev/null +++ b/lisa/tools/b4.py @@ -0,0 +1,54 @@ +import pathlib +import re +from typing import List, Type + +from lisa.executable import Tool +from lisa.operating_system import Debian +from lisa.tools.git import Git +from lisa.tools.python import Pip +from lisa.util import LisaException, find_group_in_lines + + +class B4(Tool): + # Output log is of the form + # git am /mnt/code/linux/v2_20241029_xxx_offers.mbx + _output_file_pattern = re.compile( + r"^.*git.*/(?P[\w-]+\.mbx).*$", re.MULTILINE + ) + + @property + def command(self) -> str: + return "b4" + + @property + def dependencies(self) -> List[Type[Tool]]: + return [Git] + + @property + def can_install(self) -> bool: + return True + + def _install(self) -> bool: + if isinstance(self.node.os, Debian): + self.node.os.install_packages("b4") + installed = self._check_exists() + if not installed: + pip = self.node.tools[Pip] + pip.install_packages("b4", install_to_user=True) + return self._check_exists() + + def am( + self, message_id: str, output_dir: pathlib.PurePath, sudo: bool = False + ) -> pathlib.PurePath: + result = self.run( + f"am -o '{output_dir}' '{message_id}'", + force_run=True, + expected_exit_code=0, + sudo=sudo, + ) + filename = find_group_in_lines( + lines=result.stdout, pattern=self._output_file_pattern, single_line=False + ).get("filename") + if not filename: + raise LisaException("Failed to get filename from b4 am output") + return pathlib.PurePath(output_dir, filename) From a3f9480601d06bd69c54b4d1ea6edc09ae55976e Mon Sep 17 00:00:00 2001 From: Aditya Nagesh Date: Fri, 15 Nov 2024 15:52:15 +0530 Subject: [PATCH 3/3] Add b4 Kernel Source Modifier b4 patch modifier is a modifier for kernel source installer. It accepts Message_id and apply the .mbx file using git --- lisa/transformers/kernel_source_installer.py | 29 +++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/lisa/transformers/kernel_source_installer.py b/lisa/transformers/kernel_source_installer.py index 577e3975e3..161dca69c3 100644 --- a/lisa/transformers/kernel_source_installer.py +++ b/lisa/transformers/kernel_source_installer.py @@ -11,7 +11,7 @@ from lisa.base_tools import Mv from lisa.node import Node from lisa.operating_system import CBLMariner, Redhat, Ubuntu -from lisa.tools import Cp, Echo, Git, Make, Sed, Uname +from lisa.tools import B4, Cp, Echo, Git, Make, Sed, Uname from lisa.tools.gcc import Gcc from lisa.tools.lscpu import Lscpu from lisa.util import LisaException, field_metadata, subclasses @@ -75,6 +75,12 @@ class PatchModifierSchema(BaseModifierSchema): file_pattern: str = "*.patch" +@dataclass_json() +@dataclass +class B4PatchModifierSchema(BaseModifierSchema): + message_id: str = field(default="", metadata=field_metadata(required=True)) + + @dataclass_json() @dataclass class SourceInstallerSchema(BaseInstallerSchema): @@ -489,3 +495,24 @@ def _get_code_path(path: str, node: Node, default_name: str) -> PurePath: code_path = node.working_path / default_name return code_path + + +class B4PatchModifier(BaseModifier): + @classmethod + def type_name(cls) -> str: + return "b4_patch" + + @classmethod + def type_schema(cls) -> Type[schema.TypedSchema]: + return B4PatchModifierSchema + + def modify(self) -> None: + runbook: B4PatchModifierSchema = self.runbook + + git = self._node.tools[Git] + b4 = self._node.tools[B4] + + message_id = runbook.message_id + patch_file = b4.am(message_id=message_id, output_dir=self._code_path) + + git.apply(cwd=self._code_path, patches=patch_file)