From 7972b4661611a6633cc5346532f0e349d009ff4d Mon Sep 17 00:00:00 2001 From: Federico Ressi Date: Tue, 30 Jul 2019 16:12:01 +0200 Subject: [PATCH] Enable Neutron L3 agent on sub-nodes on upstream CI The purpouse is being able to test L3-HA scenario tests Co-Authored-By: Slawomir Kaplonski Change-Id: I1710c1abf644a6d00f3e4dfc1875b33b84a10013 --- playbooks/multinode-devstack-pre-run.yaml | 3 +++ tobiko/tests/scenario/neutron/test_network.py | 2 +- zuul.d/tobiko-devstack.yaml | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 playbooks/multinode-devstack-pre-run.yaml diff --git a/playbooks/multinode-devstack-pre-run.yaml b/playbooks/multinode-devstack-pre-run.yaml new file mode 100644 index 000000000..8afd8a5a4 --- /dev/null +++ b/playbooks/multinode-devstack-pre-run.yaml @@ -0,0 +1,3 @@ +- hosts: all + roles: + - multi-node-setup diff --git a/tobiko/tests/scenario/neutron/test_network.py b/tobiko/tests/scenario/neutron/test_network.py index 15b99a4f6..f8cc9cdfb 100644 --- a/tobiko/tests/scenario/neutron/test_network.py +++ b/tobiko/tests/scenario/neutron/test_network.py @@ -117,7 +117,7 @@ class L3haSameHostNetworkTest(SameHostNetworkTest): @neutron.skip_if_missing_networking_extensions('l3-ha') @neutron.skip_if_missing_networking_agents(binary='neutron-l3-agent', count=2) -class L3haDifferentHostNetworkTest(SameHostNetworkTest): +class L3haDifferentHostNetworkTest(DifferentHostNetworkTest): #: Resources stack with Nova server to send messages to stack = tobiko.required_setup_fixture( stacks.L3haDifferentHostServerStackFixture) diff --git a/zuul.d/tobiko-devstack.yaml b/zuul.d/tobiko-devstack.yaml index 5efb2b942..321df1ddc 100644 --- a/zuul.d/tobiko-devstack.yaml +++ b/zuul.d/tobiko-devstack.yaml @@ -132,6 +132,9 @@ abstract: true description: | Base Tobiko devstack job with multinode. + roles: + - zuul: openstack/neutron-tempest-plugin + pre-run: playbooks/multinode-devstack-pre-run.yaml vars: topology: multinode devstack_localrc: @@ -154,6 +157,8 @@ neutron-agent: true peakmem_tracker: true q-agt: true + q-l3: true + q-meta: true tls-proxy: false