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

[agent][deploy] - jxejpt;; fix srs part

Browse Source
This commit is contained in:
zeaslity
2024-09-27 14:34:09 +08:00
parent 25ce18638b
commit 327d12f789
24 changed files with 13727 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,16 +93,16 @@ public class TestBaseFuncScheduler {
List<BaseFunctionEnum> masterNodeProcedure = List.of(
BaseFunctionEnum.DISABLE_SWAP,
BaseFunctionEnum.DISABLE_SELINUX,
BaseFunctionEnum.MODIFY_SYSCONFIG,
BaseFunctionEnum.SHUTDOWN_FIREWALL,
BaseFunctionEnum.INSTALL_DOCKER_OFFLINE,
BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY,
BaseFunctionEnum.INSTALL_DOCKER_COMPOSE,
BaseFunctionEnum.MODIFY_DOCKER_CONFIG,
BaseFunctionEnum.INSTALL_HARBOR,
BaseFunctionEnum.INSTALL_NFS_SERVER_ONLINE
// BaseFunctionEnum.DISABLE_SWAP,
// BaseFunctionEnum.DISABLE_SELINUX,
// BaseFunctionEnum.MODIFY_SYSCONFIG,
// BaseFunctionEnum.SHUTDOWN_FIREWALL,
// BaseFunctionEnum.INSTALL_DOCKER_OFFLINE,
// BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY,
// BaseFunctionEnum.INSTALL_DOCKER_COMPOSE,
// BaseFunctionEnum.MODIFY_DOCKER_CONFIG,
// BaseFunctionEnum.INSTALL_HARBOR,
// BaseFunctionEnum.INSTALL_NFS_SERVER_ONLINE
);
List<BaseFunctionEnum> agentNodeProcedure = List.of(
@@ -111,10 +111,10 @@ public class TestBaseFuncScheduler {
BaseFunctionEnum.MODIFY_SYSCONFIG,
BaseFunctionEnum.DISABLE_SELINUX,
BaseFunctionEnum.SHUTDOWN_FIREWALL,
BaseFunctionEnum.INSTALL_DOCKER,
BaseFunctionEnum.INSTALL_DOCKER_OFFLINE,
BaseFunctionEnum.MODIFY_DOCKER_CONFIG,
BaseFunctionEnum.INSTALL_DOCKER_COMPOSE,
BaseFunctionEnum.INSTALL_NFS_ONLINE,
BaseFunctionEnum.MODIFY_DOCKER_CONFIG
BaseFunctionEnum.INSTALL_NFS_ONLINE
);
projectDeployContext.setMasterNodeBaseProcedure(masterNodeProcedure);
@@ -132,7 +132,7 @@ public class TestBaseFuncScheduler {
throw new RuntimeException(e);
}
baseFuncScheduler.runProcedure(projectDeployContext);
// baseFuncScheduler.runProcedure(projectDeployContext);
// 只能支持 带端口的HarborHost 默认为8033Chengdu-amd64-110
// harborFuncScheduler.runProcedure(projectDeployContext);
@@ -160,7 +160,7 @@ public class TestBaseFuncScheduler {
);
projectDeployContext.setMasterAppProcedure(appFunctionEnumList);
// appFuncScheduler.runProcedure(projectDeployContext);
appFuncScheduler.runProcedure(projectDeployContext);
masterNodeProcedure = List.of(BaseFunctionEnum.CHRONY_TO_MASTER);
@@ -169,7 +169,7 @@ public class TestBaseFuncScheduler {
projectDeployContext.setMasterNodeBaseProcedure(masterNodeProcedure);
projectDeployContext.setAgentNodeBaseProcedure(agentNodeProcedure);
// baseFuncScheduler.runProcedure(projectDeployContext);
baseFuncScheduler.runProcedure(projectDeployContext);
}
}

2
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-integration:5.7.0-32580-0923"
"harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:6.0.0-31369-yunnan-092602"
));
Boolean downloadAndCompressOnly = false;