From c84e3b6e849a193a2a8c9c5ab7466a5bd24b5aa2 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Thu, 25 Jul 2019 12:58:45 +0200
Subject: [PATCH] Force qemu emulation in CI and add dmidecode command to logs

Some upstream infra is enabling nested virtualization but it's failing
randomly so let's force qemu virt_type.

We need it to debugs issues with jobs incorrectly detecting
virtualization time.

Change-Id: I1e53bbdcccb6402d343c98abf2696d452717d1a9
---
 tests/scenario-py3.sh | 1 +
 tests/scenario001.sh  | 1 +
 tests/scenario002.sh  | 1 +
 tests/scenario003.sh  | 1 +
 tools/copy-logs.sh    | 1 +
 5 files changed, 5 insertions(+)

diff --git a/tests/scenario-py3.sh b/tests/scenario-py3.sh
index f2c012eb1..8d3a833a3 100755
--- a/tests/scenario-py3.sh
+++ b/tests/scenario-py3.sh
@@ -35,6 +35,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
           --os-horizon-ssl=n \
           --amqp-enable-ssl=n \
           --glance-backend=file \
+          --nova-libvirt-virt-type=qemu \
           --provision-uec-kernel-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-vmlinuz" \
           --provision-uec-ramdisk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-initrd" \
           --provision-uec-disk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \
diff --git a/tests/scenario001.sh b/tests/scenario001.sh
index 3a5b834ed..8295e65f3 100755
--- a/tests/scenario001.sh
+++ b/tests/scenario001.sh
@@ -36,6 +36,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
           --os-horizon-ssl=y \
           --amqp-enable-ssl=y \
           --glance-backend=file \
+          --nova-libvirt-virt-type=qemu \
           --provision-uec-kernel-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-vmlinuz" \
           --provision-uec-ramdisk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-initrd" \
           --provision-uec-disk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \
diff --git a/tests/scenario002.sh b/tests/scenario002.sh
index 946dfbfd7..46a7bd3b8 100755
--- a/tests/scenario002.sh
+++ b/tests/scenario002.sh
@@ -42,6 +42,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
           --os-sahara-install=y \
           --os-trove-install=y \
           --neutron-fwaas=y \
+          --nova-libvirt-virt-type=qemu \
           --provision-uec-kernel-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-vmlinuz" \
           --provision-uec-ramdisk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-initrd" \
           --provision-uec-disk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \
diff --git a/tests/scenario003.sh b/tests/scenario003.sh
index 766d61441..6cd60af3a 100755
--- a/tests/scenario003.sh
+++ b/tests/scenario003.sh
@@ -39,6 +39,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
           --os-heat-install=y \
           --os-magnum-install=y \
           --os-panko-install=y \
+          --nova-libvirt-virt-type=qemu \
           --provision-uec-kernel-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-vmlinuz" \
           --provision-uec-ramdisk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-initrd" \
           --provision-uec-disk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \
diff --git a/tools/copy-logs.sh b/tools/copy-logs.sh
index 8249303bd..1bba15e08 100755
--- a/tools/copy-logs.sh
+++ b/tools/copy-logs.sh
@@ -55,6 +55,7 @@ function get_diag_commands {
         'rpm -qa'
         'journalctl --no-pager'
         'ulimit -n'
+        'dmidecode'
     )
 
     echo "Installing required RPM packages..."