openstack/project-config
Code Issues Proposed changes

Fix the Neutron functional job for stable branches

Browse Source 
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
This commit is contained in:
armando-migliaccio 2015-03-04 20:21:37 -08:00
parent 69567dadf6
commit c4acc672fb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jenkins/jobs/neutron.yaml
View File

@ -23,7 +23,7 @@
export BRANCH_OVERRIDE={branch-override} export BRANCH_OVERRIDE={branch-override}
export DEVSTACK_GATE_TESTR_ARTIFACT_TARGET=neutron export DEVSTACK_GATE_TESTR_ARTIFACT_TARGET=neutron
# Gate hooks previous to kilo will break if PROJECTS is overridden # 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" export DEVSTACK_GATE_PROJECTS_OVERRIDE="openstack-dev/devstack openstack/neutron"
fi fi
if [ "$BRANCH_OVERRIDE" != "default" ] ; then if [ "$BRANCH_OVERRIDE" != "default" ] ; then