From 38faf22c0669898351f1d546e0a0894fde74f833 Mon Sep 17 00:00:00 2001 From: pan <601760354@163.com> Date: Wed, 27 Mar 2024 19:52:34 +0800 Subject: [PATCH] =?UTF-8?q?builder=E6=8B=86=E5=88=86=E6=88=90java=20builde?= =?UTF-8?q?r=E5=92=8Cc=20cpp=20builder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...67\350\257\264\346\230\216\346\226\207\346\241\243.md" | 6 ++++-- tools/install_dependency/config/machine.yaml | 4 +++- tools/install_dependency/src/constant.py | 8 +++++--- tools/install_dependency/src/handler/base_yaml_check.py | 3 ++- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git "a/document/\346\211\271\351\207\217\351\203\250\347\275\262\345\267\245\345\205\267/\346\211\271\351\207\217\351\203\250\347\275\262\345\267\245\345\205\267\345\222\214\344\270\200\351\224\256\344\270\213\350\275\275\345\267\245\345\205\267\350\257\264\346\230\216\346\226\207\346\241\243.md" "b/document/\346\211\271\351\207\217\351\203\250\347\275\262\345\267\245\345\205\267/\346\211\271\351\207\217\351\203\250\347\275\262\345\267\245\345\205\267\345\222\214\344\270\200\351\224\256\344\270\213\350\275\275\345\267\245\345\205\267\350\257\264\346\230\216\346\226\207\346\241\243.md" index e3ea14d..ddddc28 100644 --- "a/document/\346\211\271\351\207\217\351\203\250\347\275\262\345\267\245\345\205\267/\346\211\271\351\207\217\351\203\250\347\275\262\345\267\245\345\205\267\345\222\214\344\270\200\351\224\256\344\270\213\350\275\275\345\267\245\345\205\267\350\257\264\346\230\216\346\226\207\346\241\243.md" +++ "b/document/\346\211\271\351\207\217\351\203\250\347\275\262\345\267\245\345\205\267/\346\211\271\351\207\217\351\203\250\347\275\262\345\267\245\345\205\267\345\222\214\344\270\200\351\224\256\344\270\213\350\275\275\345\267\245\345\205\267\350\257\264\346\230\216\346\226\207\346\241\243.md" @@ -25,7 +25,9 @@ scanner: - 192.168.0.1 - 192.168.0.2 - 192.168.0.3 -builder: +java_builder: + - 192.168.0.1 +c_cpp_buidler: - 192.168.0.1 executor: - 192.168.0.1 @@ -35,7 +37,7 @@ devkit: 其中，**`user`** 需填写本结点至其他结点配置免密的用户名，**`pkey`** 为配置免密所用公钥对应的私钥路径。 -**`scanner`**，**`builder`**，**`executor`**，**`devkit`** 分别对应用户的扫描机，构建机，执行机，devkit部署机器 ，需以yaml列表的形式输入各角色机器对应的ip。 +**`scanner`**，**`java_builder`**，**`c_cpp_builder`**, **`executor`**，**`devkit`** 分别对应用户的扫描机，Java构建机，C/CPP构建机，执行机，devkit部署机器 ，需以yaml列表的形式输入各角色机器对应的ip。 - 生成公私钥对的命令为： diff --git a/tools/install_dependency/config/machine.yaml b/tools/install_dependency/config/machine.yaml index 6566911..709cc95 100644 --- a/tools/install_dependency/config/machine.yaml +++ b/tools/install_dependency/config/machine.yaml @@ -4,8 +4,10 @@ scanner: - 192.168.0.1 - 192.168.0.2 - 192.168.0.3 -builder: +java_builder: - 192.168.0.1 +c_cpp_builder: + - 192.168.0.2 executor: - 192.168.0.1 devkit: diff --git a/tools/install_dependency/src/constant.py b/tools/install_dependency/src/constant.py index 44aa346..2a4e924 100644 --- a/tools/install_dependency/src/constant.py +++ b/tools/install_dependency/src/constant.py @@ -2,7 +2,8 @@ USER = "user" PKEY = "pkey" PASSWORD = "password" SCANNER = "scanner" -BUILDER = "builder" +JAVA_BUILDER = "java_builder" +C_BUIDLER = "c_cpp_buidler" EXECUTOR = "executor" DEVKIT = "devkit" MACHINE = "machine" @@ -13,11 +14,12 @@ INSTRUCTION = "instruction" ROLE_COMPONENT = { SCANNER: ["BiShengJDK17"], - BUILDER: ["GCCforOpenEuler", "BiShengCompiler", "BiShengJDK17", "BiShengJDK8"], + C_BUIDLER: ["GCCforOpenEuler", "BiShengCompiler", "BiShengJDK17"], + JAVA_BUILDER: ["BiShengJDK17", "BiShengJDK8"], EXECUTOR: ["BiShengJDK17", "LkpTests"] } -ROLE_LIST = [SCANNER, BUILDER, EXECUTOR] +ROLE_LIST = [SCANNER, C_BUIDLER, JAVA_BUILDER, EXECUTOR] FILE = "file" SHA256 = "sha256" diff --git a/tools/install_dependency/src/handler/base_yaml_check.py b/tools/install_dependency/src/handler/base_yaml_check.py index eac596c..1f9d387 100644 --- a/tools/install_dependency/src/handler/base_yaml_check.py +++ b/tools/install_dependency/src/handler/base_yaml_check.py @@ -8,7 +8,8 @@ from constant import ROLE_LIST LOGGER = logging.getLogger("install_dependency") MIN_SET = (constant.USER, constant.PKEY, constant.INSTRUCTION) MAX_SET = (constant.USER, constant.PKEY, constant.PASSWORD, - constant.SCANNER, constant.BUILDER, constant.EXECUTOR, constant.DEVKIT, constant.INSTRUCTION) + constant.SCANNER, constant.JAVA_BUILDER, constant.C_BUIDLER, constant.EXECUTOR, + constant.DEVKIT, constant.INSTRUCTION) class BaseCheck(Handler): -- Gitee