change dockerbuild_and_push buildNumber to date String

src/org/qg/docker/StageBucket.groovy

@@ -230,9 +230,9 @@ def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemNa
     defaultSystemName = "project"
 		
 		timeStemp = new Date().format("yyyyMMddHHmmss")
-    
-    imageTag = "192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
-    
+
+    imageTag = "192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${buildNumber}"
+
     withDockerServer([uri: "tcp://192.168.4.96:2375/"]) {
         withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.36"]) {
             def image = docker.build(imageTag, "--build-arg BUILD_TIME=${timeNow} --build-arg BUILD_NUMBER=${buildNumber} --build-arg SYSTEM_NAME=${systemName} --build-arg BRANCH_NAME=${branchName} --build-arg SAFE_SYSTEM_NAME=${defaultSystemName} ${contextDir}")
@@ -253,7 +253,7 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) {
     def deploy_job_info
     
     if (isDeploy=="true") {
-        _utils().beautyEcho("将镜像更新到到Namespace:" + namespace, "info")
+        _utils().beautyEcho("[旧集群][deploy]将镜像更新到到Namespace:" + namespace, "info")
         deploy_job_info = build job: '3.deployer.Updater', parameters: [
           string(name: 'namespace', value:"${namespace}"),
           string(name:'name', value: "${systemName}"),
@@ -267,6 +267,18 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) {
     }
 }
 
+def deployV2(namespace, systemName, imageTag, tier, isDeploy) {
+    def deploy_job_info
+    
+    if (isDeploy=="true") {
+        _utils().beautyEcho("[新集群][deployV2]将镜像更新到到Namespace:" + namespace, "info")
+		log = update_microservice(namespace, systemName, imageTag, tier)
+		return log
+    }else{
+        _utils().beautyEcho("namespace:[${namespace}]不存在，不执行deploy", "info")
+    }
+}
+
 def clean_images(imageTag) {
     sh "docker rmi -f \$(docker images -q ${imageTag})"
 }
@@ -280,4 +292,20 @@ def project_attr(systemName) {
     response = httpRequest "http://192.168.4.3:10088/config_server/get_project_attr/${systemName}"
     def res_json = jsonParse(response.content)
     return res_json
-}
+}
\ No newline at end of file
+
+def update_microservice(namespace, name, image, tier) {
+	dest_url = "http://192.168.4.24/api/qahome/update_microservice"
+
+	json_str = '{"namespace":' + namespace + ',"name":' + name + ',"image":'+ image +',"tier":' + tier + '}'
+	echo json_str
+	
+	j = readJSON text:json_str
+
+	response = httpRequest contentType: "APPLICATION_JSON", httpMode: "PUT", requestBody: JsonOutput.toJson(j), url: dest_url
+    def res_json = jsonParse(response.content)
+    return res_json
+}
+
+
+

src/org/qg/tools/StageBucket.groovy

@@ -24,6 +24,7 @@ def checkout_eos(branchName) {
 
 def build_eos(contextDir) {
     sh "mv run.py ${contextDir}"
+	sh "mv requirements.txt ${contextDir}"
     sh 'tar zcf dist.tgz app/'
     sh "mv dist.tgz ${contextDir}"
 }

vars/qgDockerPipeline.groovy

@@ -115,8 +115,14 @@ def call(body) {
 
                         stage('Deploy To K8s Cluster') {
                             _utils.beautyEcho("Deploy To K8s Cluster", "stage")
-                            def deploy_log = _stage.deploy(namespace, systemName, imageTag, config.tier, isDeploy)
-                            _utils.beautyEcho(deploy_log, "info")
+							
+							def deploy_log
+							if (config.cluster == "271") {
+								deploy_log = _stage.deployV2(namespace, systemName, imageTag, config.tier, isDeploy)
+							}else{
+	                            deploy_log = _stage.deploy(namespace, systemName, imageTag, config.tier, isDeploy)
+							}
+							_utils.beautyEcho(deploy_log, "info")
                         }
         
                         stage("Clean") {