From 88e7f8006e33cd39db0fee479cc36730fc13aeaa Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Sun, 14 Jun 2020 12:03:32 +0200 Subject: CI: Add Ubuntu KVM job This also uses the recommended machinery to set qemu instead of relying on config file override so that we test what we really want to test. Change-Id: I560e4f9d0a69c347e6aaf3b970331157c1a56f18 --- tests/templates/globals-default.j2 | 2 ++ tests/templates/nova-compute-overrides.j2 | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index e44b46809..dc649394a 100644 --- a/tests/templates/globals-default.j2 +++ b/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 }}" diff --git a/tests/templates/nova-compute-overrides.j2 b/tests/templates/nova-compute-overrides.j2 index 5ad30c8e4..26c756a04 100644 --- a/tests/templates/nova-compute-overrides.j2 +++ b/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 %} -- cgit v1.2.3