From 9291ecea18001e7b79bf424c9cc5009856cf2109 Mon Sep 17 00:00:00 2001 From: jerry-553 <1007388420@qq.com> Date: Mon, 1 Apr 2024 14:39:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=A8sudo=E5=91=BD=E4=BB=A4=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E5=AE=89=E8=A3=85=E8=84=9A=E6=9C=AC=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/install_dependency/src/machine/machine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install_dependency/src/machine/machine.py b/tools/install_dependency/src/machine/machine.py index 2b171cb..311cf6d 100644 --- a/tools/install_dependency/src/machine/machine.py +++ b/tools/install_dependency/src/machine/machine.py @@ -229,7 +229,7 @@ class Machine: for shell_file in SHELL_FILE_LIST: sh_file_local_path = os.path.join(base_path("component"), component_name, shell_file) sh_file_remote_path = os.path.join("/tmp/", constant.DEPENDENCY_DIR, component_name + shell_file) - sh_cmd = f"bash {sh_file_remote_path} {remote_file_list[0]} {remote_file_list[1]}" + sh_cmd = f"sudo bash {sh_file_remote_path} {remote_file_list[0]} {remote_file_list[1]}" execute_output = ( self.transport_shell_file_and_execute( ssh_client, sftp_client, -- Gitee From 546adedfcd0d2c6efb26cf426426ecd05923bbe1 Mon Sep 17 00:00:00 2001 From: jerry-553 <1007388420@qq.com> Date: Mon, 1 Apr 2024 15:02:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8sudo=E5=91=BD=E4=BB=A4=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E5=AE=89=E8=A3=85=E8=84=9A=E6=9C=AC=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- component/LkpTests/install.sh | 4 ++-- tools/install_dependency/src/machine/machine.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/component/LkpTests/install.sh b/component/LkpTests/install.sh index 94ad9f6..d20c6b2 100644 --- a/component/LkpTests/install.sh +++ b/component/LkpTests/install.sh @@ -11,8 +11,8 @@ parser-3.1.2.1.gem parallel-1.22.1.gem minitest-5.15.0.gem i18n-1.12.0.gem gnupl concurrent-ruby-1.1.10.gem ci_reporter-2.0.0.gem bundler-2.2.33.gem builder-3.2.4.gem ast-2.4.2.gem activesupport-6.1.7.gem) function main() { - lkp_tar=$1 - gem_zip=$2 + lkp_tar=/tmp/devkitdependencies/lkp-tests.tar.gz + gem_zip=/tmp/devkitdependencies/gem_dependencies.zip if [[ ! -d /usr/share/gems/gems/gem_dependencies ]]; then unzip -d /usr/share/gems/gems ${gem_zip} fi diff --git a/tools/install_dependency/src/machine/machine.py b/tools/install_dependency/src/machine/machine.py index 311cf6d..d2b4610 100644 --- a/tools/install_dependency/src/machine/machine.py +++ b/tools/install_dependency/src/machine/machine.py @@ -229,7 +229,7 @@ class Machine: for shell_file in SHELL_FILE_LIST: sh_file_local_path = os.path.join(base_path("component"), component_name, shell_file) sh_file_remote_path = os.path.join("/tmp/", constant.DEPENDENCY_DIR, component_name + shell_file) - sh_cmd = f"sudo bash {sh_file_remote_path} {remote_file_list[0]} {remote_file_list[1]}" + sh_cmd = f"sudo bash {sh_file_remote_path}" execute_output = ( self.transport_shell_file_and_execute( ssh_client, sftp_client, -- Gitee From d29bc6a89fd118ab03f63a5c91cd1ff2cf743672 Mon Sep 17 00:00:00 2001 From: jerry-553 <1007388420@qq.com> Date: Mon, 1 Apr 2024 15:56:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?lkp=20=E5=AE=89=E8=A3=85=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/install_dependency/src/machine/machine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install_dependency/src/machine/machine.py b/tools/install_dependency/src/machine/machine.py index d2b4610..a39051f 100644 --- a/tools/install_dependency/src/machine/machine.py +++ b/tools/install_dependency/src/machine/machine.py @@ -229,7 +229,7 @@ class Machine: for shell_file in SHELL_FILE_LIST: sh_file_local_path = os.path.join(base_path("component"), component_name, shell_file) sh_file_remote_path = os.path.join("/tmp/", constant.DEPENDENCY_DIR, component_name + shell_file) - sh_cmd = f"sudo bash {sh_file_remote_path}" + sh_cmd = f"bash {sh_file_remote_path}" execute_output = ( self.transport_shell_file_and_execute( ssh_client, sftp_client, -- Gitee