[Agent][Deploy] - dev all accomplished

agent-operator/CmiiDeployOperator.go

@@ -15,10 +15,7 @@ import (
 func CmiiEnvDeploy(shouldDoCompleteDeploy bool) {
 
 	// 部署的环境
-	cmiiNamespace := dev
-
-	// 完整部署
-	//shouldDoCompleteDeploy := false
+	cmiiNamespace := devOperation
 
 	// 输出特定版本的Tag 或者 从DEMO环境拉取
 	DeploySpecificTag := "5.6.0"
@@ -71,7 +68,7 @@ func CmiiEnvDeploy(shouldDoCompleteDeploy bool) {
 	//clearOldApplyStuff(common, shouldDoCompleteDeploy)
 
 	// apply new app
-	//applyNewAppStuff(common, shouldDoCompleteDeploy)
+	applyNewAppStuff(common, shouldDoCompleteDeploy)
 
 	fmt.Println()
 	fmt.Println("-------------------- all done ---------------------")

agent-operator/CmiiK8sOperator_test.go

@@ -233,7 +233,7 @@ func TestBackupAllDeploymentFromEnv(t *testing.T) {
 
 func TestBackUpAllCmiiAppImageNameFromEnv(t *testing.T) {
 
-	BackUpAllCmiiAppImageNameFromEnv(integration)
+	BackUpAllCmiiAppImageNameFromEnv(demo)
 
 }
 
@@ -253,7 +253,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
 	// 计算20:00的时间
 	now := time.Now()
 
-	targetTime := time.Date(now.Year(), now.Month(), now.Day(), 9, 13, 00, 0, now.Location())
+	targetTime := time.Date(now.Year(), now.Month(), now.Day(), 10, 45, 00, 0, now.Location())
 
 	duration := time.Duration(0)
 
@@ -278,7 +278,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
 		//"cmii-uav-multilink": "5.5.0",
 		//"cmii-uav-process": "5.6.0-060601",
 		//"cmii-uav-industrial-portfolio": "5.6.0-061303",
-		"cmii-uav-industrial-portfolio": "5.6.0-061801",
+		"cmii-uav-industrial-portfolio": "5.6.0-061901",
 		//"cmii-uas-lifecycle": "5.6.0",
 		//"cmii-uas-lifecycle": "5.6.0-061401",
 	}

agent-operator/K8sOperator_test.go

@@ -229,7 +229,7 @@ func TestCmiiK8sOperator_PodByNodeName(t *testing.T) {
 
 func TestCmiiK8sOperator_NodeCordon(t *testing.T) {
 	cmiiEnv := devOperation
-	nodeName := "dev-06.ecs.io"
+	nodeName := "dev-master-01"
 
 	cordon := DefaultCmiiOperator.NodeCordon(cmiiEnv, nodeName)
 	assert.Equal(t, cordon, true, "cordon node failed !")

agent-operator/log/cmii-update-log.txt

@@ -63,3 +63,4 @@
 2024-06-14-17-47-17 uavcloud-demo  cmii-uav-industrial-portfolio           5.6.0-061303                  5.6.0-061401
 2024-06-14-17-49-53 uavcloud-demo  cmii-uas-lifecycle                      5.6.0                         5.6.0-061401
 2024-06-18-09-13-18 uavcloud-demo  cmii-uav-industrial-portfolio           5.6.0-061602                  5.6.0-061801
+2024-06-19-10-45-45 uavcloud-demo  cmii-uav-industrial-portfolio           5.6.0-061801                  5.6.0-061901