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

[Agent][GO] - fix deploy bugs

Browse Source
This commit is contained in:
zeaslity
2024-07-18 14:39:09 +08:00
parent a52724c354
commit 1828116d8a
6 changed files with 68 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
agent-operator/CmiiDeployOperator.go
View File

@@ -24,7 +24,7 @@ func CmiiEnvDeploy(deployCommonEnv *z_dep.CommonEnvironmentConfig, shouldDoCompl
} else {
// demo ==> ""
// cqlyj ==> ""
tenantEnv = deployCommonEnv.Namespace
tenantEnv = ""
}
// assign folder prefix
@@ -85,7 +85,7 @@ func CmiiNewAppDeploy(deployCommonEnv *z_dep.CommonEnvironmentConfig, newAppName
} else {
// demo ==> ""
// cqlyj ==> ""
tenantEnv = "demo"
tenantEnv = ""
}
// assign folder prefix

8
agent-operator/CmiiK8sOperator_test.go
View File

@@ -253,7 +253,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
// 计算20:00的时间
now := time.Now()
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 14, 35, 00, 0, now.Location())
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 14, 22, 00, 0, now.Location())
duration := time.Duration(0)
@@ -277,10 +277,10 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
appNameTagMap := map[string]string{
//"cmii-uav-platform-dispatchh5": "5.6.0-062401",
//"cmii-uav-data-post-process": "5.6.0-062401",
"cmii-uav-industrial-portfolio": "5.6.0-071701",
//"cmii-uav-multilink": "5.5.0",
"cmii-uav-industrial-portfolio": "5.6.0-071801",
//"cmii-uav-developer": "5.6.0-062701",
//"cmii-uav-platform": "5.6.0-0626",
//"cmii-uav-platform": "5.6.0-071702",
//"cmii-uas-lifecycle": "5.6.0-30403-071801",
}
for appName, newTag := range appNameTagMap {

4
agent-operator/log/cmii-update-log.txt
View File

@@ -107,3 +107,7 @@
2024-07-15-10-05-51 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071206 5.6.0-071501
2024-07-16-17-06-59 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071501 5.6.0-071601
2024-07-17-14-37-11 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071601 5.6.0-071701
2024-07-17-17-45-00 uavcloud-demo cmii-uav-platform 5.6.0-29267-0717 5.6.0-071701
2024-07-17-17-45-09 uavcloud-demo cmii-uas-lifecycle 5.6.0 5.6.0-30403-071701
2024-07-17-17-48-00 uavcloud-demo cmii-uav-platform 5.6.0-071701 5.6.0-071702
2024-07-18-10-05-00 uavcloud-demo cmii-uas-lifecycle 5.6.0-30403-071701 5.6.0-30403-071801