CI: Ubuntu host configure job

Issues:

* bond configuration not working on Ubuntu - disabled in CI test

Story: 2004960
Task: 41560

Change-Id: Ib124dc6f313a2a13fa509b10702c6141f102f2f9
This commit is contained in:
Mark Goddard 2021-01-07 14:32:54 +00:00
parent 9f41cefc15
commit 9c29d7d76c
5 changed files with 23 additions and 2 deletions

View File

@ -16,8 +16,11 @@ controller_extra_network_interfaces:
- test_net_eth_vlan - test_net_eth_vlan
- test_net_bridge - test_net_bridge
- test_net_bridge_vlan - test_net_bridge_vlan
{# Bond configuration does not seem to work with dummy interfaces on Ubuntu #}
{% if ansible_os_family != 'Debian' %}
- test_net_bond - test_net_bond
- test_net_bond_vlan - test_net_bond_vlan
{% endif %}
# dummy2: Ethernet interface. # dummy2: Ethernet interface.
test_net_eth_cidr: 192.168.34.0/24 test_net_eth_cidr: 192.168.34.0/24
@ -41,6 +44,7 @@ test_net_bridge_vlan_cidr: 192.168.37.0/24
test_net_bridge_vlan_interface: "{% raw %}{{ test_net_bridge_interface }}.{{ test_net_bridge_vlan_vlan }}{% endraw %}" test_net_bridge_vlan_interface: "{% raw %}{{ test_net_bridge_interface }}.{{ test_net_bridge_vlan_vlan }}{% endraw %}"
test_net_bridge_vlan_vlan: 43 test_net_bridge_vlan_vlan: 43
{% if ansible_os_family != 'Debian' %}
# bond0: bond with slaves dummy5, dummy6. # bond0: bond with slaves dummy5, dummy6.
test_net_bond_cidr: 192.168.38.0/24 test_net_bond_cidr: 192.168.38.0/24
test_net_bond_interface: bond0 test_net_bond_interface: bond0
@ -50,6 +54,7 @@ test_net_bond_bond_slaves: [dummy5, dummy6]
test_net_bond_vlan_cidr: 192.168.39.0/24 test_net_bond_vlan_cidr: 192.168.39.0/24
test_net_bond_vlan_interface: "{% raw %}{{ test_net_bond_interface }}.{{ test_net_bond_vlan_vlan }}{% endraw %}" test_net_bond_vlan_interface: "{% raw %}{{ test_net_bond_interface }}.{{ test_net_bond_vlan_vlan }}{% endraw %}"
test_net_bond_vlan_vlan: 44 test_net_bond_vlan_vlan: 44
{% endif %}
# Define a software RAID device consisting of two loopback devices. # Define a software RAID device consisting of two loopback devices.
controller_mdadm_arrays: controller_mdadm_arrays:

View File

@ -15,6 +15,13 @@ def _is_dnf():
return info[0] == 'CentOS Linux' and info[1].startswith('8') return info[0] == 'CentOS Linux' and info[1].startswith('8')
def _supports_bonds():
# Bond configuration does not currently work on Ubuntu when using dummy
# devices as slaves.
info = distro.linux_distribution()
return info[0] != 'Ubuntu'
def test_network_ethernet(host): def test_network_ethernet(host):
interface = host.interface('dummy2') interface = host.interface('dummy2')
assert interface.exists assert interface.exists
@ -52,6 +59,7 @@ def test_network_bridge_vlan(host):
assert host.file('/sys/class/net/br0.43/lower_br0').exists assert host.file('/sys/class/net/br0.43/lower_br0').exists
@pytest.mark.skipif(not _supports_bonds(), reason="Bonding no worky on Ubuntu")
def test_network_bond(host): def test_network_bond(host):
interface = host.interface('bond0') interface = host.interface('bond0')
assert interface.exists assert interface.exists
@ -65,6 +73,7 @@ def test_network_bond(host):
assert not interface.addresses assert not interface.addresses
@pytest.mark.skipif(not _supports_bonds(), reason="Bonding no worky on Ubuntu")
def test_network_bond_vlan(host): def test_network_bond_vlan(host):
interface = host.interface('bond0.44') interface = host.interface('bond0.44')
assert interface.exists assert interface.exists

View File

@ -5,7 +5,7 @@
# There are no versioned releases of this role. # There are no versioned releases of this role.
version: 8438592c84585c86e62ae07e526d3da53629b377 version: 8438592c84585c86e62ae07e526d3da53629b377
- src: MichaelRigart.interfaces - src: MichaelRigart.interfaces
version: v1.11.0 version: v1.11.1
- src: mrlesmithjr.manage-lvm - src: mrlesmithjr.manage-lvm
version: v0.1.4 version: v0.1.4
- src: mrlesmithjr.mdadm - src: mrlesmithjr.mdadm
@ -26,7 +26,7 @@
- src: stackhpc.libvirt-vm - src: stackhpc.libvirt-vm
version: v1.13.0 version: v1.13.0
- src: stackhpc.luks - src: stackhpc.luks
version: 0.3.2 version: 0.4.0
- src: stackhpc.mellanox-switch - src: stackhpc.mellanox-switch
version: v1.0.0 version: v1.0.0
- src: stackhpc.os-images - src: stackhpc.os-images

View File

@ -160,6 +160,11 @@
parent: kayobe-overcloud-host-configure-base parent: kayobe-overcloud-host-configure-base
nodeset: kayobe-centos8 nodeset: kayobe-centos8
- job:
name: kayobe-overcloud-host-configure-ubuntu-focal
parent: kayobe-overcloud-host-configure-base
nodeset: kayobe-ubuntu-focal
- job: - job:
name: kayobe-seed-upgrade-base name: kayobe-seed-upgrade-base
parent: kayobe-base parent: kayobe-base

View File

@ -14,6 +14,7 @@
- kayobe-overcloud-ubuntu-focal - kayobe-overcloud-ubuntu-focal
- kayobe-overcloud-tls-centos8 - kayobe-overcloud-tls-centos8
- kayobe-overcloud-host-configure-centos8 - kayobe-overcloud-host-configure-centos8
- kayobe-overcloud-host-configure-ubuntu-focal
- kayobe-overcloud-upgrade-centos8 - kayobe-overcloud-upgrade-centos8
- kayobe-seed-centos8 - kayobe-seed-centos8
- kayobe-seed-upgrade-centos8 - kayobe-seed-upgrade-centos8
@ -29,6 +30,7 @@
- kayobe-overcloud-ubuntu-focal - kayobe-overcloud-ubuntu-focal
- kayobe-overcloud-tls-centos8 - kayobe-overcloud-tls-centos8
- kayobe-overcloud-host-configure-centos8 - kayobe-overcloud-host-configure-centos8
- kayobe-overcloud-host-configure-ubuntu-focal
- kayobe-overcloud-upgrade-centos8 - kayobe-overcloud-upgrade-centos8
- kayobe-seed-centos8 - kayobe-seed-centos8
- kayobe-seed-upgrade-centos8 - kayobe-seed-upgrade-centos8