From 7abf51b37d86fff55e2fc059043ed16271d95404 Mon Sep 17 00:00:00 2001
From: Julie Pichon <jpichon@redhat.com>
Date: Thu, 9 Oct 2014 11:12:42 +0100
Subject: [PATCH] Fix Horizon integration job definition

While job templates need double brackets, for a regular job definition
there should only be one. Also, remove statements that only apply to
job templates.

Change-Id: I31348a2b3d7d7a62844553a0ff7a5afa00aa1f49
Closes-Bug: #1379256
---
 jenkins/jobs/horizon.yaml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/jenkins/jobs/horizon.yaml b/jenkins/jobs/horizon.yaml
index bcc44d7180..d38b774e86 100644
--- a/jenkins/jobs/horizon.yaml
+++ b/jenkins/jobs/horizon.yaml
@@ -62,15 +62,11 @@
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
 
-          function post_test_hook {{
+          function post_test_hook {
               cd /opt/stack/new/horizon
               tox -e py27integration
-          }}
+          }
           export -f post_test_hook
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh