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

[ Cmii ] [ Octopus ] - image sync refresh

Browse Source
This commit is contained in:
zeaslity
2024-03-18 16:38:54 +08:00
parent 5e80d7baad
commit df44d6eef9
31 changed files with 360 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/pom.xml
View File

@@ -11,7 +11,7 @@
<artifactId>server</artifactId>
<name>server</name>
<allCmiiImageName>server</allCmiiImageName>
<description>server</description>
<properties>

2
server/src/main/resources/bootstrap.yml-back
View File

@@ -1,6 +1,6 @@
spring:
application:
name: octopus-server
allCmiiImageName: octopus-server
profiles:
active: local
cloud:

5
server/src/main/resources/mapper/ScriptSchedulerMapper.xml
View File

@@ -6,7 +6,7 @@
<resultMap id="BaseResultMap" type="io.wdd.server.beans.po.ScriptSchedulerPO">
<id property="schedulerUuid" column="scheduler_uuid" jdbcType="VARCHAR"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="allCmiiImageName" column="allCmiiImageName" jdbcType="VARCHAR"/>
<result property="cronExpress" column="cron_express" jdbcType="VARCHAR"/>
<result property="description" column="description" jdbcType="VARCHAR"/>
<result property="scriptContent" column="script_content" jdbcType="VARCHAR"/>
@@ -21,7 +21,8 @@
</resultMap>
<sql id="Base_Column_List">
scheduler_uuid,name,cron_express,
scheduler_uuid
,allCmiiImageName,cron_express,
description,script_content,target_machine,
last_execution_id,last_execution_result_key,last_execution_status,
create_time,update_time,next_schedule_time,

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

@@ -48,15 +48,15 @@ public class TestBaseFuncScheduler {
// Long projectServerId = 1722453318596550657L;// lappro
// Long projectServerId = 1752602668144975873L;// cqlyj
// Long projectServerId = 1764575895186030593L;// 上海雷视联动
// Long projectServerId = 1765290465066692610L;// 吉林移动
Long projectServerId = 1765654823726669826L;// 资阳公安
Long projectServerId = 1765290465066692610L;// 吉林移动
// Long projectServerId = 1765654823726669826L;// 资阳公安
projectDeployContext.setProjectId(projectServerId);
// String masterNodeServerName = "Shanghai-amd64-09"; // cgga
// String masterNodeServerName = "Chengdu-amd64-51"; // lap pro
String masterNodeServerName = "Ziyang-amd64-61"; // 资阳公安
String masterNodeServerName = "Chengdu-amd64-51"; // 吉林移动
// String masterNodeServerName = "Ziyang-amd64-61"; // 资阳公安
ProjectServerVO projectServerVO = coreProjectServerService.projectServerOne(projectServerId);
Map<Boolean, List<ServerInfoPO>> collect = projectServerVO.getBindingServerList().stream().collect(
@@ -123,15 +123,15 @@ public class TestBaseFuncScheduler {
// AppFunctionEnum.DEPLOY_K8S_DASHBOARD,
// AppFunctionEnum.DEPLOY_NFS,
// AppFunctionEnum.DEPLOY_TEST_NFS
// AppFunctionEnum.DEPLOY_K8S_NAMESPACE,
// AppFunctionEnum.DEPLOY_K8S_PVC,
// AppFunctionEnum.DEPLOY_K8S_MYSQL,
// AppFunctionEnum.DEPLOY_K8S_REDIS,
// AppFunctionEnum.DEPLOY_K8S_MIDDLEWARES
AppFunctionEnum.DEPLOY_K8S_NAMESPACE,
AppFunctionEnum.DEPLOY_K8S_PVC,
AppFunctionEnum.DEPLOY_K8S_MYSQL,
AppFunctionEnum.DEPLOY_K8S_REDIS,
AppFunctionEnum.DEPLOY_K8S_MIDDLEWARES
// AppFunctionEnum.DEPLOY_INGRESS,
// AppFunctionEnum.DEPLOY_FRONTEND
// AppFunctionEnum.DEPLOY_BACKEND
AppFunctionEnum.DEPLOY_K8S_SRS
// AppFunctionEnum.DEPLOY_K8S_SRS
);
projectDeployContext.setMasterAppProcedure(appFunctionEnumList);