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

[agent][deploy] - 辽宁应急生成

Browse Source
This commit is contained in:
zeaslity
2025-01-10 14:52:16 +08:00
parent 9f4631af91
commit 4135195430
76 changed files with 60068 additions and 7660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agent-operator/CmiiDeployOperator.go
View File

@@ -25,7 +25,7 @@ func init() {
DeployFilePrefix = "/root/wddproject/ProjectOctopus/agent-common/real_project/"
case "windows":
//DeployFilePrefix = "C:\\Users\\wdd\\IdeaProjects\\ProjectOctopus\\agent-common\\real_project\\"
DeployFilePrefix = "C:\\Users\\wddsh\\Documents \\IdeaProjects\\ProjectOctopus\\agent-common\\real_project\\"
DeployFilePrefix = "C:\\Users\\wddsh\\Documents\\IdeaProjects\\ProjectOctopus\\agent-common\\real_project\\"
}
}

21
agent-operator/CmiiDeployOperator_test.go
View File

@@ -53,6 +53,27 @@ func TestCmiiEnvDeploy_ChongQingSanHua(t *testing.T) {
}
func TestCmiiEnvDeploy_JiangSuNanTongErJiPingTai(t *testing.T) {
// 江苏南通二级平台 2025-01
commonEnv := &z_dep.CommonEnvironmentConfig{
WebIP: "10.40.51.5",
WebPort: "8088",
HarborIPOrCustomImagePrefix: "10.40.51.5",
HarborPort: "8033",
Namespace: "jsntejpt",
TagVersion: "6.1.0",
TenantEnv: "",
MinioPublicIP: "10.40.51.5",
MinioInnerIP: "10.40.51.5",
NFSServerIP: "10.40.51.5",
ApplyFilePrefix: "",
}
CmiiEnvDeployOffline(commonEnv, true, real_project.Cmii611ImageList)
}
func TestCmiiEnvDeploy_LiuXiTongGan(t *testing.T) {
// 刘喜通感

111
agent-operator/CmiiK8sHigherOperator_test.go
View File

@@ -151,56 +151,57 @@ func TestBackupAllCmiiDeploymentToList(t *testing.T) {
func TestUpdateCmiiImageTagFromNameTagMap(t *testing.T) {
backendMap := map[string]string{
"cmii-admin-data": "6.0.0",
"cmii-admin-gateway": "6.0.0",
"cmii-admin-user": "6.0.0",
"cmii-open-gateway": "6.0.0",
"cmii-suav-supervision": "6.0.0",
"cmii-uav-airspace": "6.0.0",
"cmii-uav-alarm": "6.0.0",
"cmii-uav-brain": "6.0.0",
"cmii-uav-cloud-live": "6.0.0",
"cmii-uav-cms": "6.0.0",
"cmii-uav-data-post-process": "6.0.0",
"cmii-uav-developer": "6.0.0",
"cmii-uav-device": "6.0.0",
"cmii-uav-emergency": "6.0.0",
"cmii-uav-gateway": "6.0.0",
"cmii-uav-gis-server": "6.0.0",
"cmii-uav-industrial-portfolio": "6.0.0",
"cmii-uav-integration": "6.0.0",
"cmii-uav-logger": "6.0.0",
"cmii-uav-material-warehouse": "6.0.0",
"cmii-uav-mission": "6.0.0",
"cmii-uav-mqtthandler": "6.0.0",
"cmii-uav-notice": "6.0.0",
"cmii-uav-oauth": "6.0.0",
"cmii-uav-process": "6.0.0",
"cmii-uav-surveillance": "6.0.0",
"cmii-uav-threedsimulation": "6.0.0",
"cmii-uav-tower": "6.0.0",
"cmii-uav-user": "6.0.0",
"cmii-uav-waypoint": "6.0.0",
"cmii-uav-sense-adapter": "6.0.0",
"cmii-uas-lifecycle": "6.0.0",
"cmii-uas-gateway": "6.0.0",
"cmii-admin-data": "6.2.0-demo",
"cmii-admin-gateway": "6.2.0-demo",
"cmii-admin-user": "6.2.0-demo",
"cmii-open-gateway": "6.2.0-demo",
"cmii-suav-supervision": "6.2.0-demo",
"cmii-uav-airspace": "6.2.0-demo",
"cmii-uav-alarm": "6.2.0-demo",
"cmii-uav-brain": "6.2.0-demo",
"cmii-uav-cloud-live": "6.2.0-demo",
"cmii-uav-cms": "6.2.0-demo",
"cmii-uav-data-post-process": "6.2.0-demo",
"cmii-uav-developer": "6.2.0-demo",
"cmii-uav-device": "6.2.0-demo",
"cmii-uav-emergency": "6.2.0-demo",
"cmii-uav-gateway": "6.2.0-demo",
"cmii-uav-gis-server": "6.2.0-demo",
"cmii-uav-industrial-portfolio": "6.2.0-demo",
"cmii-uav-integration": "6.2.0-demo",
"cmii-uav-logger": "6.2.0-demo",
"cmii-uav-material-warehouse": "6.2.0-demo",
"cmii-uav-mission": "6.2.0-demo",
"cmii-uav-mqtthandler": "6.2.0-demo",
"cmii-uav-notice": "6.2.0-demo",
"cmii-uav-oauth": "6.2.0-demo",
"cmii-uav-process": "6.2.0-demo",
"cmii-uav-surveillance": "6.2.0-demo",
//"cmii-uav-threedsimulation": "6.2.0-demo",
//"cmii-uav-tower": "6.2.0-demo",
"cmii-uav-user": "6.2.0-demo",
"cmii-uav-waypoint": "6.2.0-demo",
"cmii-uav-sense-adapter": "6.2.0-demo",
"cmii-uas-lifecycle": "6.2.0-demo",
"cmii-uas-gateway": "6.2.0-demo",
"cmii-uav-advanced5g": "6.2.0-demo",
}
frontendMap := map[string]string{
"cmii-suav-platform-supervision": "6.0.0",
"cmii-suav-platform-supervisionh5": "6.0.0",
"cmii-uav-platform": "6.0.0",
"cmii-uav-platform-media": "6.0.0",
"cmii-uav-platform-ai-brain": "6.0.0",
"cmii-uav-platform-cms-portal": "6.0.0",
"cmii-uav-platform-armypeople": "6.0.0",
"cmii-uav-platform-mws": "6.0.0",
"cmii-uav-platform-oms": "6.0.0",
"cmii-uav-platform-open": "6.0.0",
"cmii-uav-platform-securityh5": "6.0.0",
"cmii-uav-platform-share": "6.0.0",
"cmii-uav-platform-uasms": "6.0.0",
"cmii-uav-platform-uas": "6.0.0",
"cmii-suav-platform-supervision": "6.2.0-demo",
"cmii-suav-platform-supervisionh5": "6.2.0-demo",
"cmii-uav-platform": "6.2.0-demo",
"cmii-uav-platform-media": "6.2.0-demo",
"cmii-uav-platform-ai-brain": "6.2.0-demo",
"cmii-uav-platform-cms-portal": "6.2.0-demo",
"cmii-uav-platform-armypeople": "6.2.0-demo",
"cmii-uav-platform-mws": "6.2.0-demo",
"cmii-uav-platform-oms": "6.2.0-demo",
"cmii-uav-platform-open": "6.2.0-demo",
"cmii-uav-platform-securityh5": "6.2.0-demo",
"cmii-uav-platform-share": "6.2.0-demo",
"cmii-uav-platform-uasms": "6.2.0-demo",
"cmii-uav-platform-uas": "6.2.0-demo",
//"cmii-uav-platform-base": "5.7.0",
//"cmii-uav-platform-detection": "5.7.0",
//"cmii-uav-platform-emergency-rescue": "5.7.0",
@@ -235,7 +236,7 @@ func TestBackupAllDeploymentFromEnv(t *testing.T) {
}
func TestBackUpAllCmiiAppImageNameFromEnv(t *testing.T) {
func TestBackUpAllCmiiAppImageNameFroEnv(t *testing.T) {
BackUpAllCmiiAppImageNameFromEnv(config.Demo)
@@ -243,6 +244,18 @@ func TestBackUpAllCmiiAppImageNameFromEnv(t *testing.T) {
func TestRestartCmiiDeployment(t *testing.T) {
cmiiEnv := config.Demo
appNameList := []string{
"cmii-uav-industrial-portfolio",
}
for _, appName := range appNameList {
kill := DefaultCmiiOperator.DeploymentRestartByKill(cmiiEnv, appName)
assert.Equal(t, kill, true, "have unhealthy pod !")
check := DefaultCmiiOperator.DeploymentStatusCheck(cmiiEnv, appName, 180)
assert.Equal(t, check, true, "DeploymentStatusCheck failed !")
}
appName := "cmii-uav-notice"
kill := DefaultCmiiOperator.DeploymentRestartByKill(cmiiEnv, appName)
@@ -258,7 +271,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
now := time.Now()
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 13, 45, 00, 0, now.Location())
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 17, 46, 00, 0, now.Location())
duration := time.Duration(0)