From 7c7cb0e178be601cecfb5df3318e655e3856d11c Mon Sep 17 00:00:00 2001
From: cc <18856836718@163.com>
Date: Mon, 1 Apr 2024 16:53:10 +0800
Subject: [PATCH] =?UTF-8?q?tar=E5=91=BD=E4=BB=A4=E4=B8=8D=E6=8B=A6?=
 =?UTF-8?q?=E6=88=AA=E5=AE=89=E8=A3=85=E6=9C=AC=E5=9C=B0=E9=95=9C=E5=83=8F?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=20=E6=9C=AC=E6=9C=BA=E9=95=9C?=
 =?UTF-8?q?=E5=83=8F=E6=8C=82=E8=BD=BD=E5=AE=8C=E5=B0=B1=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=20tar=20perf=20lkp=E7=9B=B8=E5=85=B3=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 component/OpenEulerMirrorISO/check_install_result.sh | 2 +-
 tools/install_dependency/src/machine/machine.py      | 6 +++---
 tools/install_dependency/src/utils.py                | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/component/OpenEulerMirrorISO/check_install_result.sh b/component/OpenEulerMirrorISO/check_install_result.sh
index 9ad9b44..65dd84d 100644
--- a/component/OpenEulerMirrorISO/check_install_result.sh
+++ b/component/OpenEulerMirrorISO/check_install_result.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-yum install git -y >/dev/null 2>&1
+sudo yum install tar perf git wget rubygems -y >/dev/null 2>&1
 if [[ "$?" == 0 ]]; then
     echo "true"
 else
diff --git a/tools/install_dependency/src/machine/machine.py b/tools/install_dependency/src/machine/machine.py
index 2b171cb..590b038 100644
--- a/tools/install_dependency/src/machine/machine.py
+++ b/tools/install_dependency/src/machine/machine.py
@@ -13,7 +13,7 @@ from exception.connect_exception import (CreatePkeyFailedException, ConnectRemot
                                          NotMatchedMachineTypeException)
 from download.download_utils import component_collection_map
 from utils import (base_path, validate_path, MKDIR_TMP_DEVKITDEPENDENCIES_CMD,
-                   CHECK_TAR_AVAILABLE_CMD, YUM_INSTALL_LKP_DEPENDENCIES_CMD,
+                   CHECK_TAR_AVAILABLE_CMD, CHECK_PERF_AVAILABLE_CMD, YUM_INSTALL_LKP_DEPENDENCIES_CMD,
                    CHECK_HOME_SPACE_SUFFICIENT_FOR_MIRROR, CHECK_TMP_SPACE_SUFFICIENT_FOR_PACKAGE,
                    CHECK_MIRROR_INSTALL_STATUS, PROMPT_MAP)
 
@@ -143,7 +143,6 @@ class Machine:
             "UnOpenEulerMirrorISO": self.undeploy_iso_handle,
             "A-FOT": self.install_a_fot,
         }
-        self._remote_exec_command(CHECK_TAR_AVAILABLE_CMD, ssh_client)
         self._remote_exec_command(MKDIR_TMP_DEVKITDEPENDENCIES_CMD, ssh_client)
         self._remote_exec_command(CHECK_TMP_SPACE_SUFFICIENT_FOR_PACKAGE, ssh_client)
         return component_name_to_func_dict.get(component_name)(component_name, sftp_client, ssh_client)
@@ -172,7 +171,7 @@ class Machine:
         self.clear_tmp_file_at_remote_machine(ssh_client, remote_file_list)
 
     def install_a_fot(self, component_name, sftp_client, ssh_client):
-        self._remote_exec_command("sudo yum install -y perf", ssh_client)
+        self._remote_exec_command(CHECK_PERF_AVAILABLE_CMD, ssh_client)
         saved_path = os.path.join(constant.DEFAULT_PATH, "a-fot.tar.gz")
         remote_file = os.path.abspath(os.path.join('/tmp', saved_path))
         LOGGER.debug(f"Transport local_file: {saved_path} to remote machine {self.ip} "
@@ -323,6 +322,7 @@ class Machine:
         self.clear_tmp_file_at_remote_machine(ssh_client, remote_file_list)
 
     def default_install_component_handle(self, component_name, sftp_client, ssh_client):
+        self._remote_exec_command(CHECK_TAR_AVAILABLE_CMD, ssh_client)
         self._remote_exec_command(MKDIR_TMP_DEVKITDEPENDENCIES_CMD, ssh_client)
         self._remote_exec_command(CHECK_TMP_SPACE_SUFFICIENT_FOR_PACKAGE, ssh_client)
 
diff --git a/tools/install_dependency/src/utils.py b/tools/install_dependency/src/utils.py
index 89df579..7c1d294 100644
--- a/tools/install_dependency/src/utils.py
+++ b/tools/install_dependency/src/utils.py
@@ -4,6 +4,7 @@ import yaml
 from constant import ROLE_LIST, ROLE_COMPONENT
 
 CHECK_TAR_AVAILABLE_CMD = "which tar"
+CHECK_PERF_AVAILABLE_CMD = "which perf"
 MKDIR_TMP_DEVKITDEPENDENCIES_CMD = "mkdir -p /tmp/devkitdependencies"
 YUM_INSTALL_LKP_DEPENDENCIES_CMD = "sudo yum install -y git wget rubygems"
 CHECK_HOME_SPACE_SUFFICIENT_FOR_MIRROR = "[[ $(df -m /home | awk 'NR==2' | awk '{print $4}') -gt 17*1024 ]]"
@@ -12,6 +13,7 @@ CHECK_MIRROR_INSTALL_STATUS = "test -d /etc/yum.repos.d/yum.repos.backup"
 
 PROMPT_MAP = {
     CHECK_TAR_AVAILABLE_CMD: "'tar' command not available.",
+    CHECK_PERF_AVAILABLE_CMD: "'perf' command not available.",
     MKDIR_TMP_DEVKITDEPENDENCIES_CMD: "Directory /tmp/devkitdependencies not exists.",
     YUM_INSTALL_LKP_DEPENDENCIES_CMD: "Yum install lkp dependencies failed.",
     CHECK_HOME_SPACE_SUFFICIENT_FOR_MIRROR: "Machine /home space not sufficient for mirror.",
-- 
Gitee