Merge "Replace ovsfw tempest job with iptables-hybrid tempest job"

This commit is contained in:
Zuul 2018-06-06 16:15:25 +00:00 committed by Gerrit Code Review
commit 9d056139a8
5 changed files with 11 additions and 11 deletions
.zuul.yaml
neutron/tests/contrib
playbooks/legacy/neutron-tempest-iptables_hybrid

@ -12,7 +12,7 @@
- neutron-grenade-dvr-multinode - neutron-grenade-dvr-multinode
- neutron-tempest-multinode-full - neutron-tempest-multinode-full
- neutron-tempest-dvr-ha-multinode-full - neutron-tempest-dvr-ha-multinode-full
- neutron-tempest-ovsfw - neutron-tempest-iptables_hybrid
- neutron-grenade - neutron-grenade
- openstack-tox-lower-constraints - openstack-tox-lower-constraints
gate: gate:
@ -21,7 +21,7 @@
- neutron-fullstack - neutron-fullstack
- neutron-tempest-dvr - neutron-tempest-dvr
- neutron-tempest-linuxbridge - neutron-tempest-linuxbridge
- neutron-tempest-ovsfw - neutron-tempest-iptables_hybrid
- neutron-grenade-multinode - neutron-grenade-multinode
- neutron-grenade-dvr-multinode - neutron-grenade-dvr-multinode
- neutron-grenade - neutron-grenade
@ -255,10 +255,10 @@
voting: false voting: false
- job: - job:
name: neutron-tempest-ovsfw name: neutron-tempest-iptables_hybrid
parent: legacy-dsvm-base parent: legacy-dsvm-base
run: playbooks/legacy/neutron-tempest-ovsfw/run.yaml run: playbooks/legacy/neutron-tempest-iptables_hybrid/run.yaml
post-run: playbooks/legacy/neutron-tempest-ovsfw/post.yaml post-run: playbooks/legacy/neutron-tempest-iptables_hybrid/post.yaml
timeout: 7800 timeout: 7800
required-projects: required-projects:
- openstack-infra/devstack-gate - openstack-infra/devstack-gate

@ -91,7 +91,7 @@ case $VENV in
load_rc_hook dstat load_rc_hook dstat
;; ;;
"api"|"api-pecan"|"full-ovsfw"|"full-pecan"|"dsvm-scenario-ovs"|"dsvm-scenario-linuxbridge") "api"|"api-pecan"|"full-iptables_hybrid"|"full-pecan"|"dsvm-scenario-ovs"|"dsvm-scenario-linuxbridge")
# TODO(ihrachys) consider feeding result of ext-list into tempest.conf # TODO(ihrachys) consider feeding result of ext-list into tempest.conf
load_rc_hook api_all_extensions load_rc_hook api_all_extensions
if [ "${FLAVOR}" = "dvrskip" ]; then if [ "${FLAVOR}" = "dvrskip" ]; then
@ -114,8 +114,8 @@ case $VENV in
if [[ "$VENV" =~ "pecan" ]]; then if [[ "$VENV" =~ "pecan" ]]; then
load_conf_hook pecan load_conf_hook pecan
fi fi
if [[ "$VENV" =~ "ovs" ]]; then if [[ "$VENV" =~ "iptables_hybrid" ]]; then
load_conf_hook ovsfw load_conf_hook iptables_hybrid
fi fi
if [[ "$VENV" != "dsvm-scenario-linuxbridge" ]]; then if [[ "$VENV" != "dsvm-scenario-linuxbridge" ]]; then
load_conf_hook tunnel_types load_conf_hook tunnel_types

@ -1,4 +1,4 @@
[[post-config|/$NEUTRON_CORE_PLUGIN_CONF]] [[post-config|/$NEUTRON_CORE_PLUGIN_CONF]]
[securitygroup] [securitygroup]
firewall_driver = openvswitch firewall_driver = iptables_hybrid

@ -1,5 +1,5 @@
- hosts: all - hosts: all
name: Autoconverted job legacy-tempest-dsvm-neutron-ovsfw from old job gate-tempest-dsvm-neutron-ovsfw-ubuntu-xenial-nv name: Neutron Tempest iptables-hybrid job
tasks: tasks:
- name: Ensure legacy workspace directory - name: Ensure legacy workspace directory
@ -37,7 +37,7 @@
fi fi
function gate_hook { function gate_hook {
bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh full-ovsfw bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh full-iptables_hybrid
} }
export -f gate_hook export -f gate_hook