openstack/project-config
Code Issues Proposed changes

Merge "Switch gate-neutron-dsvm-scenario job to be invoked via tempest plugin framework"

Browse Source
This commit is contained in:
Jenkins 2016-04-17 09:34:28 +00:00 committed by Gerrit Code Review
commit 9ea3257733
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jenkins/jobs/devstack-gate.yaml
View File

@ -3069,7 +3069,7 @@
- '{pipeline}-tempest-dsvm-neutron-identity-v3-only-full{job-suffix}'
- '{pipeline}-tempest-dsvm-neutron-ovs-native{job-suffix}'
- '{pipeline}-tempest-dsvm-neutron-pg-full{job-suffix}'
- '{pipeline}-tempest-dsvm-neutron-scenarios{job-suffix}'
- '{pipeline}-tempest-dsvm-neutron-scenario{job-suffix}'
- '{pipeline}-tempest-dsvm-neutron{job-suffix}'
- '{pipeline}-tempest-dsvm-nova-v20-api-legacy{job-suffix}'
- '{pipeline}-tempest-dsvm-nova-v20-api{job-suffix}'

13
jenkins/jobs/neutron.yaml
View File

@ -490,7 +490,7 @@
- job-template:
name: '{pipeline}-tempest-dsvm-neutron-scenarios{job-suffix}'
name: '{pipeline}-tempest-dsvm-neutron-scenario{job-suffix}'
node: '{node}'
wrappers:
@ -508,27 +508,28 @@
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_NOTESTS=1
export DEVSTACK_GATE_EXERCISES=0
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_INSTALL_TESTONLY=1
export DEVSTACK_GATE_EXERCISES=0
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
export DEVSTACK_GATE_TEMPEST_REGEX="^neutron.tests.tempest.scenario\."
function gate_hook {{
bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-scenarios
bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-scenario
}}
export -f gate_hook
function post_test_hook {{
bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-scenarios
bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-scenario
}}
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

7
zuul/layout.yaml
View File

@ -2646,8 +2646,9 @@ jobs:
- name: gate-tempest-dsvm-neutron-full-ssh
voting: false
- name: gate-tempest-dsvm-neutron-scenarios
branch: ^(?!stable/(?:kilo|liberty)).*$
- name: gate-tempest-dsvm-neutron-scenario
branch: ^(?!stable/(?:kilo|liberty|mitaka)).*$
voting: false
- name: ^gate-.*-releasenotes$
success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/releasenotes/build/html/
@ -7718,7 +7719,7 @@ projects:
- neutron-coverage
experimental:
- gate-neutron-dsvm-functional-py34
- gate-tempest-dsvm-neutron-scenarios
- gate-tempest-dsvm-neutron-scenario
- gate-grenade-dsvm-neutron-forward
- gate-grenade-dsvm-neutron-dvr-multinode
- gate-neutron-vpnaas-dsvm-functional