Skip to content

Commit 5f103a6

Browse files
hanzhuangHeChangHaoGary
authored andcommitted
[cicd][cluster] remove git
1 parent 5820827 commit 5f103a6

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

Jenkinsfile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,19 +88,19 @@ pipeline {
8888
}
8989

9090
steps {
91-
echo "update kolla_ansible"
92-
dir('/home/cicd/kolla-ansible') {
93-
sh '''
94-
git stash || true
95-
git pull origin dingoStack
96-
git stash pop || true
97-
# 检查冲突
98-
if git diff --name-only --diff-filter=U | grep .; then
99-
echo "出现冲突,请手动解决!"
100-
exit 1
101-
fi
102-
'''
103-
}
91+
// echo "update kolla_ansible"
92+
// dir('/home/cicd/kolla-ansible') {
93+
// sh '''
94+
// git stash || true
95+
// git pull origin dingoStack
96+
// git stash pop || true
97+
// # 检查冲突
98+
// if git diff --name-only --diff-filter=U | grep .; then
99+
// echo "出现冲突,请手动解决!"
100+
// exit 1
101+
// fi
102+
// '''
103+
// }
104104
echo "pull dingo-command images to test"
105105
dir('/home/cicd/kolla-ansible/tools') {
106106
sh 'ansible-playbook -e @/home/cicd/envs/test-regionone/globals.yml -e @/home/cicd/envs/test-regionone/passwords.yml --tags dingo-command -e openstack_tag=${IMAGE_TAG} -e kolla_action=pull ../ansible/site.yml --inventory /home/cicd/envs/test-regionone/multinode -e CONFIG_DIR=/home/cicd/envs/test-regionone -e docker_namespace=openstack -e docker_registry=harbor.zetyun.cn'

0 commit comments

Comments
 (0)