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

[ Cmii ] [ Operator ] - bug fix of bgtg

Browse Source
This commit is contained in:
zeaslity
2024-04-12 15:10:20 +08:00
parent a21b113340
commit 866220f2e4
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
agent-go/a_executor/BaseFunction.go
View File

@@ -718,10 +718,7 @@ func (op *AgentOsOperator) installDockerExec(args []string) (bool, []string) {
} }
// look for specific docker-version to install // look for specific docker-version to install
ok, log4 := AllCommandExecutor([]string{"apt-get", "update"}) AllCommandExecutor([]string{"apt-get", "update"})
if !ok {
return false, append(log4, "apt-get update 失败！")
}
// 补充参数 // 补充参数
if args == nil { if args == nil {

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

@@ -50,7 +50,8 @@ public class TestBaseFuncScheduler {
// Long projectServerId = 1764575895186030593L;// 上海雷视联动 // Long projectServerId = 1764575895186030593L;// 上海雷视联动
// Long projectServerId = 1777152043483353089L;// 吉林移动 // Long projectServerId = 1777152043483353089L;// 吉林移动
// Long projectServerId = 1765654823726669826L;// 资阳公安 // Long projectServerId = 1765654823726669826L;// 资阳公安
Long projectServerId = 1773619219367120898L; // 内网35-71项目 Long projectServerId = 1778681124701483009L;// 北京通感
// Long projectServerId = 1773619219367120898L; // 内网35-71项目
projectDeployContext.setProjectId(projectServerId); projectDeployContext.setProjectId(projectServerId);
@@ -58,7 +59,8 @@ public class TestBaseFuncScheduler {
// String masterNodeServerName = "Shanghai-amd64-09"; // cgga // String masterNodeServerName = "Shanghai-amd64-09"; // cgga
// String masterNodeServerName = "Chengdu-amd64-51"; // 吉林移动 // String masterNodeServerName = "Chengdu-amd64-51"; // 吉林移动
String masterNodeServerName = "JiLin-amd64-01"; // 吉林移动 // String masterNodeServerName = "Chengdu-amd64-51"; // 吉林移动
String masterNodeServerName = "Chengdu-amd64-10"; // 北京通感
// String masterNodeServerName = "Ziyang-amd64-61"; // 资阳公安 // String masterNodeServerName = "Ziyang-amd64-61"; // 资阳公安
ProjectServerVO projectServerVO = coreProjectServerService.projectServerOne(projectServerId); ProjectServerVO projectServerVO = coreProjectServerService.projectServerOne(projectServerId);
@@ -83,20 +85,20 @@ public class TestBaseFuncScheduler {
BaseFunctionEnum.DISABLE_SELINUX, BaseFunctionEnum.DISABLE_SELINUX,
BaseFunctionEnum.SHUTDOWN_FIREWALL, BaseFunctionEnum.SHUTDOWN_FIREWALL,
BaseFunctionEnum.INSTALL_DOCKER, BaseFunctionEnum.INSTALL_DOCKER,
// BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY, BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY,
BaseFunctionEnum.INSTALL_DOCKER_COMPOSE BaseFunctionEnum.INSTALL_DOCKER_COMPOSE,
// BaseFunctionEnum.MODIFY_DOCKER_CONFIG BaseFunctionEnum.MODIFY_DOCKER_CONFIG,
// BaseFunctionEnum.INSTALL_HARBOR BaseFunctionEnum.INSTALL_HARBOR
); );
List<BaseFunctionEnum> agentNodeProcedure = List.of( List<BaseFunctionEnum> agentNodeProcedure = List.of(
// BaseFunctionEnum.DISABLE_SWAP, BaseFunctionEnum.DISABLE_SWAP,
// BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY, BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY,
// BaseFunctionEnum.DISABLE_SELINUX, BaseFunctionEnum.DISABLE_SELINUX,
// BaseFunctionEnum.SHUTDOWN_FIREWALL, BaseFunctionEnum.SHUTDOWN_FIREWALL,
// BaseFunctionEnum.INSTALL_DOCKER, BaseFunctionEnum.INSTALL_DOCKER,
// BaseFunctionEnum.INSTALL_DOCKER_COMPOSE, BaseFunctionEnum.INSTALL_DOCKER_COMPOSE,
// BaseFunctionEnum.MODIFY_DOCKER_CONFIG BaseFunctionEnum.MODIFY_DOCKER_CONFIG
); );
projectDeployContext.setMasterNodeBaseProcedure(masterNodeProcedure); projectDeployContext.setMasterNodeBaseProcedure(masterNodeProcedure);