From df9afa850a7efb49faa6524b4641f9d112533c9a Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Mon, 29 Jun 2015 23:43:59 +0000
Subject: [PATCH] Switch constraints proposal to use zuul-git-prep

This is a workaround for the inability to pass a branch override
into the gerrit-git-prep macro.

Change-Id: I698ca867f39c6ed032f37160163be16452250068
---
 jenkins/jobs/requirements.yaml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/jenkins/jobs/requirements.yaml b/jenkins/jobs/requirements.yaml
index 5f0430100b..a6b19434a1 100644
--- a/jenkins/jobs/requirements.yaml
+++ b/jenkins/jobs/requirements.yaml
@@ -93,14 +93,11 @@
       - revoke-sudo
       - link-logs
       - net-info
-      - gerrit-git-prep
+      - zuul-git-prep:
+          branch-override: '{branch-override}'
       - shell: |
-          #!/bin/bash -xe
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          /usr/local/jenkins/slave_scripts/propose_update.sh requirements-constraints
+          /usr/local/jenkins/slave_scripts/propose_update.sh \
+          requirements-constraints
 
     publishers:
       - console-log