diff options
| author | Zuul <zuul@review.opendev.org> | 2023-02-28 15:34:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-02-28 15:34:04 +0000 |
| commit | 4fc1bcebbdc0fef0f2af536fee46982457e869ca (patch) | |
| tree | 16cfe12bb4301e5c024df3ac2b581bce1e8df146 | |
| parent | 2d75d98d3ae302cb2a5039c28cbcfa5b4c8fbd05 (diff) | |
| parent | 169ef0558926656fe9ef38fea42dcada2786ae0d (diff) | |
| download | neutron-4fc1bcebbdc0fef0f2af536fee46982457e869ca.tar.gz | |
Merge "Change neutron-ovs-tempest-dvr-ha-multinode-full job's config"
| -rw-r--r-- | doc/source/contributor/testing/ci_scenario_jobs.rst | 6 | ||||
| -rw-r--r-- | zuul.d/tempest-multinode.yaml | 42 |
2 files changed, 44 insertions, 4 deletions
diff --git a/doc/source/contributor/testing/ci_scenario_jobs.rst b/doc/source/contributor/testing/ci_scenario_jobs.rst index fb544d93f9..af81cef608 100644 --- a/doc/source/contributor/testing/ci_scenario_jobs.rst +++ b/doc/source/contributor/testing/ci_scenario_jobs.rst @@ -73,9 +73,9 @@ Below is a summary of those jobs. | |(only tests related to | | | | | | | | | | | |Neutron and Nova) | | | | | | | | | | +----------------------------------------------+----------------------------------+-------+------------------+-------------+-----------------+----------+-------+--------+------------+-------------+ - |neutron-ovs-tempest-dvr-ha-multinode-full |tempest.api (without slow tests) | 3 | Ubuntu Jammy | openvswitch | openvswitch | dvr | True | True | True | No | - |(non-voting) |tempest.scenario | | | | | dvr_snat | | | | | - | | | | | | | dvr_snat | | | | | + |neutron-ovs-tempest-dvr-ha-multinode-full |tempest.api (without slow tests) | 3 | Ubuntu Jammy | openvswitch | openvswitch | dvr_snat | True | True | True | No | + |(non-voting) |tempest.scenario | | | | | dvr | | | | | + | | | | | | | dvr | | | | | +----------------------------------------------+----------------------------------+-------+------------------+-------------+-----------------+----------+-------+--------+------------+-------------+ |neutron-ovs-tempest-slow |tempest slow tests | 2 | Ubuntu Jammy | openvswitch | openvswitch | legacy | False | False | True | Yes | +----------------------------------------------+----------------------------------+-------+------------------+-------------+-----------------+----------+-------+--------+------------+-------------+ diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index 24fea9085c..394cf49862 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -1,6 +1,41 @@ +- nodeset: + name: neutron-three-node-jammy + nodes: + - name: controller + label: ubuntu-jammy + - name: compute1 + label: ubuntu-jammy + - name: compute2 + label: ubuntu-jammy + groups: + # Node where tests are executed and test results collected + - name: tempest + nodes: + - controller + # Nodes running the compute service + - name: compute + nodes: + - compute1 + - compute2 + # Nodes that are not the controller + - name: subnode + nodes: + - compute1 + - compute2 + # Switch node for multinode networking setup + - name: switch + nodes: + - controller + # Peer nodes for multinode networking setup + - name: peers + nodes: + - compute1 + - compute2 + - job: name: neutron-ovs-tempest-dvr-ha-multinode-full parent: tempest-multinode-full-py3 + nodeset: neutron-three-node-jammy timeout: 10800 roles: - zuul: openstack/neutron-tempest-plugin @@ -51,6 +86,11 @@ devstack_services: br-ex-tcpdump: true br-int-flows: true + # Nova services + # NOTE(slaweq): this node is going to be only control plane and + # networker node with "dvr_snat" L3 agent mode. Other nodes in that job + # are compute nodes with L3 agent in "dvr" mode + n-cpu: false # Neutron services q-agt: true q-dhcp: true @@ -150,7 +190,7 @@ resource_provider_bandwidths: br-ex:1000000:1000000 $NEUTRON_L3_CONF: DEFAULT: - agent_mode: dvr_snat + agent_mode: dvr agent: availability_zone: nova debug_iptables_rules: True |