diff --git a/README.md b/README.md index 0ae4d658e684a02b4db8b99045d5fe6f343d4499..a5acac89f6cef9c9eaafb0f0e98fd54a99238b9f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Pipeline solution to support building, deploying and automating any software project on Kunpeng Architecture #### 软件架构 -支持鲲鹏架构下openEuler系操作系统 +支持x86/鲲鹏多样性算力下openEuler系操作系统 #### 使用说明 ##### Jenkins及Gitlab流水线安装部署指导 diff --git a/tools/install_dependency/src/constant.py b/tools/install_dependency/src/constant.py index 2929bf04910bcb7e858dbf6ec11516da6e62fc34..c58f2795cfb1cc496e4defbdd947f963b3b19c1a 100644 --- a/tools/install_dependency/src/constant.py +++ b/tools/install_dependency/src/constant.py @@ -13,7 +13,7 @@ DEPENDENCY_DIR = "devkitdependencies" INSTRUCTION = "instruction" ROLE_COMPONENT = { - SCANNER: ["BiShengJDK17"], + SCANNER: ["BiShengJDK17", "DevKitCLI"], C_BUIDLER: ["GCCforOpenEuler", "BiShengCompiler", "BiShengJDK17", "A-FOT", "NonInvasiveSwitching"], JAVA_BUILDER: ["BiShengJDK17", "BiShengJDK8"], EXECUTOR: ["BiShengJDK17", "LkpTests"], diff --git a/tools/install_dependency/src/download/download_config.py b/tools/install_dependency/src/download/download_config.py index df28f5a0f227948160c30bcad04335efe9632aca..2964c325829f44343c38ade5aaf3c9bd6610ac0a 100644 --- a/tools/install_dependency/src/download/download_config.py +++ b/tools/install_dependency/src/download/download_config.py @@ -38,6 +38,11 @@ DevKitWeb = { "file": "https://kunpeng-repo.obs.cn-north-4.myhuaweicloud.com/Porting%20Advisor/Porting%20Advisor%2023.0.T30/DevKit-All-23.0.T30-Linux-Kunpeng.tar.gz", } +DevKitCLI = { + "component_name": "DevKitCLI", + "file": "https://www.hikunpeng.com/", +} + OpenEuler_2003_LTS = { "component_name": "openEuler_2003_LTS", diff --git a/tools/install_dependency/src/download/download_utils.py b/tools/install_dependency/src/download/download_utils.py index fd224b525ee06d3936ca5857d8f5a01896e0c060..42022c0842d95a59a225952d57c5a2e6ca784e94 100644 --- a/tools/install_dependency/src/download/download_utils.py +++ b/tools/install_dependency/src/download/download_utils.py @@ -87,6 +87,13 @@ component_collection_map = { SAVE_PATH: f"{os.path.join(DEFAULT_PATH, download_config.DevKitWeb.get(FILE).split('/')[-1])}", }, }, + + "DevKitCLI": { + "download file": { + URL: f"{download_config.DevKitCLI.get(FILE)}", + SAVE_PATH: f"{os.path.join(DEFAULT_PATH, 'DevKit-CLI-24.0.RC1-Linux-Kunpeng.tar.gz')}", + } + }, } diff --git a/tools/install_dependency/src/machine/machine.py b/tools/install_dependency/src/machine/machine.py index 43bce193073f6e279e215a7bf436528b5b4a914a..ed67933495394a13c63dddbbe99fbd46e6f5f97f 100644 --- a/tools/install_dependency/src/machine/machine.py +++ b/tools/install_dependency/src/machine/machine.py @@ -139,6 +139,7 @@ class Machine: "LkpTests": self.lkptest_install_component_handle, "NonInvasiveSwitching": self.nis_install_component_handle, "DevKitWeb": self.devkitweb_install_component_handle, + "DevKitCLI": self.default_install_component_handle, "OpenEulerMirrorISO": self.deploy_iso_handle, "UnOpenEulerMirrorISO": self.undeploy_iso_handle, "A-FOT": self.install_a_fot,