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-17 16:22:40 +08:00
parent 034ae3d25b
commit b7daaddf1e
47 changed files with 25342 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,9 +190,9 @@ func UploadToOctopusKindHarbor(targetImageName string) (pushResult io.ReadCloser
}
pushResult, err := apiClient.ImagePush(context.TODO(), targetImageName, types.ImagePushOptions{
All: false,
//RegistryAuth: "eyAidXNlcm5hbWUiOiAiYWRtaW4iLCAicGFzc3dvcmQiOiAiVjJyeVN0ckBuZ1BzcyIsICJlbWFpbCI6ICJpY2VAcXEuY29tIiB9Cg==",
RegistryAuth: "eyAidXNlcm5hbWUiOiAiZGljdHp4IiwgInBhc3N3b3JkIjogIjlAcDNoekdWU0JscyVIWXUiLCAiZW1haWwiOiAiaWNlQHFxLmNvbSIgfQ==",
All: false,
RegistryAuth: "eyAidXNlcm5hbWUiOiAiYWRtaW4iLCAicGFzc3dvcmQiOiAiVjJyeVN0ckBuZ1BzcyIsICJlbWFpbCI6ICJpY2VAcXEuY29tIiB9Cg==",
//RegistryAuth: "eyAidXNlcm5hbWUiOiAiZGljdHp4IiwgInBhc3N3b3JkIjogIjlAcDNoekdWU0JscyVIWXUiLCAiZW1haWwiOiAiaWNlQHFxLmNvbSIgfQ==",
PrivilegeFunc: nil,
Platform: "amd64",
})
@@ -248,6 +248,7 @@ func TagFromListAndPushToCHarbor(referenceImageList []string, targetHarborHost s
//fmt.Println(scanner.Text())
}
log.InfoF("[ImageTagFromListAndPushToCHarbor] - push of %s success!", targetImageName)
fmt.Println()
} else {
errorPushImageNameList = append(errorPushImageNameList, cmiiImageFullName)
}

27
agent-operator/image/HarborOperator_test.go
View File

@@ -9,7 +9,7 @@ import (
var DefaultHarborOperator *HarborOperator
func TestHarborOperator_BuildOperator(t *testing.T) {
func TestHarborOperator_BuildOperator_CMII(t *testing.T) {
harborOperator := &HarborOperator{
HarborHost: "http://harbor.cdcyy.com.cn",
HarborPort: "",
@@ -28,6 +28,25 @@ func TestHarborOperator_BuildOperator(t *testing.T) {
}
func TestHarborOperator_BuildOperator(t *testing.T) {
harborOperator := &HarborOperator{
HarborHost: "http://harbor.wdd.io",
HarborPort: "8033",
HarborUser: "admin",
HarborPass: "V2ryStr@ngPss",
HarborClient: nil,
}
_, err := harborOperator.BuildOperator()
if err != nil {
t.Logf("error is %s", err.Error())
return
}
DefaultHarborOperator = harborOperator
}
func TestHarborOperator_RepoListAll(t *testing.T) {
TestHarborOperator_BuildOperator(t)
@@ -67,7 +86,7 @@ func TestHarborOperator_ArtifactListAll(t *testing.T) {
}
func TestHarborOperator_CmiiHarborCleanUp(t *testing.T) {
TestHarborOperator_BuildOperator(t)
TestHarborOperator_BuildOperator_CMII(t)
//repoListAll := DefaultHarborOperator.RepoListAll("ran")
repoListAll := DefaultHarborOperator.RepoListAll("cmii")
@@ -117,14 +136,14 @@ func TestHarborOperator_ArtifactDeleteOne(t *testing.T) {
func TestHarborOperator_CmiiTagFilter(t *testing.T) {
TestHarborOperator_BuildOperator(t)
imageMap := DefaultHarborOperator.CmiiTagFilter("4")
imageMap := DefaultHarborOperator.CmiiTagFilter("5")
utils.BeautifulPrint(imageMap)
}
func TestHarborOperator_ArtifactDeleteFromNameTagList(t *testing.T) {
TestHarborOperator_BuildOperator(t)
allCmiiImageList := DefaultHarborOperator.CmiiTagFilter("4")
allCmiiImageList := DefaultHarborOperator.CmiiTagFilter("5.5")
errorDeleteList := DefaultHarborOperator.ArtifactDeleteFromNameTagList("cmii", allCmiiImageList)
utils.BeautifulPrint(errorDeleteList)
}