Merge branch 'master' into update-secrets

bzhaoopenstack · Sep 20, 2018 · 87db4e2 · 87db4e2
2 parents 944e119 + cba6bfd
commit 87db4e2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 17 deletions.
diff --git a/playbooks/docker-machine-functional-devstack/run.yaml b/playbooks/docker-machine-functional-devstack/run.yaml
@@ -24,14 +24,6 @@
           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
-          # Work around of issues 4542 and issues 4544
-          git remote add upstream https://github.com/docker/machine
-          git config --global user.email '[email protected]'
-          git config --global user.name 'openlab'
-          git fetch upstream refs/pull/4543/head:pr4543
-          git fetch upstream refs/pull/4545/head:pr4545
-          git cherry-pick pr4545
-          git cherry-pick pr4543
           make build
           cp ./bin/docker-machine /usr/local/bin/
           docker-machine version

diff --git a/playbooks/docker-machine-functional-public-clouds/run.yaml b/playbooks/docker-machine-functional-public-clouds/run.yaml
@@ -23,15 +23,6 @@
               cp -r '{{ ansible_user_dir }}/{{ zuul.project.src_dir }}' $GOPATH/src/github.com/docker/
               pushd $GOPATH/src/github.com/docker/machine
 
-              # Work around of issues 4542 and issues 4544
-              git remote add upstream https://github.com/docker/machine
-              git config --global user.email '[email protected]'
-              git config --global user.name 'openlab'
-              git fetch upstream refs/pull/4543/head:pr4543
-              git fetch upstream refs/pull/4545/head:pr4545
-              git cherry-pick pr4545
-              git cherry-pick pr4543
-
               make build
               cp ./bin/docker-machine /usr/local/bin/
               docker-machine version