[container_bench] Refactor remote access and platform builders for cross-platform support

Signed-off-by: Jan Rodák <[email protected]>

Author: Honny1

projects/container_bench/testing/config.yaml

@@ -209,7 +209,6 @@ test:
     # - custom
     runtime: # Linux only
      - crun
-     - krun
      - runc
   capture_metrics:
     enabled: true

projects/container_bench/testing/platform_builders.py

@@ -1,5 +1,6 @@
 from abc import ABC, abstractmethod
 from config_manager import ConfigManager
+import shlex
 
 
 class PlatformCommandBuilder(ABC):
@@ -11,6 +12,38 @@ def build_env_command(self, env_dict):
     def build_service_start_script(self, service_name, start_command, binary_path):
         pass
 
+    @abstractmethod
+    def build_chdir_command(self, chdir):
+        pass
+
+    @abstractmethod
+    def build_rm_command(self, file_path, recursive=False):
+        pass
+
+    @abstractmethod
+    def build_mkdir_command(self, path):
+        pass
+
+    @abstractmethod
+    def build_exists_command(self, path):
+        pass
+
+    @abstractmethod
+    def get_shell_command(self):
+        pass
+
+    @abstractmethod
+    def build_entrypoint_script(self, env_cmd, chdir_cmd, cmd, verbose):
+        pass
+
+    @abstractmethod
+    def check_exists_result(self, ret):
+        pass
+
+
+def escape_powershell_single_quote(value):
+    return str(value).replace("'", "''")
+
 
 class WindowsCommandBuilder(PlatformCommandBuilder):
     def build_env_command(self, env_dict):
@@ -21,8 +54,7 @@ def build_env_command(self, env_dict):
         for k, v in env_dict.items():
             if v is None or v == "":
                 continue
-            env_commands.append(f"$env:{k}='{v}'")
-
+            env_commands.append(f"$env:{escape_powershell_single_quote(k)}='{escape_powershell_single_quote(v)}'")
         return "; ".join(env_commands) + ";"
 
     def build_service_start_script(self, service_name, start_command, binary_path):
@@ -66,18 +98,92 @@ def build_service_start_script(self, service_name, start_command, binary_path):
 Remove-Item "$env:USERPROFILE\\start_{service_name}.ps1" -Force -ErrorAction SilentlyContinue
 """
 
+    def build_chdir_command(self, chdir):
+        if chdir is None:
+            return "Set-Location $env:USERPROFILE"
+        return f"Set-Location '{escape_powershell_single_quote(chdir)}'"
+
+    def build_rm_command(self, file_path, recursive=False):
+        flags = "-Force -ErrorAction SilentlyContinue"
+        if recursive:
+            flags += " -Recurse"
+        return f"Remove-Item '{escape_powershell_single_quote(str(file_path))}' {flags}"
+
+    def build_mkdir_command(self, path):
+        return f"New-Item -ItemType Directory -Path '{escape_powershell_single_quote(str(path))}' -Force"
+
+    def build_exists_command(self, path):
+        return f"Test-Path '{escape_powershell_single_quote(str(path))}'"
+
+    def get_shell_command(self):
+        return "powershell.exe -Command -"
+
+    def build_entrypoint_script(self, env_cmd, chdir_cmd, cmd, verbose):
+        env_section = f"{env_cmd}\n" if env_cmd else ""
+        script = f"""
+$ErrorActionPreference = "Stop"
+
+{env_section}{chdir_cmd}
+
+{cmd}
+    """
+        if verbose:
+            script = f"$VerbosePreference = 'Continue'\n{script}"
+        return script
+
+    def check_exists_result(self, ret):
+        return ret.stdout and ret.stdout.strip().lower() == "true"
+
 
 class UnixCommandBuilder(PlatformCommandBuilder):
     def build_env_command(self, env_dict):
         if not env_dict:
             return ""
 
-        env_values = " ".join(f"'{k}={v}'" for k, v in env_dict.items() if v is not None and v != "")
-        return f"env {env_values}"
+        env_values = " ".join(f"{k}={shlex.quote(str(v))}" for k, v in env_dict.items() if v is not None and v != "")
+        return f"export {env_values}\n"
 
     def build_service_start_script(self, service_name, start_command, binary_path) -> str:
         return start_command
 
+    def build_chdir_command(self, chdir):
+        if chdir is None:
+            return "cd $HOME"
+        return f"cd '{shlex.quote(str(chdir))}'"
+
+    def build_rm_command(self, file_path, recursive=False):
+        flag = "-rf" if recursive else "-f"
+        return f"rm {flag} {shlex.quote(str(file_path))}"
+
+    def build_mkdir_command(self, path):
+        return f"mkdir -p {shlex.quote(str(path))}"
+
+    def build_exists_command(self, path):
+        return f"test -e {shlex.quote(str(path))}"
+
+    def get_shell_command(self):
+        return "bash"
+
+    def build_entrypoint_script(self, env_cmd, chdir_cmd, cmd, verbose):
+        script = f"""
+set -o pipefail
+set -o errexit
+set -o nounset
+set -o errtrace
+
+{env_cmd}
+
+{chdir_cmd}
+
+{cmd}
+    """
+        if verbose:
+            script = f"set -x\n{script}"
+        return script
+
+    def check_exists_result(self, ret):
+        return ret.returncode == 0
+
 
 class PlatformFactory:
     @staticmethod

projects/container_bench/testing/prepare.py

@@ -1,5 +1,4 @@
 import logging
-import shlex
 
 from container_engine import PodmanMachine, ContainerEngine, DockerDesktopMachine
 from config_manager import ConfigManager
@@ -8,19 +7,6 @@
 import utils
 
 
-def remove_remote_file(base_work_dir, file_path, recursive=False):
-    if ConfigManager.is_windows():
-        flags = "-Force -ErrorAction SilentlyContinue"
-        if recursive:
-            flags += " -Recurse"
-        cmd = f"Remove-Item '{file_path}' {flags}"
-    else:
-        flag = "-rf" if recursive else "-f"
-        cmd = f"rm {flag} {shlex.quote(str(file_path))}"
-
-    remote_access.run_with_ansible_ssh_conf(base_work_dir, cmd)
-
-
 def cleanup():
     cleanup_config = ConfigManager.get_extended_cleanup_config()
 
@@ -30,15 +16,15 @@ def cleanup():
         exec_time_script = utils.get_benchmark_script_path(base_work_dir)
         if remote_access.exists(exec_time_script):
             logging.info(f"Removing {exec_time_script} ...")
-            remove_remote_file(base_work_dir, exec_time_script)
+            remote_access.remove_remote_file(base_work_dir, exec_time_script)
 
     if cleanup_config['files_venv']:
         logging.info("Cleaning up virtual environment")
         base_work_dir = remote_access.prepare()
         venv_path = utils.get_benchmark_script_path(base_work_dir).parent / ".venv"
         if remote_access.exists(venv_path):
             logging.info(f"Removing {venv_path} ...")
-            remove_remote_file(base_work_dir, venv_path, recursive=True)
+            remote_access.remove_remote_file(base_work_dir, venv_path, recursive=True)
 
     try:
         cleanup_podman_platform()