Merge "Remove branch-git-prep"

jenkins/jobs/devstack.yaml

@@ -28,7 +28,7 @@
       - proposal-slave-cleanup
       - revoke-sudo
       - link-logs
-      - branch-git-prep:
+      - zuul-git-branch-prep:
           branch: master
       - net-info
       - shell: |

jenkins/jobs/infra.yaml

@@ -225,7 +225,7 @@
     builders:
       - link-logs
       - net-info
-      - branch-git-prep:
+      - zuul-git-branch-prep:
           branch: master
       - shell: ./tools/propose_projects_yaml_update.sh
 

jenkins/jobs/macros.yaml

@@ -172,6 +172,7 @@
     builders:
       - shell: |
           #!/bin/bash -xe
+          export BRANCH={branch}
           CLONEMAP=`mktemp`
           function cleanup {{
               mkdir -p $WORKSPACE
@@ -183,15 +184,9 @@
             - name: $ZUUL_PROJECT
               dest: .
           EOF
-          # If this is called in a periodic job, these will not be set
-          export ZUUL_BRANCH=${{ZUUL_BRANCH:-master}}
-          export ZUUL_REF=${{ZUUL_REF:-None}}
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              BRANCH_ARG="--branch $BRANCH_OVERRIDE"
-          fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              $BRANCH_ARG git://git.openstack.org $ZUUL_PROJECT
+              --branch=$BRANCH \
+              git://git.openstack.org $ZUUL_PROJECT
 
 - builder:
     # Use this macro in the release pipeline to get a tagged repo with
@@ -257,15 +252,6 @@
           fi
 
 
-- builder:
-    name: branch-git-prep
-    builders:
-      - shell: |
-          #!/bin/bash
-          export BRANCH={branch}
-          /usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org git://git.openstack.org
-
-
 - builder:
     name: zuul-clone
     builders:

jenkins/jobs/openstack-publish-jobs.yaml

@@ -63,7 +63,7 @@
           # notes on other branches and insert them into the right
           # places in the documentation build, but only master has all
           # of the appropriate branch-specific input files for
-          # Sphinx. The branch-git-prep builder checks out the
+          # Sphinx. The zuul-git-branch-prep builder checks out the
           # repository where the current patch just merged, but it
           # honors zuul configuration variables that may cause it to
           # check out a patch merged into a stable branch. So, reset

jenkins/jobs/puppet-module-jobs.yaml

@@ -349,7 +349,7 @@
       - proposal-slave-cleanup
       - revoke-sudo
       - link-logs
-      - branch-git-prep:
+      - zuul-git-branch-prep:
           branch: master
       - net-info
       - shell: |

jenkins/jobs/requirements.yaml

@@ -282,7 +282,7 @@
       - revoke-sudo
       - link-logs
       - net-info
-      - branch-git-prep:
+      - zuul-git-branch-prep:
           branch: '{branch-override}'
       - shell: |
           export ZUUL_REFNAME={branch-override}