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

[agent][deploy] - ImageSyncDLTU.sh - fix bugs

Browse Source
This commit is contained in:
zeaslity
2024-08-21 17:19:54 +08:00
parent e7383c272f
commit cf67df3923
5 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,9 @@ public class AcceptAgentInitInfo {
put("Local",
15);
put("Guangzhou",
13);
16);
put("Jinrongjie",
17);
}};

6
server/src/main/resources/application.yml
View File

@@ -9,7 +9,7 @@ spring:
allow-circular-references: true
allow-bean-definition-overriding: true
rabbitmq:
host: 10.250.0.100
host: 42.192.52.227
port: 20672
username: boge
password: boge8tingH
@@ -24,7 +24,7 @@ spring:
max-interval: 65000
initial-interval: 2000
redis:
host: 10.250.0.100
host: 42.192.52.227
port: 21370
database: 0
password: boge8tingH
@@ -46,7 +46,7 @@ spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://10.250.0.100:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
url: jdbc:mysql://42.192.52.227:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
username: boge
password: boge8tingH
type: com.zaxxer.hikari.HikariDataSource

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

@@ -53,7 +53,8 @@ public class TestBaseFuncScheduler {
// Long projectServerId = 1778681124701483009L;// 北京通感
// Long projectServerId = 1788026824445317122L;// 新疆移动
// Long projectServerId = 1791639665955184642L;// 深圳公安
Long projectServerId = 1795703135172485122L;// 北京通感
// Long projectServerId = 1795703135172485122L;// 北京通感
Long projectServerId = 1826162388894871554L; // 江苏南通二级平台 8-21
// Long projectServerId = 1773619219367120898L; // 内网35-71项目
@@ -66,7 +67,8 @@ public class TestBaseFuncScheduler {
// String masterNodeServerName = "Chengdu-amd64-10"; // 北京通感
// String masterNodeServerName = "Chengdu-amd64-14"; // 新疆移动
// String masterNodeServerName = "Local-amd64-251"; // 新疆移动
String masterNodeServerName = "Chengdu-amd64-200"; // 北京通感
// String masterNodeServerName = "Chengdu-amd64-200"; // 北京通感
String masterNodeServerName = "Jinrongjie-amd64-056"; // 江苏南通二级平台
// String masterNodeServerName = "Ziyang-amd64-61"; // 资阳公安
ProjectServerVO projectServerVO = coreProjectServerService.projectServerOne(projectServerId);
@@ -87,9 +89,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,
@@ -97,7 +99,7 @@ public class TestBaseFuncScheduler {
BaseFunctionEnum.MODIFY_DOCKER_CONFIG,
BaseFunctionEnum.INSTALL_HARBOR,
BaseFunctionEnum.INSTALL_NFS_SERVER_ONLINE
);
);
List<BaseFunctionEnum> agentNodeProcedure = List.of(
BaseFunctionEnum.DISABLE_SWAP,