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:49:18 +08:00
parent af3e058af4
commit 9f4631af91
24 changed files with 13531 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
agent-operator/CmiiDeployOperator_test.go
View File

@@ -237,6 +237,27 @@ func TestCmiiEnvDeploy_YunNanErJiPingTai(t *testing.T) {
}
func TestCmiiEnvDeploy_LiaoNingYingJiPingTai(t *testing.T) {
// 辽宁应急
commonEnv := &z_dep.CommonEnvironmentConfig{
WebIP: "192.168.40.42",
WebPort: "8088",
HarborIPOrCustomImagePrefix: "192.168.40.42",
HarborPort: "8033",
Namespace: "lnydyj",
TagVersion: "6.2.0",
TenantEnv: "",
MinioPublicIP: "",
MinioInnerIP: "192.168.40.193",
NFSServerIP: "192.168.40.193",
ApplyFilePrefix: "",
}
CmiiEnvDeployOffline(commonEnv, true, real_project.Cmii620ImageList)
}
func TestCmiiEnvDeploy_ZhuHaiHengQing(t *testing.T) {
// 珠海横琴
@@ -321,6 +342,27 @@ func TestCmiiEnvDeploy_GanSuErJiPingTai(t *testing.T) {
}
func TestCmiiEnvDeploy_YunNanErJiXin(t *testing.T) {
// 云南二级平台-新
commonEnv := &z_dep.CommonEnvironmentConfig{
WebIP: "39.129.174.66",
WebPort: "8088",
HarborIPOrCustomImagePrefix: "192.168.186.11",
HarborPort: "8033",
Namespace: "ynydapp",
TagVersion: "6.1.0",
TenantEnv: "",
MinioPublicIP: "",
MinioInnerIP: "192.168.186.15",
NFSServerIP: "192.168.186.15",
ApplyFilePrefix: "",
}
CmiiEnvDeployOffline(commonEnv, true, real_project.Cmii611ImageList)
}
func TestCmiiNewAppDeploy(t *testing.T) {
deployNamespace := config.DevOperation

4
agent-operator/CmiiImageSyncOperator_test.go
View File

@@ -51,8 +51,8 @@ func TestPullFromEntityAndSyncConditionally(t *testing.T) {
sync := ImageSyncEntity{
DownloadCondition: &DownloadEntity{
ShouldDownloadImage: true,
ProjectName: "cmii_6.1.1",
ProjectVersion: "6.1.1",
ProjectName: "cmii_6.2.0",
ProjectVersion: "6.2.0-demo",
CmiiNameTagList: []string{
//"cmii-uav-mqtthandler:5.4.0-bjdyt-052102",
},

3
agent-operator/CmiiK8sHigherOperator.go
View File

@@ -301,6 +301,9 @@ func RestartCmiiFrontendDeployment(cmiiEnv string) {
// UpdateCmiiDeploymentImageTag 更新CMII的Deployment的Tag号
func UpdateCmiiDeploymentImageTag(cmiiEnv, appName, newTag string) (updateOK bool, oldImageTag, newImageTag string) {
// trim space
newTag = strings.TrimSpace(newTag)
cmiiDeploymentInterface := DefaultCmiiOperator.DeploymentOneInterface(cmiiEnv, appName)
if cmiiDeploymentInterface == nil {
return updateOK, oldImageTag, newImageTag

27
agent-operator/CmiiK8sHigherOperator_test.go
View File

@@ -235,7 +235,7 @@ func TestBackupAllDeploymentFromEnv(t *testing.T) {
}
func TestBackUpAllCmiiAppImageNameFroEnv(t *testing.T) {
func TestBackUpAllCmiiAppImageNameFromEnv(t *testing.T) {
BackUpAllCmiiAppImageNameFromEnv(config.Demo)
@@ -243,18 +243,13 @@ func TestBackUpAllCmiiAppImageNameFroEnv(t *testing.T) {
func TestRestartCmiiDeployment(t *testing.T) {
cmiiEnv := config.Demo
appNameList := []string{
"cmii-uav-industrial-portfolio",
}
appName := "cmii-uav-notice"
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 !")
}
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 !")
}
func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
@@ -263,7 +258,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
now := time.Now()
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 17, 46, 00, 0, now.Location())
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 13, 45, 00, 0, now.Location())
duration := time.Duration(0)
@@ -283,10 +278,10 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
cmiiEnv := config.Demo
appNameTagMap := map[string]string{
//"cmii-uas-lifecycle": "6.1.0-20241125-121201",
//"cmii-uav-ruoyi": "2024121102",
//"cmii-uav-platform-dispatchh5": "6.1.0",
"cmii-uav-industrial-portfolio": "6.1.0-20241125-121301",
//"cmii-app-release": "6.1.0-122001",
"cmii-uav-device": "6.1.0-1125-123001",
//"cmii-uav-platform-pilot2-to-cloud": "6.1.0-32030-123101",
//"cmii-uav-industrial-portfolio": "6.1.0-20241125-121702",
}
for appName, newTag := range appNameTagMap {

23
agent-operator/CmiiK8sOperator_test.go
View File

@@ -117,15 +117,6 @@ func TestCmiiK8sOperator_DeploymentRestartByKill(t *testing.T) {
}
func TestCmiiK8sOperator_DeploymentOneInterface(t *testing.T) {
start := time.Now()
deploy := DefaultCmiiOperator.DeploymentOneInterface("devflight", "cmii-uav-depotautoreturn")
elapsed := time.Since(start).Milliseconds()
fmt.Printf("执行耗时： %d ms\n", elapsed)
utils.BeautifulPrint(*deploy)
}
func TestCmiiK8sOperator_ReplicaSetExists(t *testing.T) {
cmiiEnv := "uavcloud-devflight"
@@ -181,10 +172,10 @@ func TestCmiiK8sOperator_PodFizz(t *testing.T) {
}
func TestCmiiK8sOperator_PodByAppName(t *testing.T) {
cmiiEnv := "Uat"
cmiiEnv := config.Demo
appName := "cmii-admin-data"
exists := DefaultCmiiOperator.PodByNodeName(cmiiEnv, appName)
exists := DefaultCmiiOperator.PodByAppName(cmiiEnv, appName)
for _, podInterface := range exists {
utils.BeautifulPrint(podInterface)
@@ -319,3 +310,13 @@ func TestCmiiK8sOperator_NodeAllInterface(t *testing.T) {
println()
}
}
func TestCmiiK8sOperator_DeploymentOneInterface(t *testing.T) {
namespace := config.Demo
appName := "cmii-uav-mission"
deploy := DefaultCmiiOperator.DeploymentOneInterface(namespace, appName)
utils.BeautifulPrint(*deploy)
}