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

[Agent][Deploy] - cqsh

Browse Source
This commit is contained in:
zeaslity
2024-07-04 09:27:12 +08:00
parent 09da29f57a
commit 4e7422c32b
17 changed files with 11716 additions and 10982 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
agent-operator/CmiiDeployOperator_test.go
View File

@@ -4,5 +4,6 @@ import "testing"
func TestCmiiEnvDeploy(t *testing.T) {
CmiiEnvDeploy(dev, true, "5.6.0", dev)
CmiiEnvDeploy(devOperation, true, "5.6.0", devOperation)
}

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(), 17, 30, 00, 0, now.Location())
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 11, 37, 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-061303",
"cmii-uav-industrial-portfolio": "5.6.0-070301",
//"cmii-uav-multilink": "5.5.0",
"cmii-uav-developer": "5.6.0-062701",
"cmii-uav-airspace": "5.6.0-062701",
//"cmii-uav-developer": "5.6.0-062701",
//"cmii-uav-platform": "5.6.0-0626",
}
for appName, newTag := range appNameTagMap {

2
agent-operator/CmiiOperator.go
View File

@@ -89,7 +89,7 @@ func (sync ImageSyncEntity) PullFromEntityAndSyncConditionally() (imageSyncResul
log.ErrorF("DirectHarborHost is null ! can't push to target harbor !")
}
// push to
errorPushImageNameList = image.TagFromListAndPushToCHarbor(realCmiiImageList, sync.DirectHarborHost)
errorPushImageNameList = image.TagFromListAndPushToCHarbor(allCmiiImageNameList, sync.DirectHarborHost)
}
// build result

2
agent-operator/CmiiOperator_test.go
View File

@@ -49,7 +49,7 @@ func TestPullFromEntityAndSyncConditionally(t *testing.T) {
// 创建一个模拟的sync对象，用于测试函数的行为。这里需要根据你的实际需求来设置mock数据和预期结果。
sync := ImageSyncEntity{
CmiiNameTagList: []string{
"cmii-uav-mqtthandler:5.4.0-bjdyt-052102",
//"cmii-uav-mqtthandler:5.4.0-bjdyt-052102",
},
FullNameImageList: nil,
ProjectVersion: "",

9
agent-operator/image/CmiiImageOperator.go
View File

@@ -190,8 +190,9 @@ func UploadToOctopusKindHarbor(targetImageName string) (pushResult io.ReadCloser
}
pushResult, err := apiClient.ImagePush(context.TODO(), targetImageName, types.ImagePushOptions{
All: false,
RegistryAuth: "eyAidXNlcm5hbWUiOiAiYWRtaW4iLCAicGFzc3dvcmQiOiAiVjJyeVN0ckBuZ1BzcyIsICJlbWFpbCI6ICJpY2VAcXEuY29tIiB9Cg==",
All: false,
//RegistryAuth: "eyAidXNlcm5hbWUiOiAiYWRtaW4iLCAicGFzc3dvcmQiOiAiVjJyeVN0ckBuZ1BzcyIsICJlbWFpbCI6ICJpY2VAcXEuY29tIiB9Cg==",
RegistryAuth: "eyAidXNlcm5hbWUiOiAiZGljdHp4IiwgInBhc3N3b3JkIjogIjlAcDNoekdWU0JscyVIWXUiLCAiZW1haWwiOiAiaWNlQHFxLmNvbSIgfQ==",
PrivilegeFunc: nil,
Platform: "amd64",
})
@@ -255,7 +256,7 @@ func TagFromListAndPushToCHarbor(referenceImageList []string, targetHarborHost s
}
}
targetImageName := targetHarborHost + targetProject + "/" + imageName
targetImageName := targetHarborHost + "/" + targetProject + "/" + imageName
//fmt.Println(cmiiImageFullName)
//fmt.Println(targetImageName)
@@ -268,7 +269,7 @@ func TagFromListAndPushToCHarbor(referenceImageList []string, targetHarborHost s
}
scanner := bufio.NewScanner(pushResult)
for scanner.Scan() {
//fmt.Println(scanner.Text())
}
log.InfoF("[ImageTagFromListAndPushToCHarbor] - push of %s success!", targetImageName)
} else {

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

@@ -85,3 +85,9 @@
2024-06-26-17-54-00 uavcloud-demo cmii-uav-material-warehouse 5.6.0 5.6.0-062602
2024-06-27-17-30-00 uavcloud-demo cmii-uav-developer 5.6.0 5.6.0-062701
2024-06-27-17-31-28 uavcloud-demo cmii-uav-airspace 5.6.0-062601 5.6.0-062701
2024-07-01-09-37-00 uavcloud-demo cmii-uav-platform 5.6.0-0626 5.6.0-25263-0701
2024-07-01-17-50-00 uavcloud-demo cmii-uav-platform 5.6.0-0626 5.6.0-070101
2024-07-01-17-54-39 uavcloud-demo cmii-uav-platform 5.6.0-070101 5.6.0-0626
2024-07-01-18-12-13 uavcloud-demo cmii-uav-platform 5.6.0-0626 5.6.0-070101
2024-07-01-18-19-57 uavcloud-demo cmii-uav-platform 5.6.0-070101 5.6.0-0626
2024-07-03-11-37-00 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-sense-070103 5.6.0-070301