Merge "CI: Ubuntu host configure job"

playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2

@@ -16,8 +16,11 @@ controller_extra_network_interfaces:
   - test_net_eth_vlan
   - test_net_bridge
   - 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_vlan
+{% endif %}
 
 # dummy2: Ethernet interface.
 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_vlan: 43
 
+{% if ansible_os_family != 'Debian' %}
 # bond0: bond with slaves dummy5, dummy6.
 test_net_bond_cidr: 192.168.38.0/24
 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_interface: "{% raw %}{{ test_net_bond_interface }}.{{ test_net_bond_vlan_vlan }}{% endraw %}"
 test_net_bond_vlan_vlan: 44
+{% endif %}
 
 # Define a software RAID device consisting of two loopback devices.
 controller_mdadm_arrays:

playbooks/kayobe-overcloud-host-configure-base/tests/test_overcloud_host_configure.py

@@ -15,6 +15,13 @@ def _is_dnf():
     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):
     interface = host.interface('dummy2')
     assert interface.exists
@@ -52,6 +59,7 @@ def test_network_bridge_vlan(host):
     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):
     interface = host.interface('bond0')
     assert interface.exists
@@ -65,6 +73,7 @@ def test_network_bond(host):
        assert not interface.addresses
 
 
+@pytest.mark.skipif(not _supports_bonds(), reason="Bonding no worky on Ubuntu")
 def test_network_bond_vlan(host):
     interface = host.interface('bond0.44')
     assert interface.exists

requirements.yml

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

zuul.d/jobs.yaml

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

zuul.d/project.yaml

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