c4acc672fb
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
60 lines
2.2 KiB
YAML
60 lines
2.2 KiB
YAML
- job-template:
|
|
name: '{pipeline}-neutron-dsvm-functional{branch-designator}'
|
|
node: '{node}'
|
|
|
|
wrappers:
|
|
- build-timeout:
|
|
timeout: 125
|
|
- timestamps
|
|
|
|
builders:
|
|
- link-logs
|
|
- net-info
|
|
- devstack-checkout
|
|
- shell: |
|
|
#!/bin/bash -xe
|
|
export PYTHONUNBUFFERED=true
|
|
export DEVSTACK_GATE_UNSTACK=1
|
|
export DEVSTACK_GATE_TIMEOUT=120
|
|
export DEVSTACK_GATE_TEMPEST=0
|
|
export DEVSTACK_GATE_EXERCISES=0
|
|
export DEVSTACK_GATE_NEUTRON=1
|
|
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
|
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)$ ]] || [[ ! "$ZUUL_BRANCH" =~ ^stable/(icehouse|juno)$ ]] ; then
|
|
export DEVSTACK_GATE_PROJECTS_OVERRIDE="openstack-dev/devstack openstack/neutron"
|
|
fi
|
|
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
|
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
|
fi
|
|
|
|
function gate_hook {{
|
|
if [[ -e $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh ]]; then
|
|
bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-functional
|
|
else
|
|
# Before kilo
|
|
bash -xe $BASE/new/neutron/neutron/tests/functional/contrib/gate_hook.sh
|
|
fi
|
|
}}
|
|
export -f gate_hook
|
|
|
|
function post_test_hook {{
|
|
if [[ -e $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh ]]; then
|
|
bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-functional
|
|
else
|
|
# Before kilo
|
|
bash -xe $BASE/new/neutron/neutron/tests/functional/contrib/post_test_hook.sh
|
|
fi
|
|
}}
|
|
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
|
|
|
|
publishers:
|
|
- test-results
|
|
- devstack-logs
|
|
- console-log
|