diff --git a/component/DevKitCLI/check_install_result.sh b/component/DevKitCLI/check_install_result.sh index 85f5500295582ed98f6c61247801aab013dcd67c..c7a5c11c811fb0bacf7a9f1e704c8902aa98084b 100644 --- a/component/DevKitCLI/check_install_result.sh +++ b/component/DevKitCLI/check_install_result.sh @@ -1,7 +1,7 @@ #!/bin/bash devkit_path=$(which devkit) -if [[ ${devkit_path} == ${HOME}/.local/DevKit-CLI-24.0.RC1-Linux-Kunpeng/devkit ]]; then +if [[ ${devkit_path} == ${HOME}/.local/DevKit-CLI-24.0.RC2-Linux-Kunpeng/devkit ]]; then echo "true" else echo "false" diff --git a/component/DevKitCLI/install.sh b/component/DevKitCLI/install.sh index 424402ba92c742dcb227a0a8fe7ee67fa92efcbf..2843d6c17601def7d1771ea35867f52de22a8407 100644 --- a/component/DevKitCLI/install.sh +++ b/component/DevKitCLI/install.sh @@ -4,14 +4,14 @@ cd /tmp/devkitdependencies/ function main() { mkdir -p ${HOME}/.local - echo "Decompress DevKit-CLI-24.0.RC1-Linux-Kunpeng.tar.gz to ${HOME}/.local" - tar --no-same-owner -zxf /tmp/devkitdependencies/DevKit-CLI-24.0.RC1-Linux-Kunpeng.tar.gz -C ${HOME}/.local - echo "Decompress DevKit-CLI-24.0.RC1-Linux-Kunpeng.tar.gz to ${HOME}/.local finished." + echo "Decompress DevKit-CLI-24.0.RC2-Linux-Kunpeng.tar.gz to ${HOME}/.local" + tar --no-same-owner -zxf /tmp/devkitdependencies/DevKit-CLI-24.0.RC2-Linux-Kunpeng.tar.gz -C ${HOME}/.local + echo "Decompress DevKit-CLI-24.0.RC2-Linux-Kunpeng.tar.gz to ${HOME}/.local finished." echo "change ${HOME}/.bashrc" - sed -i '/DevKit-CLI-24.0.RC1-Linux-Kunpeng/d' ${HOME}/.bashrc + sed -i '/DevKit-CLI-24.0.RC2-Linux-Kunpeng/d' ${HOME}/.bashrc cat >> ${HOME}/.bashrc <<'EOF' -export PATH=${HOME}/.local/DevKit-CLI-24.0.RC1-Linux-Kunpeng:${PATH} +export PATH=${HOME}/.local/DevKit-CLI-24.0.RC2-Linux-Kunpeng:${PATH} EOF echo "source ${HOME}/.bashrc" diff --git a/component/DevKitWeb/devkit_installer/devkit_machine.py b/component/DevKitWeb/devkit_installer/devkit_machine.py index 5e38485b23088b593451441e3abf2284d50cda69..67afc1f85a1222d5152e8665fc5700ce18cecedb 100644 --- a/component/DevKitWeb/devkit_installer/devkit_machine.py +++ b/component/DevKitWeb/devkit_installer/devkit_machine.py @@ -109,15 +109,15 @@ class DevKitMachine: return True def devkit_install_by_cmd(self, server_ip, server_port="8086", http_port="8002", install_path="/opt", - plugin="java_perf", rpc_port=50051, all_plugins=False): + plugin="java_perf", rpc_port=50051, all_plugins=True): if all_plugins: plugin_param = "-a" else: plugin_param = f"--plugin={plugin}" cmd = (f"cd {self.install_dir} && sudo bash {self.install_file} {plugin_param} -d={install_path} " - f"--ip={server_ip} --map_ip={server_ip} -p={server_port} --http_port={http_port} " - f"--rpc_ip={server_ip} --rpc_port={rpc_port} --normal-install=1") + f"--ip={server_ip} -p={server_port} --http_port={http_port} " + f"--rpc_port={rpc_port} --normal-install=1") LOGGER.info(f"cmd: {cmd}") special_end = f"https://{server_ip}:{server_port}" diff --git a/component/DevKitWeb/devkit_installer/installer_command_line.py b/component/DevKitWeb/devkit_installer/installer_command_line.py index 9ea38bc51cb2e13cfdd2b67a16258da874fd891b..5e046f680ad6ab762f89dbb6300369dcf34c79b5 100644 --- a/component/DevKitWeb/devkit_installer/installer_command_line.py +++ b/component/DevKitWeb/devkit_installer/installer_command_line.py @@ -1,6 +1,6 @@ import argparse -PACKAGE_NAME = "DevKit-All-24.0.RC1-Linux-Kunpeng.tar.gz" +PACKAGE_NAME = "DevKit-All-24.0.RC2-Linux-Kunpeng.tar.gz" class CommandLine: diff --git a/tools/download_and_deploy/src/component_install/devkitcli_deploy.py b/tools/download_and_deploy/src/component_install/devkitcli_deploy.py index 71a049f4b0adfb5cf35b4941d5fdfee4e3348ec4..4d95b0930ba185c5083b1fd35227292b5ac3cec7 100644 --- a/tools/download_and_deploy/src/component_install/devkitcli_deploy.py +++ b/tools/download_and_deploy/src/component_install/devkitcli_deploy.py @@ -6,7 +6,7 @@ from component_install.deploy_base import DeployBase class DevkitCLIDeploy(DeployBase): component_name = "DevKitCLI" remote_file_list = [ - os.path.join("/tmp", constant.DEPENDENCY_DIR, "DevKit-CLI-24.0.RC1-Linux-Kunpeng.tar.gz"), + os.path.join("/tmp", constant.DEPENDENCY_DIR, "DevKit-CLI-24.0.RC2-Linux-Kunpeng.tar.gz"), os.path.join("/tmp", constant.DEPENDENCY_DIR, "DevKitCLI" + "install.sh"), os.path.join("/tmp", constant.DEPENDENCY_DIR, "DevKitCLI" + "check_install_result.sh"), ] diff --git a/tools/download_and_deploy/src/component_install/devkitweb_deploy.py b/tools/download_and_deploy/src/component_install/devkitweb_deploy.py index 03aadf00a49417609a71cee80054587cd57054e9..49f6517eb1ee3bed9958c8a04ce0555e611944fc 100644 --- a/tools/download_and_deploy/src/component_install/devkitweb_deploy.py +++ b/tools/download_and_deploy/src/component_install/devkitweb_deploy.py @@ -10,7 +10,7 @@ from utils import base_path, CHECK_OPT_SPACE_SUFFICIENT_FOR_PACKAGE, CHECK_SUDO_ class DevkitWebDeploy(DeployBase): component_name = "DevKitWeb" remote_file_list = [ - os.path.join("/opt", "DevKit-All-24.0.RC1-Linux-Kunpeng.tar.gz") + os.path.join("/opt", "DevKit-All-24.0.RC2-Linux-Kunpeng.tar.gz") ] @classmethod diff --git a/tools/download_and_deploy/src/download/download_config.py b/tools/download_and_deploy/src/download/download_config.py index 85a90d5c707871c2b16c84d98a037fe84b49bbe1..a9fdc378cc8193d92410a9d103ffc38cc044310d 100644 --- a/tools/download_and_deploy/src/download/download_config.py +++ b/tools/download_and_deploy/src/download/download_config.py @@ -39,14 +39,14 @@ A_FOT = { DevKitWeb = { "component_name": "DevKitWeb", - "file": "https://mirrors.huaweicloud.com/kunpeng/archive/DevKit/Packages/Kunpeng_DevKit/DevKit-All-24.0.RC1-Linux-Kunpeng.tar.gz", - "file_size": "1013920336", + "file": "https://mirrors.huaweicloud.com/kunpeng/archive/DevKit/Packages/Kunpeng_DevKit/DevKit-All-24.0.RC2-Linux-Kunpeng.tar.gz", + "file_size": "1028773350", } DevKitCLI = { "component_name": "DevKitCLI", - "file": "https://mirrors.huaweicloud.com/kunpeng/archive/DevKit/Packages/Kunpeng_DevKit/DevKit-CLI-24.0.RC1-Linux-Kunpeng.tar.gz", - "file_size": "413491454", + "file": "https://mirrors.huaweicloud.com/kunpeng/archive/DevKit/Packages/Kunpeng_DevKit/DevKit-CLI-24.0.RC2-Linux-Kunpeng.tar.gz", + "file_size": "437515661", }