Merge "Merge zuul-git-prep-upper-constraints/zuul-release-git-prep-upper-constraints"

jenkins/jobs/macros.yaml

@@ -53,39 +53,6 @@
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
               git://git.openstack.org $ZUUL_PROJECT
 
-- builder:
-    name: zuul-git-prep-upper-constraints
-    builders:
-      - shell: |
-          #!/bin/bash -xe
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there's also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-
 - builder:
     name: zuul-git-branch-prep-upper-constraints
     builders:
@@ -214,7 +181,7 @@
     # tag checked out and requirements repo with the branch the tag is
     # on.
     # The macro also works in other pipelines.
-    name: zuul-release-git-prep-upper-constraints
+    name: zuul-git-prep-upper-constraints
     builders:
       - shell: |
           #!/bin/bash -xe

jenkins/jobs/openstack-publish-jobs.yaml

@@ -5,7 +5,7 @@
     builders:
       - print-template-name:
           template-name: "{template-name}"
-      - zuul-release-git-prep-upper-constraints
+      - zuul-git-prep-upper-constraints
       - install-distro-packages
       - revoke-sudo
       - docs
@@ -28,7 +28,7 @@
     builders:
       - print-template-name:
           template-name: "{template-name}"
-      - zuul-release-git-prep-upper-constraints
+      - zuul-git-prep-upper-constraints
       - install-distro-packages
       - revoke-sudo
       - docs-tags-only-env:

jenkins/jobs/python-jobs.yaml

@@ -503,7 +503,7 @@
     builders:
       - print-template-name:
           template-name: "{template-name}"
-      - zuul-release-git-prep-upper-constraints
+      - zuul-git-prep-upper-constraints
       - install-distro-packages
       - revoke-sudo
       - tarball: