From 5f9ba09c5e1c728784fefed11d3841fb97a286ed Mon Sep 17 00:00:00 2001
From: Riccardo Pittau <elfosardo@gmail.com>
Date: Thu, 5 Mar 2020 10:58:25 +0100
Subject: [PATCH] Make centos8 job vote again

Giving centos8 tinyipa vote rights again.

Fixing up some of the test scripts for CentOS 8.

- kvm_stats util has been moved to kernel-tools, the package
  qemu-kvm-tools doesn't exist anymore
- qemu-system-x86 doesn't exist anymore, therefore we run
  /usr/libexec/qemu-kvm instead of /bin/qemu-system-x86_64
- installing package trousers to add tss user and group
  needed by libvirt
- Stop setting CPU mode - allow libvirt to select. host-model was failing on
  libvirt 4.5.0 on CentOS 8 due to
  https://bugzilla.redhat.com/show_bug.cgi?id=1804224

Change-Id: I9488dcb8af70ea06de37ffec94620f8681c21944
---
 playbooks/roles/bifrost-create-vm-nodes/defaults/main.yml | 1 -
 .../defaults/required_defaults_CentOS.yml                 | 8 ++++----
 .../defaults/required_defaults_RedHat.yml                 | 2 +-
 .../roles/bifrost-create-vm-nodes/templates/testvm.xml.j2 | 7 +------
 scripts/test-bifrost.sh                                   | 1 +
 zuul.d/project.yaml                                       | 4 ++--
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/main.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/main.yml
index 9ab562bdb..6bdd941b1 100644
--- a/playbooks/roles/bifrost-create-vm-nodes/defaults/main.yml
+++ b/playbooks/roles/bifrost-create-vm-nodes/defaults/main.yml
@@ -5,7 +5,6 @@ test_vm_memory_size: "3072"
 test_vm_num_nodes: 1
 test_vm_domain_type: "qemu"
 test_vm_arch: "x86_64"
-test_vm_cpu: "host-model"
 test_vm_nic: "e1000"
 test_vm_groups: {}
 test_vm_default_groups: "{{ lookup('env', 'DEFAULT_HOST_GROUPS').split() | default(['baremetal'], true) }}"
diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_CentOS.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_CentOS.yml
index e9732fc70..b310871ae 100644
--- a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_CentOS.yml
+++ b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_CentOS.yml
@@ -3,10 +3,8 @@ sgabios_dir: /usr/share/sgabios/
 libvirt_service_name: libvirtd
 required_packages:
  - qemu-img
- - qemu-kvm-tools
+ - kernel-tools
  - qemu-kvm
- - qemu-kvm-common
- - qemu-system-x86
  - sgabios
  - sgabios-bin
  - libvirt
@@ -23,4 +21,6 @@ required_packages:
  - libvirt-daemon-kvm
  - pkgconfig
  - libvirt-devel
-test_vm_emulator: "/bin/qemu-system-x86_64"
+ - trousers
+test_vm_emulator: "/usr/libexec/qemu-kvm"
+test_vm_machine: "pc"
diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_RedHat.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_RedHat.yml
index 7e32b5ece..08fc9c404 100644
--- a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_RedHat.yml
+++ b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_RedHat.yml
@@ -4,7 +4,7 @@ libvirt_service_name: libvirtd
 required_packages:
  - gcc-c++
  - qemu-img
- - qemu-kvm-tools
+ - kernel-tools
  - qemu-kvm
  - qemu-kvm-common
  - qemu-system-x86
diff --git a/playbooks/roles/bifrost-create-vm-nodes/templates/testvm.xml.j2 b/playbooks/roles/bifrost-create-vm-nodes/templates/testvm.xml.j2
index b74047434..687eefa64 100644
--- a/playbooks/roles/bifrost-create-vm-nodes/templates/testvm.xml.j2
+++ b/playbooks/roles/bifrost-create-vm-nodes/templates/testvm.xml.j2
@@ -13,9 +13,6 @@
     <apic/>
     <pae/>
   </features>
-  <cpu mode='{{ test_vm_cpu }}'>
-    <model fallback='allow'/>
-  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -28,9 +25,7 @@
       <target dev='vda' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </disk>
-    <controller type='ide' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
-    </controller>
+    <controller type='sata' index='0'/>
     <interface type='network'>
       <source network='{{ test_vm_network }}'/>
       <model type='{{ test_vm_nic }}'/>
diff --git a/scripts/test-bifrost.sh b/scripts/test-bifrost.sh
index 8e5810485..584d41f19 100755
--- a/scripts/test-bifrost.sh
+++ b/scripts/test-bifrost.sh
@@ -26,6 +26,7 @@ ZUUL_REF=${ZUUL_REF:-}
 # use cirros.
 
 VM_MEMORY_SIZE="3072"
+# NOTE(rpittau) we can't use kvm in CI
 VM_DOMAIN_TYPE=qemu
 export VM_DISK_CACHE="unsafe"
 TEST_VM_NUM_NODES=1
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 984b0904b..2de31c992 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -8,6 +8,7 @@
     check:
       jobs:
         - bifrost-integration-tinyipa-ubuntu-bionic
+        - bifrost-integration-tinyipa-centos-8
         # - bifrost-integration-tinyipa-opensuse-15
         # Non-voting jobs
         - bifrost-integration-tinyipa-keystone-ubuntu-bionic:
@@ -20,8 +21,6 @@
             voting: false
         - bifrost-integration-dibipa-debian-centos-8:
             voting: false
-        - bifrost-integration-tinyipa-centos-8:
-            voting: false
         # - bifrost-integration-dhcp-opensuse-15:
         #    voting: false
         # - bifrost-integration-dibipa-debian-opensuse-15:
@@ -29,4 +28,5 @@
     gate:
       jobs:
         - bifrost-integration-tinyipa-ubuntu-bionic
+        - bifrost-integration-tinyipa-centos-8
         # - bifrost-integration-tinyipa-opensuse-15