jobs: Update devstack-checkout

diff --git a/jenkins/jobs/macros-common.yaml b/jenkins/jobs/macros-common.yaml
index 92ca55ca91693c87d1a02bac3adb0d6e46fdee19..6d72f0a0de8e5c39b6f29b774f84d2ab90e3aef8 100644 (file)
--- a/jenkins/jobs/macros-common.yaml
+++ b/jenkins/jobs/macros-common.yaml
@@ -3,25 +3,14 @@
     builders:
       - shell: |
           #!/bin/bash -xe
-          if [[ ! -e devstack-gate ]]; then
-              git clone git://git.openstack.org/openstack-infra/devstack-gate
-          else
-              cd devstack-gate
-              git remote set-url origin git://git.openstack.org/openstack-infra/devstack-gate
-              git remote update
-              git reset --hard
-              if ! git clean -x -f ; then
-                  sleep 1
-                  git clean -x -f
-              fi
-              git checkout master
-              git reset --hard remotes/origin/master
-              if ! git clean -x -f ; then
-                  sleep 1
-                  git clean -x -f
-              fi
-              cd ..
-          fi
+          cat > clonemap.yaml << EOF
+          clonemap:
+            - name: openstack-infra/devstack-gate
+              dest: devstack-gate
+          EOF
+          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
+              git://git.openstack.org \
+              openstack-infra/devstack-gate
 
 - builder:
     name: devstack-checkout-http