From 8f92db0e62475ededaedd70558d78bf44c0b1975 Mon Sep 17 00:00:00 2001 From: Lili Deng Date: Mon, 14 Oct 2024 13:33:14 +0800 Subject: [PATCH 1/2] skip installing packages when it is not specified --- lisa/transformers/script_file_transformer.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisa/transformers/script_file_transformer.py b/lisa/transformers/script_file_transformer.py index 6072d632a1..5ca05b462b 100644 --- a/lisa/transformers/script_file_transformer.py +++ b/lisa/transformers/script_file_transformer.py @@ -74,7 +74,8 @@ def _output_names(self) -> List[str]: def _internal_run(self) -> Dict[str, Any]: runbook: ScriptFileTransformerSchema = self.runbook - self._node.os.install_packages(runbook.dependent_packages) # type: ignore + if runbook.dependent_packages: + self._node.os.install_packages(runbook.dependent_packages) # type: ignore results: Dict[str, Any] = {} failed_scripts = [] From 3ec74c91024c54a4bfc569f3fc92a12d0e13079a Mon Sep 17 00:00:00 2001 From: Lili Deng Date: Mon, 14 Oct 2024 13:35:15 +0800 Subject: [PATCH 2/2] fix -6 option not available in some distro --- microsoft/testsuites/nested/common.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/microsoft/testsuites/nested/common.py b/microsoft/testsuites/nested/common.py index 0b8e68edf2..14d06e911c 100644 --- a/microsoft/testsuites/nested/common.py +++ b/microsoft/testsuites/nested/common.py @@ -38,7 +38,22 @@ def _create_cloud_init_iso( password: str, host_name: str = "l2vm", ) -> str: - cmd_result = host.execute(f"openssl passwd -6 {password}", sudo=True, shell=True) + cmd_result = host.execute( + f"openssl passwd -6 {password}", + sudo=True, + shell=True, + ) + # The expected exit code is 0, indicating success. + # If a non-zero exit code is encountered, try using the -1 option. + # Note: The -6 option may not be available in older versions. + if cmd_result.exit_code != 0: + cmd_result = host.execute( + f"openssl passwd -1 {password}", + sudo=True, + shell=True, + ) + if cmd_result.exit_code != 0: + raise LisaException("fail to run openssl command to convert password") user_data = { "users": [ "default",