Merge "CI: Add Ubuntu KVM job"

tests/templates/globals-default.j2

@@ -23,6 +23,8 @@ keepalived_virtual_router_id: "{{ 250 | random(1) }}"
 mariadb_wsrep_extra_provider_options:
   - "gmcast.peer_timeout=PT15S"
 
+nova_compute_virt_type: "{{ virt_type }}"
+
 enable_openstack_core: "{{ openstack_core_enabled }}"
 enable_horizon: "{{ dashboard_enabled }}"
 enable_heat: "{{ openstack_core_tested }}"

tests/templates/nova-compute-overrides.j2

@@ -1,9 +1,5 @@
 [libvirt]
-virt_type=qemu
-# NOTE(Jeffrey4l): fix the gate in iax-ord nodes for libvirt 2.0.
 {% if ansible_architecture == 'aarch64' %}
 cpu_mode=custom
 cpu_model=max
-{% else %}
-cpu_mode=none
 {% endif %}

zuul.d/base.yaml

@@ -28,6 +28,7 @@
     vars:
       previous_release: ussuri
       scenario: core
+      virt_type: qemu
       is_upgrade: no
       api_network_prefix: "192.0.2."
       api_network_prefix_length: "24"
@@ -44,6 +45,15 @@
     roles:
       - zuul: zuul/zuul-jobs
 
+- job:
+    name: kolla-ansible-kvm-base
+    parent: kolla-ansible-base
+    voting: false
+    files:
+      - ^ansible/roles/(nova-cell)/
+    vars:
+      virt_type: kvm
+
 - job:
     name: kolla-ansible-ipv6-base
     parent: kolla-ansible-base

zuul.d/jobs.yaml

@@ -36,6 +36,14 @@
       install_type: source
       tls_enabled: true
 
+- job:
+    name: kolla-ansible-ubuntu-source-kvm
+    parent: kolla-ansible-kvm-base
+    nodeset: kolla-ansible-bionic-nested-virt
+    vars:
+      base_distro: ubuntu
+      install_type: source
+
 - job:
     name: kolla-ansible-ubuntu-source-multinode-ipv6
     parent: kolla-ansible-ipv6-base

zuul.d/nodesets.yaml

@@ -82,3 +82,9 @@
         nodes:
           - secondary1
           - secondary2
+
+- nodeset:
+    name: kolla-ansible-bionic-nested-virt
+    nodes:
+      - name: primary
+        label: nested-virt-ubuntu-bionic

zuul.d/project.yaml

@@ -14,6 +14,7 @@
         - kolla-ansible-centos8-source
         - kolla-ansible-debian-source
         - kolla-ansible-ubuntu-source
+        - kolla-ansible-ubuntu-source-kvm
         - kolla-ansible-ubuntu-source-multinode-ipv6
         - kolla-ansible-centos8-source-bifrost
         - kolla-ansible-centos8-source-zun