Also need to backport fix of PR 4543 and PR 4545 (apache#331)

bzhaoopenstack · Oct 8, 2018 · 57015d1 · 57015d1
1 parent c429c4c
commit 57015d1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/playbooks/docker-machine-functional-devstack/run.yaml b/playbooks/docker-machine-functional-devstack/run.yaml
@@ -24,6 +24,11 @@
           mkdir -p $GOPATH/src/github.com/docker/machine
           cp -r '{{ ansible_user_dir }}/{{ zuul.project.src_dir }}' $GOPATH/src/github.com/docker
           pushd $GOPATH/src/github.com/docker/machine
+          # NOTE: backport fix of PR 4543 and PR 4545
+          git config --global user.email 'zuul@openlab.com'
+          git config --global user.name 'openlab'
+          git cherry-pick 9ec6729
+          git cherry-pick 7909ee3
           make build
           cp ./bin/docker-machine /usr/local/bin/
           docker-machine version