From 86b7849fd441c10e380b06f5f3b00eea67b0fc5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 20 Jun 2016 12:35:22 +0200 Subject: [PATCH] tests: update PVGrub2 test for fedora-23 template dnf doesn't want to replace packages without --allowerasing (it is needed to have correct kernel-devel package version). Additionally really make sure the right version is installed and force u2mfn module compilation. --- tests/vm_qrexec_gui.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/vm_qrexec_gui.py b/tests/vm_qrexec_gui.py index 5994acbb..61520ffa 100644 --- a/tests/vm_qrexec_gui.py +++ b/tests/vm_qrexec_gui.py @@ -1221,9 +1221,12 @@ class TC_40_PVGrub(qubes.tests.SystemTestsMixin): def install_packages(self, vm): if self.template.startswith('fedora-'): - cmd_install1 = 'yum clean expire-cache && ' \ - 'yum install -y qubes-kernel-vm-support grub2-tools' - cmd_install2 = 'yum install -y kernel kernel-devel' + cmd_install1 = 'dnf clean expire-cache && ' \ + 'dnf install -y qubes-kernel-vm-support grub2-tools' + cmd_install2 = 'yum install -y kernel && ' \ + 'KVER=$(rpm -q --qf %{VERSION}-%{RELEASE}.%{ARCH} kernel) && ' \ + 'dnf install --allowerasing -y kernel-devel-$KVER && ' \ + 'dkms autoinstall -k $KVER' cmd_update_grub = 'grub2-mkconfig -o /boot/grub2/grub.cfg' elif self.template.startswith('debian-'): cmd_install1 = 'apt-get update && apt-get install -y ' \