File tree Expand file tree Collapse file tree 1 file changed +13
-13
lines changed Expand file tree Collapse file tree 1 file changed +13
-13
lines changed Original file line number Diff line number Diff line change @@ -88,19 +88,19 @@ pipeline {
88
88
}
89
89
90
90
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
+ // }
104
104
echo " pull dingo-command images to test"
105
105
dir(' /home/cicd/kolla-ansible/tools' ) {
106
106
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'
You can’t perform that action at this time.
0 commit comments