[cicd][cluster] add new push

hanzhuang · HeChangHaoGary · commit 668bc676bc9b · 2025-07-25T10:58:56.000Z
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -50,6 +50,10 @@ pipeline {
                 retry(3) {
                     sh 'podman push harbor.zetyun.cn/dingostack/dingo-command:${IMAGE_TAG}'
                 }
+                sh 'podman tag harbor.zetyun.cn/dingostack/dingo-command:${IMAGE_TAG} harbor.zetyun.cn/openstack/dingo-command:${IMAGE_TAG}'
+                retry(3) {
+                    sh 'podman push harbor.zetyun.cn/openstack/dingo-command:${IMAGE_TAG}'
+                }
             }
             
         }
@@ -87,7 +91,7 @@ pipeline {
                         echo "update kolla_ansible"
                         dir('/home/cicd/kolla-ansible') {
                              sh '''
-                                git stash
+                                git stash || true
                                 git pull origin dingoStack
                                 git stash pop || true
                                 # 检查冲突

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,10 @@ pipeline {`
`50`	`50`	`retry(3) {`
`51`	`51`	`sh 'podman push harbor.zetyun.cn/dingostack/dingo-command:${IMAGE_TAG}'`
`52`	`52`	`}`
	`53`	`+ sh 'podman tag harbor.zetyun.cn/dingostack/dingo-command:${IMAGE_TAG} harbor.zetyun.cn/openstack/dingo-command:${IMAGE_TAG}'`
	`54`	`+ retry(3) {`
	`55`	`+ sh 'podman push harbor.zetyun.cn/openstack/dingo-command:${IMAGE_TAG}'`
	`56`	`+ }`
`53`	`57`	`}`
`54`	`58`
`55`	`59`	`}`
`@@ -87,7 +91,7 @@ pipeline {`
`87`	`91`	`echo "update kolla_ansible"`
`88`	`92`	`dir('/home/cicd/kolla-ansible') {`
`89`	`93`	`sh '''`
`90`		`- git stash`
	`94`	`+ git stash \|\| true`
`91`	`95`	`git pull origin dingoStack`
`92`	`96`	`git stash pop \|\| true`
`93`	`97`	`# 检查冲突`