From c883ee2862a495f0c52d3dedbdeb2e12835a9fb6 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 2 Dec 2013 13:46:34 -0800 Subject: [PATCH] Set BRANCH_OVERRIDE in swift functional tests. BRANCH_OVERRIDE was not set in the swift functional tests making those tests fail horribly. Set the variable so that the comparison that sets ZUUL_BRANCH does the right thing. Change-Id: If1c4e347dc75b9f760b5726407f69a219abaa938 --- .../files/jenkins_job_builder/config/swift-functional.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml b/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml index 97f03fc2be..a02c56bb65 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml @@ -15,10 +15,10 @@ export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=0 export DEVSTACK_GATE_EXERCISES=0 + export BRANCH_OVERRIDE={branch-override} if [ "$BRANCH_OVERRIDE" != "default" ] ; then export ZUUL_BRANCH=$BRANCH_OVERRIDE fi - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh function post_test_hook {{ cd /opt/stack/new/swift