curtin-dev team mailing list archive

[Ryan Harper <ryan.harper@xxxxxxxxxxxxx>]

Ryan Harper has proposed merging ~raharper/curtin:fix/vmtest-centos-requires-reboot-mode into curtin:master.

Commit message:
vmtest: allow installed centos images to reboot

Centos images require a reboot on first boot for selinux relabing

LP: #1881011


Requested reviews:
  curtin developers (curtin-dev)
Related bugs:
  Bug #1881011 in curtin (Ubuntu): "vmtest: no-reboot prevents installed centos images from reporting success"
  https://bugs.launchpad.net/ubuntu/+source/curtin/+bug/1881011

For more details, see:
https://code.launchpad.net/~raharper/curtin/+git/curtin/+merge/384747
-- 
Your team curtin developers is requested to review the proposed merge of ~raharper/curtin:fix/vmtest-centos-requires-reboot-mode into curtin:master.

diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py
index 32cd5fd..adfcd24 100644
--- a/tests/vmtests/__init__.py
+++ b/tests/vmtests/__init__.py
@@ -1372,8 +1372,10 @@ class VMBaseClass(TestCase):
             'serial=%s' % os.path.basename(cls.td.output_disk))
         target_disks.extend([output_disk])
 
+        # centos requires a reboot after first boot to do selinux relabing
+        noreboot = ['--no-reboot'] if cls.target_distro != 'centos' else []
         # create xkvm cmd
-        cmd = (["tools/xkvm", "-v", dowait, '--no-reboot'] +
+        cmd = (["tools/xkvm", "-v", dowait] + noreboot +
                uefi_flags + netdevs +
                cls.mpath_diskargs(target_disks + extra_disks + nvme_disks) +
                ["--disk=file=%s,if=virtio,media=cdrom" % cls.td.seed_disk] +