zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[agent][deploy] - a

Browse Source
This commit is contained in:
zeaslity
2024-09-23 16:32:48 +08:00
parent 0d1ed24814
commit 5abae32231
44 changed files with 25982 additions and 12976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/main/java/io/wdd/func/auto/beans/BaseFunctionEnum.java
View File

@@ -46,6 +46,11 @@ public enum BaseFunctionEnum {
"安装Docker, 默认安装20.10.15版本"
),
INSTALL_DOCKER_OFFLINE(
"installDockerByOffline",
"安装Docker, 默认安装20.10.15版本"
),
INSTALL_DOCKER_COMPOSE(
"installDockerCompose",
"安装Docker Compose, 默认为2.18.0版本"

2
server/src/main/java/io/wdd/rpc/init/AcceptAgentInitInfo.java
View File

@@ -71,6 +71,8 @@ public class AcceptAgentInitInfo {
16);
put("Jinrongjie",
17);
put("Jiaxing",
18);
}};

18
server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java
View File

@@ -54,7 +54,9 @@ public class TestBaseFuncScheduler {
// Long projectServerId = 1788026824445317122L;// 新疆移动
// Long projectServerId = 1791639665955184642L;// 深圳公安
// Long projectServerId = 1795703135172485122L;// 北京通感
Long projectServerId = 1826162388894871554L; // 江苏南通二级平台 8-21
// Long projectServerId = 1826162388894871554L; // 江苏南通二级平台 8-21
// Long projectServerId = 1829348851302887425L; // 云南二级平台 08-30
Long projectServerId = 1838118730059444225L; //江西通感二级平台 9-23
// Long projectServerId = 1773619219367120898L; // 内网35-71项目
@@ -68,7 +70,9 @@ public class TestBaseFuncScheduler {
// String masterNodeServerName = "Chengdu-amd64-14"; // 新疆移动
// String masterNodeServerName = "Local-amd64-251"; // 新疆移动
// String masterNodeServerName = "Chengdu-amd64-200"; // 北京通感
String masterNodeServerName = "Jinrongjie-amd64-056"; // 江苏南通二级平台
// String masterNodeServerName = "Jinrongjie-amd64-056"; // 江苏南通二级平台
// String masterNodeServerName = "Shanghai-amd64-014"; // 云南二级平台
String masterNodeServerName = "Jiaxing-amd64-135"; // 江西通感二级平台 9-23
// String masterNodeServerName = "Ziyang-amd64-61"; // 资阳公安
ProjectServerVO projectServerVO = coreProjectServerService.projectServerOne(projectServerId);
@@ -89,9 +93,9 @@ public class TestBaseFuncScheduler {
List<BaseFunctionEnum> masterNodeProcedure = List.of(
// BaseFunctionEnum.DISABLE_SWAP,
// BaseFunctionEnum.DISABLE_SELINUX,
// BaseFunctionEnum.MODIFY_SYSCONFIG,
BaseFunctionEnum.DISABLE_SWAP,
BaseFunctionEnum.DISABLE_SELINUX,
BaseFunctionEnum.MODIFY_SYSCONFIG,
BaseFunctionEnum.SHUTDOWN_FIREWALL,
BaseFunctionEnum.INSTALL_DOCKER,
BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY,
@@ -128,7 +132,7 @@ public class TestBaseFuncScheduler {
throw new RuntimeException(e);
}
// baseFuncScheduler.runProcedure(projectDeployContext);
baseFuncScheduler.runProcedure(projectDeployContext);
// 只能支持 带端口的HarborHost 默认为8033Chengdu-amd64-110
// harborFuncScheduler.runProcedure(projectDeployContext);
@@ -165,7 +169,7 @@ public class TestBaseFuncScheduler {
projectDeployContext.setMasterNodeBaseProcedure(masterNodeProcedure);
projectDeployContext.setAgentNodeBaseProcedure(agentNodeProcedure);
baseFuncScheduler.runProcedure(projectDeployContext);
// baseFuncScheduler.runProcedure(projectDeployContext);
}
}

5
server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java
View File

@@ -42,7 +42,7 @@ public class TestImageSyncScheduler {
));
ArrayList<String> ImageFullNameList = new ArrayList<>(List.of(
"harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.7.0-31369-yunnan-082301"
"harbor.cdcyy.com.cn/cmii/cmii-uav-integration:5.7.0-32580-0923"
));
Boolean downloadAndCompressOnly = false;
@@ -52,6 +52,7 @@ public class TestImageSyncScheduler {
// String projectNamespace = "jlyd"; // 吉林移动
// String projectNamespace = "jxyd"; // 吉林移动
String projectNamespace = "xmyd"; // 厦门移动
// String projectNamespace = "ynejpt"; // 云南二级平台
// String innerWorkerAgentName = "Chengdu-amd64-65-lapwdd"; //wdd
String innerWorkerAgentName = "Chengdu-amd64-071-ed6e2b7f"; //prod
@@ -101,7 +102,7 @@ public class TestImageSyncScheduler {
));
ArrayList<String> ImageFullNameList = new ArrayList<>(List.of(
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform:5.3.0-cqly-042901"
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform:5.8.0-jlyd-091301"
));
Boolean downloadAndCompressOnly = true;