From 866220f2e4de9676ecdd62dfad60947aa26f43cd Mon Sep 17 00:00:00 2001
From: zeaslity <ice@qq.com>
Date: Fri, 12 Apr 2024 15:10:20 +0800
Subject: [PATCH] [ Cmii ] [ Operator ] - bug fix of bgtg

---
 agent-go/a_executor/BaseFunction.go           |  5 +---
 .../server/func/TestBaseFuncScheduler.java    | 28 ++++++++++---------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/agent-go/a_executor/BaseFunction.go b/agent-go/a_executor/BaseFunction.go
index 1549791..898f672 100644
--- a/agent-go/a_executor/BaseFunction.go
+++ b/agent-go/a_executor/BaseFunction.go
@@ -718,10 +718,7 @@ func (op *AgentOsOperator) installDockerExec(args []string) (bool, []string) {
 		}
 
 		// look for specific docker-version to install
-		ok, log4 := AllCommandExecutor([]string{"apt-get", "update"})
-		if !ok {
-			return false, append(log4, "apt-get update 失败！")
-		}
+		AllCommandExecutor([]string{"apt-get", "update"})
 
 		// 补充参数
 		if args == nil {
diff --git a/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java
index 52e8967..06439cb 100644
--- a/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java
+++ b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java
@@ -50,7 +50,8 @@ public class TestBaseFuncScheduler {
 //        Long projectServerId = 1764575895186030593L;// 上海雷视联动
 //        Long projectServerId = 1777152043483353089L;// 吉林移动
 //        Long projectServerId = 1765654823726669826L;// 资阳公安
-        Long projectServerId = 1773619219367120898L; // 内网35-71项目
+        Long projectServerId = 1778681124701483009L;// 北京通感
+//        Long projectServerId = 1773619219367120898L; // 内网35-71项目
 
 
         projectDeployContext.setProjectId(projectServerId);
@@ -58,7 +59,8 @@ public class TestBaseFuncScheduler {
 
 //        String masterNodeServerName = "Shanghai-amd64-09"; // cgga
 //        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"; // 资阳公安
 
         ProjectServerVO projectServerVO = coreProjectServerService.projectServerOne(projectServerId);
@@ -83,20 +85,20 @@ public class TestBaseFuncScheduler {
                 BaseFunctionEnum.DISABLE_SELINUX,
                 BaseFunctionEnum.SHUTDOWN_FIREWALL,
                 BaseFunctionEnum.INSTALL_DOCKER,
-//                BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY,
-                BaseFunctionEnum.INSTALL_DOCKER_COMPOSE
-//                BaseFunctionEnum.MODIFY_DOCKER_CONFIG
-//                BaseFunctionEnum.INSTALL_HARBOR
+                BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY,
+                BaseFunctionEnum.INSTALL_DOCKER_COMPOSE,
+                BaseFunctionEnum.MODIFY_DOCKER_CONFIG,
+                BaseFunctionEnum.INSTALL_HARBOR
         );
 
         List<BaseFunctionEnum> agentNodeProcedure = List.of(
-//                BaseFunctionEnum.DISABLE_SWAP,
-//                BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY,
-//                BaseFunctionEnum.DISABLE_SELINUX,
-//                BaseFunctionEnum.SHUTDOWN_FIREWALL,
-//                BaseFunctionEnum.INSTALL_DOCKER,
-//                BaseFunctionEnum.INSTALL_DOCKER_COMPOSE,
-//                BaseFunctionEnum.MODIFY_DOCKER_CONFIG
+                BaseFunctionEnum.DISABLE_SWAP,
+                BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY,
+                BaseFunctionEnum.DISABLE_SELINUX,
+                BaseFunctionEnum.SHUTDOWN_FIREWALL,
+                BaseFunctionEnum.INSTALL_DOCKER,
+                BaseFunctionEnum.INSTALL_DOCKER_COMPOSE,
+                BaseFunctionEnum.MODIFY_DOCKER_CONFIG
         );
 
         projectDeployContext.setMasterNodeBaseProcedure(masterNodeProcedure);