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

Merge remote-tracking branch 'origin/local-ss' into local-ss

Browse Source 
# Conflicts:
#	agent-operator/deploy/OctopusDeploy.go
This commit is contained in:
zeaslity
2024-05-29 10:38:06 +08:00
parent 836676bd03 9cc5db9194
commit d962a3d68e
25 changed files with 11220 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,8 @@ public class TestBaseFuncScheduler {
// Long projectServerId = 1777152043483353089L;// 吉林移动
// Long projectServerId = 1765654823726669826L;// 资阳公安
// Long projectServerId = 1778681124701483009L;// 北京通感
Long projectServerId = 1788026824445317122L;// 新疆移动
// Long projectServerId = 1788026824445317122L;// 新疆移动
Long projectServerId = 1791639665955184642L;// 深圳公安
// Long projectServerId = 1773619219367120898L; // 内网35-71项目
@@ -62,7 +63,8 @@ public class TestBaseFuncScheduler {
// String masterNodeServerName = "Chengdu-amd64-51"; // 吉林移动
// String masterNodeServerName = "Chengdu-amd64-51"; // 吉林移动
// String masterNodeServerName = "Chengdu-amd64-10"; // 北京通感
String masterNodeServerName = "Chengdu-amd64-14"; // 新疆移动
// String masterNodeServerName = "Chengdu-amd64-14"; // 新疆移动
String masterNodeServerName = "Local-amd64-251"; // 新疆移动
// String masterNodeServerName = "Ziyang-amd64-61"; // 资阳公安
ProjectServerVO projectServerVO = coreProjectServerService.projectServerOne(projectServerId);
@@ -88,12 +90,12 @@ public class TestBaseFuncScheduler {
// BaseFunctionEnum.MODIFY_SYSCONFIG,
// BaseFunctionEnum.SHUTDOWN_FIREWALL,
// BaseFunctionEnum.INSTALL_DOCKER,
// BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY,
// BaseFunctionEnum.INSTALL_DOCKER_COMPOSE,
// BaseFunctionEnum.INSTALL_NFS_SERVER_ONLINE,
BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY,
BaseFunctionEnum.INSTALL_DOCKER_COMPOSE,
BaseFunctionEnum.MODIFY_DOCKER_CONFIG,
BaseFunctionEnum.INSTALL_HARBOR
);
BaseFunctionEnum.INSTALL_HARBOR,
BaseFunctionEnum.INSTALL_NFS_SERVER_ONLINE
);
List<BaseFunctionEnum> agentNodeProcedure = List.of(
BaseFunctionEnum.DISABLE_SWAP,
@@ -129,8 +131,8 @@ public class TestBaseFuncScheduler {
List<AppFunctionEnum> appFunctionEnumList = List.of(
// AppFunctionEnum.DEPLOY_CHRONY_SERVER,
// AppFunctionEnum.DEPLOY_RKE
AppFunctionEnum.DEPLOY_CHRONY_SERVER,
AppFunctionEnum.DEPLOY_RKE
AppFunctionEnum.DEPLOY_K8S_DASHBOARD,
AppFunctionEnum.DEPLOY_NFS,