From c4acc672fbcac53ad3a55f2f58a2c4617c93e51e Mon Sep 17 00:00:00 2001 From: armando-migliaccio Date: Wed, 4 Mar 2015 20:21:37 -0800 Subject: [PATCH] Fix the Neutron functional job for stable branches Change e06c18 caused the Neutron functional job to break for stable branches. Even though the change was careful to avoid the breakage, it looks like the test: [[ ! $BRANCH_OVERRIDE =~ ^stable/(icehouse|juno)$ ]] led to setting DEVSTACK_GATE_PROJECTS_OVERRIDE, even for stable branches (as shown during the failed runs, e.g. [1]), thus breaking the functional job. This patch use the right variables instead. [1] http://logs.openstack.org/73/161273/1/check/check-neutron-dsvm-functional/56af914/console.html#_2015-03-05_00_26_21_129 Change-Id: I9c12f57b26e97da73364a6139a6e913f88e7f2d2 --- jenkins/jobs/neutron.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml index 5b1c7f3dca..12649f76e2 100644 --- a/jenkins/jobs/neutron.yaml +++ b/jenkins/jobs/neutron.yaml @@ -23,7 +23,7 @@ export BRANCH_OVERRIDE={branch-override} export DEVSTACK_GATE_TESTR_ARTIFACT_TARGET=neutron # Gate hooks previous to kilo will break if PROJECTS is overridden - if [[ ! "$BRANCH_OVERRIDE" =~ ^stable/(icehouse|juno)$ ]]; then + if [[ ! "$BRANCH_OVERRIDE" =~ ^stable/(icehouse|juno)$ ]] || [[ ! "$ZUUL_BRANCH" =~ ^stable/(icehouse|juno)$ ]] ; then export DEVSTACK_GATE_PROJECTS_OVERRIDE="openstack-dev/devstack openstack/neutron" fi if [ "$BRANCH_OVERRIDE" != "default" ] ; then