From e56b9bd65cc882d58203a4a23e1277e051e9086c Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Wed, 8 May 2024 11:12:45 +0800
Subject: [PATCH] [Agent][Operator] - bug fix

---
 agent-operator/CmiiK8sOperator_test.go |  7 +++----
 agent-operator/CmiiOperator.go         | 12 ++++++++++++
 agent-operator/CmiiOperator_test.go    |  3 ++-
 agent-operator/log/cmii-update-log.txt |  5 +++++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/agent-operator/CmiiK8sOperator_test.go b/agent-operator/CmiiK8sOperator_test.go
index dc18530..a3f5364 100644
--- a/agent-operator/CmiiK8sOperator_test.go
+++ b/agent-operator/CmiiK8sOperator_test.go
@@ -252,7 +252,8 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
 
 	// 计算20:00的时间
 	now := time.Now()
-	targetTime := time.Date(now.Year(), now.Month(), now.Day(), 12, 14, 00, 0, now.Location())
+
+	targetTime := time.Date(now.Year(), now.Month(), now.Day(), 8, 58, 30, 0, now.Location())
 
 	duration := time.Duration(0)
 
@@ -275,9 +276,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
 
 	appNameTagMap := map[string]string{
 		//"cmii-uav-multilink": "5.5.0",
-		//"cmii-uav-mqtthandler": "5.5.0",
-		//"cmii-uav-mission":      "5.5.0-042901",
-		"cmii-uav-surveillance": "5.5.0-042901",
+		"cmii-uav-industrial-portfolio": "5.5.0-050801",
 	}
 
 	for appName, newTag := range appNameTagMap {
diff --git a/agent-operator/CmiiOperator.go b/agent-operator/CmiiOperator.go
index a441005..2ceb356 100644
--- a/agent-operator/CmiiOperator.go
+++ b/agent-operator/CmiiOperator.go
@@ -156,6 +156,18 @@ func DownloadCompressUpload(fullNameList []string, shouldGzip bool, gzipFolderFu
 		fullNameList = slices.DeleteFunc(fullNameList, func(imageName string) bool {
 			return slices.Contains(errorGzipImageList, imageName)
 		})
+
+		// write to file
+		targetFile := gzipFolderFullPath + string(os.PathSeparator) + "all-gzip-image-file-name.txt"
+
+		for _, gzipFileFullName := range allGzipFileNameList {
+			utils.AppendContentToFile(
+				strings.TrimPrefix(gzipFileFullName, gzipFolderFullPath),
+				targetFile,
+			)
+		}
+
+		log.InfoF("all gzip file name list is %s", targetFile)
 	}
 
 	// Upload
diff --git a/agent-operator/CmiiOperator_test.go b/agent-operator/CmiiOperator_test.go
index 0aba9e8..68f0834 100644
--- a/agent-operator/CmiiOperator_test.go
+++ b/agent-operator/CmiiOperator_test.go
@@ -38,10 +38,11 @@ func TestPullFromEntityAndSyncConditionally(t *testing.T) {
 	// 创建一个模拟的sync对象，用于测试函数的行为。这里需要根据你的实际需求来设置mock数据和预期结果。
 	sync := ImageSyncEntity{
 		CmiiNameTagList: []string{
-			"cmii-uav-platform:5.5.0-offline",
+			//"cmii-uav-platform:5.5.0-offline",
 		},
 		FullNameImageList:        nil,
 		ProjectVersion:           "",
+		ProjectName:              "xjyd",
 		DirectHarborHost:         "harbor.wdd.io",
 		CompressImageToGzip:      true,
 		UploadToDemoMinio:        true,
diff --git a/agent-operator/log/cmii-update-log.txt b/agent-operator/log/cmii-update-log.txt
index 29fa407..21372c0 100644
--- a/agent-operator/log/cmii-update-log.txt
+++ b/agent-operator/log/cmii-update-log.txt
@@ -31,3 +31,8 @@
 2024-04-29-12-13-03 uavcloud-demo  cmii-uav-mission                        5.5.0-042401                  5.5.0-042901
 2024-04-29-12-14-37 uavcloud-demo  cmii-uav-surveillance                   5.5.0-042401                  5.5.0-042901
 2024-04-29-12-14-38 uavcloud-demo  cmii-uav-mqtthandler                    5.5.0-042901                  5.5.0
+2024-04-29-17-36-00 uavcloud-demo  cmii-uav-platform                       5.5.0-042901                  5.5.0-042903
+2024-04-29-17-36-45 uavcloud-demo  cmii-uav-industrial-portfolio           5.5.0-29353-042801            5.5.0-042901
+2024-04-30-11-57-00 uavcloud-demo  cmii-uav-platform                       5.5.0-042903                  5.5.0-043001
+2024-04-30-17-22-52 uavcloud-demo  cmii-uav-industrial-portfolio           5.5.0-042901                  5.5.0-043001
+2024-05-08-08-58-30 uavcloud-demo  cmii-uav-industrial-portfolio           5.5.0-043001                  5.5.0-050801