From 809a67ccc2700aeacb187a8a9d6a57761ea66e88 Mon Sep 17 00:00:00 2001 From: zeaslity Date: Wed, 17 Jul 2024 10:56:44 +0800 Subject: [PATCH] [agent-deploy] - cmii new app deploy --- agent-go/a_executor/BaseFunction.go | 18 ++++++++---------- agent-go/a_executor/BaseFunction_test.go | 1 - agent-go/a_executor/FunctionalExecutor_test.go | 15 +++++++++++++++ server/src/main/resources/application.yml | 6 +++--- .../wdd/server/func/TestBaseFuncScheduler.java | 6 +++--- 5 files changed, 29 insertions(+), 17 deletions(-) diff --git a/agent-go/a_executor/BaseFunction.go b/agent-go/a_executor/BaseFunction.go index 7260077..b72d669 100755 --- a/agent-go/a_executor/BaseFunction.go +++ b/agent-go/a_executor/BaseFunction.go @@ -859,18 +859,16 @@ func (op *AgentOsOperator) installDockerExec(args []string) (bool, []string) { "20", } } - // todo ubuntu 22.04 - // ubuntu 内部 - //var specificDockerVersion string - // hard code here 5:20.10.10~3-0~ubuntu-focal - //if strings.HasPrefix(args[0], "19") { - // specificDockerVersion = "5:19.03.15~3-0~ubuntu-" + op.AgentOSReleaseCode - //} else { - // - //} + // 20.04 default + specificDockerVersion := "5:20.10.20~3-0~ubuntu-" + op.AgentOSReleaseCode + // apt-cache madison docker-ce | grep 20.10.20 | awk '{print$3}' - specificDockerVersion := "5:20.10.10~3-0~ubuntu-" + op.AgentOSReleaseCode + // get by method + ok, log4 := HardCodeCommandExecutor("apt-cache madison docker-ce | grep 20.10.20 | awk '{print$3}'") + if ok { + specificDockerVersion = strings.TrimSpace(log4[0]) + } log.InfoF("需要安装的docker版本为 => %s", specificDockerVersion) diff --git a/agent-go/a_executor/BaseFunction_test.go b/agent-go/a_executor/BaseFunction_test.go index c7d950d..4b6a5d4 100755 --- a/agent-go/a_executor/BaseFunction_test.go +++ b/agent-go/a_executor/BaseFunction_test.go @@ -40,7 +40,6 @@ var agentOP = &AgentOsOperator{ Comment: "", MachineID: "", AgentVersion: "", - TopicName: "", }, OssOfflinePrefix: "http://10.250.0.100:9000/octopus/", } diff --git a/agent-go/a_executor/FunctionalExecutor_test.go b/agent-go/a_executor/FunctionalExecutor_test.go index 0856210..2216884 100755 --- a/agent-go/a_executor/FunctionalExecutor_test.go +++ b/agent-go/a_executor/FunctionalExecutor_test.go @@ -175,6 +175,21 @@ func TestPipelineCommandExecutor2(t *testing.T) { // Add more test cases as needed... } +func TestHardCodeCommandExecutor(t *testing.T) { + + // 20.04 default + specificDockerVersion := "5:20.10.20~3-0~ubuntu-focal" + // apt-cache madison docker-ce | grep 20.10.20 | awk '{print$3}' + + // get by method + ok, log4 := HardCodeCommandExecutor("apt-cache madison docker-ce | grep 20.10.20 | awk '{print$3}'") + if ok { + specificDockerVersion = strings.TrimSpace(log4[0]) + } + + fmt.Println(specificDockerVersion) +} + func TestSimple(t *testing.T) { for i := 0; i < 10; i++ { diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml index a45565f..56b30b6 100755 --- a/server/src/main/resources/application.yml +++ b/server/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: allow-circular-references: true allow-bean-definition-overriding: true rabbitmq: - host: 42.192.52.227 + host: 10.250.0.100 port: 20672 username: boge password: boge8tingH @@ -24,7 +24,7 @@ spring: max-interval: 65000 initial-interval: 2000 redis: - host: 42.192.52.227 + host: 10.250.0.100 port: 21370 database: 0 password: boge8tingH @@ -46,7 +46,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://42.192.52.227:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8 + url: jdbc:mysql://10.250.0.100:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8 username: boge password: boge8tingH type: com.zaxxer.hikari.HikariDataSource 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 9103106..78a67c6 100755 --- a/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java +++ b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java @@ -66,7 +66,7 @@ public class TestBaseFuncScheduler { // String masterNodeServerName = "Chengdu-amd64-10"; // 北京通感 // String masterNodeServerName = "Chengdu-amd64-14"; // 新疆移动 // String masterNodeServerName = "Local-amd64-251"; // 新疆移动 - String masterNodeServerName = "Chengdu-amd64-110"; // 北京通感 + String masterNodeServerName = "Chengdu-amd64-200"; // 北京通感 // String masterNodeServerName = "Ziyang-amd64-61"; // 资阳公安 ProjectServerVO projectServerVO = coreProjectServerService.projectServerOne(projectServerId); @@ -126,7 +126,7 @@ public class TestBaseFuncScheduler { throw new RuntimeException(e); } -// baseFuncScheduler.runProcedure(projectDeployContext); + baseFuncScheduler.runProcedure(projectDeployContext); // 只能支持 带端口的HarborHost 默认为8033Chengdu-amd64-110 // harborFuncScheduler.runProcedure(projectDeployContext); @@ -154,7 +154,7 @@ public class TestBaseFuncScheduler { ); projectDeployContext.setMasterAppProcedure(appFunctionEnumList); - appFuncScheduler.runProcedure(projectDeployContext); +// appFuncScheduler.runProcedure(projectDeployContext); masterNodeProcedure = List.of(BaseFunctionEnum.CHRONY_TO_MASTER);