From 6333f1f6a16d280002ba63d192480fc4058456b2 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Tue, 8 Apr 2014 12:47:25 -0400 Subject: [PATCH] update config variable to OVERRIDE_foo_PROJECT_BRANCH because of conflicts with OVERRIDE_ZUUL_BRANCH the override variable was renamed in the d-g change. Update this to match. Change-Id: I4498a19de8769d32146f935ad290dcb0eccada9b --- .../files/jenkins_job_builder/config/devstack-gate.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml index 0d3ca1130a..fcca6221a1 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml @@ -149,7 +149,7 @@ if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi - export OVERRIDE_TEMPEST_BRANCH=master + export OVERRIDE_TEMPEST_PROJECT_BRANCH=master cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh @@ -311,7 +311,7 @@ if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi - export OVERRIDE_TEMPEST_BRANCH=master + export OVERRIDE_TEMPEST_PROJECT_BRANCH=master cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh