Merge "neutron: kill non-dvr OVS scenario"
This commit is contained in:
commit
15bb9abe23
@ -2350,7 +2350,6 @@
|
|||||||
- '{pipeline}-tempest-dsvm-neutron-full-non-admin-{node}{suffix}'
|
- '{pipeline}-tempest-dsvm-neutron-full-non-admin-{node}{suffix}'
|
||||||
- '{pipeline}-tempest-dsvm-neutron-full-test-accounts-{node}{suffix}'
|
- '{pipeline}-tempest-dsvm-neutron-full-test-accounts-{node}{suffix}'
|
||||||
- '{pipeline}-tempest-dsvm-identity-v3-test-accounts-{node}{suffix}'
|
- '{pipeline}-tempest-dsvm-identity-v3-test-accounts-{node}{suffix}'
|
||||||
- '{pipeline}-tempest-dsvm-neutron-scenario-{node}{suffix}'
|
|
||||||
- '{pipeline}-tempest-dsvm-neutron-scenario-linuxbridge-{node}{suffix}'
|
- '{pipeline}-tempest-dsvm-neutron-scenario-linuxbridge-{node}{suffix}'
|
||||||
- '{pipeline}-tempest-dsvm-lxc-{node}{suffix}'
|
- '{pipeline}-tempest-dsvm-lxc-{node}{suffix}'
|
||||||
- '{pipeline}-tempest-dsvm-nova-v20-api-{node}{suffix}'
|
- '{pipeline}-tempest-dsvm-nova-v20-api-{node}{suffix}'
|
||||||
|
@ -602,53 +602,6 @@
|
|||||||
- console-log
|
- console-log
|
||||||
|
|
||||||
|
|
||||||
- job-template:
|
|
||||||
name: '{pipeline}-tempest-dsvm-neutron-scenario-{node}{suffix}'
|
|
||||||
node: '{node}'
|
|
||||||
|
|
||||||
wrappers:
|
|
||||||
- build-timeout:
|
|
||||||
timeout: 130
|
|
||||||
- timestamps
|
|
||||||
|
|
||||||
builders:
|
|
||||||
- print-template-name:
|
|
||||||
template-name: "{template-name}"
|
|
||||||
- link-logs
|
|
||||||
- net-info
|
|
||||||
- devstack-checkout
|
|
||||||
- shell: |
|
|
||||||
#!/bin/bash -xe
|
|
||||||
export PYTHONUNBUFFERED=true
|
|
||||||
export DEVSTACK_GATE_TEMPEST=1
|
|
||||||
export DEVSTACK_GATE_NEUTRON=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-scenario
|
|
||||||
}}
|
|
||||||
export -f gate_hook
|
|
||||||
|
|
||||||
function post_test_hook {{
|
|
||||||
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
|
|
||||||
- console-log
|
|
||||||
|
|
||||||
|
|
||||||
- job-template:
|
- job-template:
|
||||||
name: '{pipeline}-tempest-dsvm-neutron-dvr-multinode-scenario-{node-release}{suffix}'
|
name: '{pipeline}-tempest-dsvm-neutron-dvr-multinode-scenario-{node-release}{suffix}'
|
||||||
node: '{node}'
|
node: '{node}'
|
||||||
|
@ -3247,7 +3247,7 @@ jobs:
|
|||||||
- name: gate-tempest-dsvm-neutron-full-ssh
|
- name: gate-tempest-dsvm-neutron-full-ssh
|
||||||
voting: false
|
voting: false
|
||||||
|
|
||||||
- name: ^gate-tempest-dsvm-neutron-scenario(-linuxbridge)?-ubuntu-xenial$
|
- name: ^gate-tempest-dsvm-neutron-scenario-linuxbridge-ubuntu-xenial$
|
||||||
voting: false
|
voting: false
|
||||||
|
|
||||||
# NOTE(andrey-mp): nova-network is deprecated since Ocata
|
# NOTE(andrey-mp): nova-network is deprecated since Ocata
|
||||||
@ -12179,7 +12179,6 @@ projects:
|
|||||||
- neutron-coverage-ubuntu-trusty
|
- neutron-coverage-ubuntu-trusty
|
||||||
- neutron-coverage-ubuntu-xenial
|
- neutron-coverage-ubuntu-xenial
|
||||||
experimental:
|
experimental:
|
||||||
- gate-tempest-dsvm-neutron-scenario-ubuntu-xenial
|
|
||||||
- gate-tempest-dsvm-neutron-scenario-linuxbridge-ubuntu-xenial
|
- gate-tempest-dsvm-neutron-scenario-linuxbridge-ubuntu-xenial
|
||||||
- gate-tempest-dsvm-neutron-dvr-multinode-scenario-ubuntu-xenial-nv
|
- gate-tempest-dsvm-neutron-dvr-multinode-scenario-ubuntu-xenial-nv
|
||||||
- gate-grenade-dsvm-neutron-forward-ubuntu-trusty
|
- gate-grenade-dsvm-neutron-forward-ubuntu-trusty
|
||||||
|
Loading…
Reference in New Issue
Block a user