diff --git a/tests/run.yml b/tests/run.yml index 2cab332838d2db1a21bc6120ca1d32a4f5d7d93a..e9bdfece585a43046714a187e902451973c41a1e 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -21,7 +21,7 @@ need_build_image: false build_image_tag: "change_{{ zuul.change | default('none') }}" openstack_core_enabled: "{{ openstack_core_enabled }}" - openstack_core_tested: "{{ scenario in ['core', 'ceph-ansible', 'zun', 'cells', 'swift'] }}" + openstack_core_tested: "{{ scenario in ['core', 'ceph-ansible', 'zun', 'cells', 'swift', 'linuxbridge'] }}" dashboard_enabled: "{{ openstack_core_enabled }}" # TODO(mgoddard): Remove when previous_release is ussuri. playbook_python_version: "{{ '2' if is_upgrade and previous_release == 'train' else '3' }}" @@ -102,6 +102,7 @@ loop: - cinder - glance + - neutron - nova - bifrost - swift @@ -124,6 +125,10 @@ - src: "tests/templates/nova-compute-overrides.j2" dest: /etc/kolla/config/nova/nova-compute.conf when: "{{ openstack_core_enabled }}" + # neutron.conf + - src: "tests/templates/neutron-server-overrides.j2" + dest: /etc/kolla/config/neutron.conf + when: "{{ openstack_core_enabled }}" # bifrost/dib.yml - src: "tests/templates/bifrost-dib-overrides.j2" dest: /etc/kolla/config/bifrost/dib.yml diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index 664be05b24fbc0862221b14f6e757279b89563e8..4d8639a972b181351d83be144d1093a6abb364e4 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -120,3 +120,7 @@ openstack_cacert: "/usr/local/share/ca-certificates/kolla-customca-haproxy-inter openstack_cacert: "/etc/pki/ca-trust/source/anchors/kolla-customca-haproxy-internal.crt" {% endif %} {% endif %} + +{% if scenario == 'linuxbridge' %} +neutron_plugin_agent: "linuxbridge" +{% endif %} diff --git a/tests/templates/neutron-server-overrides.j2 b/tests/templates/neutron-server-overrides.j2 new file mode 100644 index 0000000000000000000000000000000000000000..ca84372fda1358baac4dd6aa7d0b21667f0e1b40 --- /dev/null +++ b/tests/templates/neutron-server-overrides.j2 @@ -0,0 +1,2 @@ +[DEFAULT] +global_physnet_mtu={{ ansible_vxlan0.mtu }} diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 9f25b7c230c3c1826adfc627795693947e51e285..47310801d1d96b56f9c1e024d7a0bd07a0eab070 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -144,3 +144,13 @@ voting: false vars: scenario: cells + +- job: + name: kolla-ansible-linuxbridge-base + parent: kolla-ansible-base + voting: false + files: + - ^ansible/roles/neutron/ + - ^tests/test-core-openstack.sh + vars: + scenario: linuxbridge diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 429eec1d2d426783e9bb92cc92608172486b9d53..cdf8361d84ecf990618e99de2f2a574270ec4bf0 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -336,3 +336,19 @@ vars: base_distro: centos install_type: source + +- job: + name: kolla-ansible-centos-source-linuxbridge + parent: kolla-ansible-linuxbridge-base + nodeset: kolla-ansible-centos + vars: + base_distro: centos + install_type: source + +- job: + name: kolla-ansible-ubuntu-source-linuxbridge + parent: kolla-ansible-linuxbridge-base + nodeset: kolla-ansible-bionic + vars: + base_distro: ubuntu + install_type: source diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 6e84c31a752406232f8f7fea4272695fc35a68e8..7749d5e789152ee604e1aa0cd7a64a5493a0f8bd 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -50,6 +50,8 @@ - kolla-ansible-ubuntu-source-ceph-ansible - kolla-ansible-centos-source-upgrade-ceph-ansible - kolla-ansible-ubuntu-source-upgrade-ceph-ansible + - kolla-ansible-centos-source-linuxbridge + - kolla-ansible-ubuntu-source-linuxbridge check-arm64: jobs: - kolla-ansible-debian-source-aarch64