Merge lp:~brian-murray/ubuntu-qa-tools/uvt-verbosity into lp:ubuntu-qa-tools

[Brian Murray]

The --quiet option should only be used with virt-install if we are not using verbose mode.

Using os-variant=generic26 was failing for me. Running 'osinfo-query os' I didn't see any generic options at all, so switched to ubuntu$release_num.

ubuntu14.04 | Ubuntu 14.04 LTS | 14.04 | http://ubuntu.com/ubuntu/14.04
 ubuntu14.10 | Ubuntu 14.10 | 14.10 | http://ubuntu.com/ubuntu/14.10
 ubuntu15.04 | Ubuntu 15.04 | 15.04 | http://ubuntu.com/ubuntu/15.04
 ubuntu15.10 | Ubuntu 15.10 | 15.10 | http://ubuntu.com/ubuntu/15.10
 ubuntu16.04 | Ubuntu 16.04 | 16.04 | http://ubuntu.com/ubuntu/16.04

[Marc Deslauriers (mdeslaur)]

Thanks for the merge proposal.

I'm going to simply switch to 'generic' instead of 'ubuntu$release_num' as that will prevent us from running on earlier releases, or running newer versions of Ubuntu if they haven't yet been added to libosinfo.

We're overriding the disk and net options in our virt-install command anyway, so specifying the exact ubuntu version doesn't gain us anything.

I'll also add the verbose fix.

Thanks!

review: Disapprove

Unmerged revisions

1113. By Brian Murray on 2016-02-29

Don't use quiet if verbose. os-variant generic26 went away.

=== modified file 'vm-tools/uvt'
--- vm-tools/uvt	2016-02-04 13:12:50 +0000
+++ vm-tools/uvt	2016-02-29 23:26:23 +0000
@@ -161,6 +161,7 @@
               arch,
               opt.bridge,
               release,
+              release_num,
               opt.vnc,
               opt.loader,
               ovmf_uefi=opt.ovmf_uefi,
@@ -1555,7 +1556,7 @@
         print("ERROR: Something went wrong with qemu-img check!", file=sys.stderr)
         sys.exit(1)
 
-def create_vm(release_iso, vm_name, arch, bridge, release, vnc, loader, ovmf_uefi=False, verbose=False):
+def create_vm(release_iso, vm_name, arch, bridge, release, release_num, vnc, loader, ovmf_uefi=False, verbose=False):
     '''Creates a new vm with virt-install'''
 
     if arch == "amd64":
@@ -1590,7 +1591,6 @@
         preseed_iso_path = os.path.join(uvt_conf['vm_dir_iso'], release_iso)
 
     args = [ 'virt-install',
-             '--quiet',
              '--connect=qemu:///system',
              '--name=' + vm_name,
              '--arch=' + virtinst_arch,
@@ -1606,12 +1606,15 @@
              '--hvm',
              '--cdrom=' + preseed_iso_path,
              '--os-type=linux',
-             '--os-variant=generic26',
+             '--os-variant=ubuntu%s' % release_num,
              '--graphics=vnc',
              '--network=' + network_type + ',model=' + vm_net,
              '--video=' + vm_video,
              '--noreboot' ]
 
+    if not verbose:
+        args.append('--quiet')
+
     if vnc == False or 'DISPLAY' not in os.environ:
         args.append('--noautoconsole')