Merge "Switch constraints proposal to use zuul-git-prep"

2015-07-01 13:57:56 +00:00
parent 0ba6824e7a df9afa850a
commit 256f1ab233
1 changed files with 4 additions and 7 deletions
--- 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