Merge lp:~nuclearbob/utah/output-preseed into lp:utah

[Max Brustkern]

This branch adds a --outputpreseed option. This options saves a copy of the final preseed to /var/log/utah and outputs the name of that preseed in the same manner as the other logs, so it will be automatically gathered. If we merge this, we should later update the job generation to include this option in jobs by default, or update the config file on the lab machines to enable it by default.

[Javier Collado (javier.collado)]

I think it looks good, but I'd like you to update the code to merge nicely
after the reorganization changes, so that it can be easily tested.

Also, I've got a couple of comments that don't necessarily need to be addressed
now:

1) Arguments

Given that we've got several binaries with the same arguments (together with
slight differentces), it's quite against DRY having to write the same argument
5 times. We should be able to factor that out at least to some prototype:

(somewhere in a common file)
outputpreseed_argument = {'name': '--outputpreseed',
                          'action': store_true',
                          'help': Copy preseed to logs directory and list as log file in output',
                         }

(in every script)
parser.add_argument(**outputpreseed_argument)

2) Default values

I think that having always the options to pass a command line argument or setting the
same thing in a configuration file like in the following line:

if args.outputpreseed or config.outputpreseed:

can be confusing in a shared environment where the configuration won't be
controlled by a single person. To reduce the confusion a little bit, I propose
to dump in the logs what's the actual configuration UTAH is going to be used,
so that when unexpected behavior happens, it can be checked it that actually
matches with the final configuration from different sources.

[Max Brustkern (nuclearbob)]

These are both good suggestions. I'll resubmit after implementing them.

[lp:~nuclearbob/utah/output-preseed]

780. By Max Brustkern on 2012-12-17

Merged latest changes
* Updating to version 0.6
* Added baremetal fixes

781. By Max Brustkern on 2012-12-17

Removed extraneous file

782. By Max Brustkern on 2012-12-19

Refactored command line argument sections per Javier's suggestion

783. By Max Brustkern on 2012-12-19

Added logging for why the preseed was captued

[Max Brustkern (nuclearbob)]

Those should be updated now.

review: Needs Resubmitting

[Javier Collado (javier.collado)]

Thanks for the update Max.

The refactoring for the command line options looks nice.

Regarding writing to logs the configuration values, I meant to do that for
every value; but, since that's out of the scope for this bug, I've opened
bug1095994 to follow up on that issue.

I see some changes in provisioning.py regarding cleanup functions that I'm not
sure they fit wit hthe purpose of this merge request. Could you summarize what
are they intended to do?

Also, I see some conversions from OrderedSet to tuple in for loops. Is that
really needed? It should be possible to iterate over the OrderedSet without
such a conversion.

review: Needs Information

[Max Brustkern (nuclearbob)]

I ran into a bunch of errors with the cleanup when I was testing this, and if one part failed, we just passed the exception up instead of continuing. I also found cases where cleanfunctions failed because it was expecting files to exist that were deleted by cleanfiles, so I reordered those. The tuple conversions may be unnecessary at this point; when I started working on cleanup, I had it broken into sections, and there was a weird construction to make the lists of things to do. They may be left over from that. I can test it without the tuple conversions and see if that creates an issue.

[Javier Collado (javier.collado)]

I've tested with the `pass.run` runlist successfully without the `tuple`
conversions, so I'm merging these changes.

review: Approve

=== modified file 'examples/run_install_test.py'
--- examples/run_install_test.py	2012-12-12 20:58:59 +0000
+++ examples/run_install_test.py	2012-12-19 19:47:27 +0000
@@ -18,12 +18,16 @@
 import argparse
 import sys
 
-from utah import config
 from utah.exceptions import UTAHException
-from utah.url import url_argument
 from utah.group import check_user_group, print_group_error_message
 from utah.provisioning.vm.vm import CustomVM, TinySQLiteInventory
-from utah.run import run_tests
+from utah.run import (
+    common_arguments,
+    custom_arguments,
+    file_arguments,
+    run_tests,
+    virtual_arguments,
+)
 
 
 def get_parser():
@@ -37,63 +41,10 @@
                 "\t\t/usr/share/utah/client/examples/master.run \\\n"
                 "\t\t'http://people.canonical.com/~max/max_test.run'"),
         formatter_class=argparse.RawDescriptionHelpFormatter)
-    parser.add_argument('runlists', metavar='runlist', nargs='+',
-                        type=url_argument, help='URLs of runlist files to run')
-    parser.add_argument('-m', '--machinetype', metavar='MACHINETYPE',
-                        choices=('physical', 'virtual'), default='virtual',
-                        help='Type of machine to provision (%(choices)s)')
-    parser.add_argument('-e', '--emulator',
-                        help=('Emulator to use (kvm and qemu are supported, '
-                              'kvm will be favored if available)'))
-    parser.add_argument('-i', '--image', type=url_argument,
-                        help='Image/ISO file to use for installation')
-    parser.add_argument('-k', '--kernel', type=url_argument,
-                        help='Kernel file to use for installation')
-    parser.add_argument('-r', '--initrd', type=url_argument,
-                        help='InitRD file to use for installation')
-    parser.add_argument('-p', '--preseed', type=url_argument,
-                        help='Preseed file to use for installation')
-    parser.add_argument('-b', '--boot',
-                        help='Boot arguments for initial installation')
-    parser.add_argument('-x', '--xml', type=url_argument,
-                        help='XML VM definition file')
-    parser.add_argument('-g', '--gigabytes', action='append',
-                        help=('Size in gigabytes of virtual disk, '
-                              'specify more than once for multiple disks'))
-    parser.add_argument('-s', '--series', metavar='SERIES',
-                        choices=config.serieschoices,
-                        help='Series to use for installation (%(choices)s)')
-    parser.add_argument('-t', '--type', metavar='TYPE',
-                        choices=('desktop', 'server', 'mini', 'alternate'),
-                        help=('Install type to use for installation '
-                              '(%(choices)s)'))
-    parser.add_argument('-a', '--arch', metavar='ARCH',
-                        choices=('i386', 'amd64', 'arm'),
-                        help=('Architecture to use for installation '
-                              '(%(choices)s)'))
-    parser.add_argument('-v', '--variant',
-                        help='Variant of architecture, i.e., armel, armhf')
-    parser.add_argument('-n', '--no-destroy', action='store_true',
-                        help='Preserve machine after tests have run')
-    parser.add_argument('-d', '--debug', action='store_true',
-                        help='Enable debug logging')
-    parser.add_argument('-j', '--json', action='store_true',
-                        help='Enable json logging (default is YAML)')
-    parser.add_argument('-f', '--files', action='append',
-                        help='File or directory to copy from test system ')
-    parser.add_argument('-o', '--outdir',
-                        help=('Directory to store locally copied files '
-                              '(Default is ' + config.logpath +
-                              '/machine-name)'))
-    parser.add_argument('--diskbus', metavar='DISKBUS',
-                        choices=('virtio', 'sata', 'ide'),
-                        help=('Disk bus to use for customvm installation '
-                              '(%(choices)s)'))
-    parser.add_argument('--rewrite', choices=('all', 'minimal', 'casperonly',
-                        'none'), help='Enable or disable automatic '
-                        'configuration rewriting')
-    parser.add_argument('--dumplogs', action='store_true',
-                        help='Write client output logs to standard out')
+    parser = common_arguments(parser)
+    parser = custom_arguments(parser)
+    parser = file_arguments(parser)
+    parser = virtual_arguments(parser)
     return parser
 
 

=== modified file 'examples/run_test_bamboo_feeder.py'
--- examples/run_test_bamboo_feeder.py	2012-12-12 20:25:24 +0000
+++ examples/run_test_bamboo_feeder.py	2012-12-19 19:47:27 +0000
@@ -19,14 +19,17 @@
 import os
 import sys
 
-from utah import config
 from utah.exceptions import UTAHException
 from utah.group import check_user_group, print_group_error_message
 from utah.provisioning.baremetal.bamboofeeder import BambooFeederMachine
 from utah.provisioning.baremetal.inventory import \
     ManualBaremetalSQLiteInventory
-from utah.run import run_tests
-from utah.url import url_argument
+from utah.run import (
+    common_arguments,
+    custom_arguments,
+    name_argument,
+    run_tests,
+)
 
 
 def get_parser():
@@ -40,34 +43,9 @@
                 "\t\t/usr/share/utah/client/examples/master.run \\\n"
                 "\t\t'http://people.canonical.com/~max/max_test.run'"),
         formatter_class=argparse.RawDescriptionHelpFormatter)
-    parser.add_argument('runlists', metavar='runlist', nargs='+',
-                        help='URLs of runlist files to run')
-    parser.add_argument('-s', '--series', metavar='SERIES',
-                        choices=config.serieschoices,
-                        help='Series to use for VM creation (%(choices)s)')
-    parser.add_argument('-t', '--type', metavar='TYPE',
-                        choices=('desktop', 'server', 'mini', 'alternate'),
-                        help=('Install type to use for VM creation '
-                              '(%(choices)s)'))
-    parser.add_argument('-a', '--arch', metavar='ARCH',
-                        choices=('i386', 'amd64'),
-                        help=('Architecture to use for VM creation '
-                              '(%(choices)s)'))
-    parser.add_argument('--name', help='Name of machine to provision')
-    parser.add_argument('-i', '--image', type=url_argument,
-                        help='Image/ISO file to use for installation')
-    parser.add_argument('-p', '--preseed', type=url_argument,
-                        help='Preseed file to use for installation')
-    parser.add_argument('-b', '--boot',
-                        help='Boot arguments for initial installation')
-    parser.add_argument('-n', '--no-destroy', action='store_true',
-                        help='Preserve VM after tests have run')
-    parser.add_argument('-d', '--debug', action='store_true',
-                        help='Enable debug logging')
-    parser.add_argument('-j', '--json', action='store_true',
-                        help='Enable json logging (default is YAML)')
-    parser.add_argument('--dumplogs', action='store_true',
-                        help='Write client output logs to standard out')
+    parser = common_arguments(parser)
+    parser = custom_arguments(parser)
+    parser = name_argument(parser)
     return parser
 
 

=== modified file 'examples/run_test_cobbler.py'
--- examples/run_test_cobbler.py	2012-12-13 09:07:58 +0000
+++ examples/run_test_cobbler.py	2012-12-19 19:47:27 +0000
@@ -18,14 +18,17 @@
 import argparse
 import sys
 
-from utah import config
 from utah.exceptions import UTAHException
 from utah.group import check_user_group, print_group_error_message
 from utah.provisioning.baremetal.cobbler import CobblerMachine
 from utah.provisioning.baremetal.inventory import \
     ManualBaremetalSQLiteInventory
-from utah.run import run_tests
-from utah.url import url_argument
+from utah.run import (
+    common_arguments,
+    custom_arguments,
+    name_argument,
+    run_tests,
+)
 
 
 def get_parser():
@@ -39,43 +42,9 @@
                 "\t\t/usr/share/utah/client/examples/master.run \\\n"
                 "\t\t'http://people.canonical.com/~max/max_test.run'"),
         formatter_class=argparse.RawDescriptionHelpFormatter)
-    parser.add_argument('runlists', metavar='runlist', nargs='+',
-                        help='URLs of runlist files to run')
-    parser.add_argument('-n', '--name', help='Name of machine to provision')
-    parser.add_argument('-i', '--image', type=url_argument,
-                        help='Image/ISO file to use for installation')
-    parser.add_argument('-p', '--preseed', type=url_argument,
-                        help='Preseed file to use for installation')
-    parser.add_argument('-b', '--boot',
-                        help='Boot arguments for initial installation')
-    parser.add_argument('-s', '--series', metavar='SERIES',
-                        choices=config.serieschoices,
-                        help='Series to use for VM creation (%(choices)s)')
-    parser.add_argument('-t', '--type', metavar='TYPE',
-                        choices=('desktop', 'server', 'mini', 'alternate'),
-                        help=('Install type to use for VM creation '
-                              '(%(choices)s)'))
-    parser.add_argument('-a', '--arch', metavar='ARCH',
-                        choices=('i386', 'amd64'),
-                        help=('Architecture to use for VM creation '
-                              '(%(choices)s)'))
-    parser.add_argument('--no-destroy', action='store_true',
-                        help='Preserve machine after tests have run')
-    parser.add_argument('-d', '--debug', action='store_true',
-                        help='Enable debug logging')
-    parser.add_argument('-j', '--json', action='store_true',
-                        help='Enable json logging (default is YAML)')
-    parser.add_argument('-f', '--files', action='append',
-                        help='File or directory to copy from test system ')
-    parser.add_argument('-o', '--outdir',
-                        help=('Directory to store locally copied files '
-                              '(Default is ' + config.logpath +
-                              '/machine-name)'))
-    parser.add_argument('--rewrite', choices=('all', 'minimal', 'casperonly',
-                        'none'), help='Enable or disable automatic '
-                        'configuration rewriting')
-    parser.add_argument('--dumplogs', action='store_true',
-                        help='Write client output logs to standard out')
+    parser = common_arguments(parser)
+    parser = custom_arguments(parser)
+    parser = name_argument(parser)
     return parser
 
 

=== modified file 'examples/run_test_vm.py'
--- examples/run_test_vm.py	2012-12-12 20:06:17 +0000
+++ examples/run_test_vm.py	2012-12-19 19:47:27 +0000
@@ -18,11 +18,10 @@
 import argparse
 import sys
 
-from utah import config
 from utah.exceptions import UTAHException
 from utah.group import check_user_group, print_group_error_message
 from utah.provisioning.vm.vm import TinySQLiteInventory
-from utah.run import run_tests
+from utah.run import common_arguments, run_tests
 
 
 def get_parser():
@@ -36,34 +35,7 @@
                 "\t\t/usr/share/utah/client/examples/master.run \\\n"
                 "\t\t'http://people.canonical.com/~max/max_test.run'"),
         formatter_class=argparse.RawDescriptionHelpFormatter)
-    parser.add_argument('runlists', metavar='runlist', nargs='+',
-                        help='URLs of runlist files to run')
-    parser.add_argument('-s', '--series', metavar='SERIES',
-                        choices=config.serieschoices,
-                        help='Series to use for VM creation (%(choices)s)')
-    parser.add_argument('-t', '--type', metavar='TYPE',
-                        choices=('desktop', 'server', 'mini', 'alternate'),
-                        help=('Install type to use for VM creation '
-                              '(%(choices)s)'))
-    parser.add_argument('-a', '--arch', metavar='ARCH',
-                        choices=('i386', 'amd64'),
-                        help=('Architecture to use for VM creation '
-                              '(%(choices)s)'))
-    parser.add_argument('-n', '--no-destroy', action='store_true',
-                        help='Preserve VM after tests have run')
-    parser.add_argument('-d', '--debug', action='store_true',
-                        help='Enable debug logging')
-    parser.add_argument('-j', '--json', action='store_true',
-                        help='Enable json logging (default is YAML)')
-    parser.add_argument('-f', '--files', action='append',
-                        help='File or directory to copy from test system ')
-    parser.add_argument('-o', '--outdir',
-                        help=('Directory to store locally copied files '
-                              '(Default is ' + config.logpath +
-                              '/machine-name)'))
-    parser.add_argument('--dumplogs', action='store_true',
-                        help='Write client output logs to standard out')
-    return parser
+    return common_arguments(parser)
 
 
 def run_test_vm(args=None):

=== modified file 'examples/run_utah_tests.py'
--- examples/run_utah_tests.py	2012-12-12 11:21:10 +0000
+++ examples/run_utah_tests.py	2012-12-19 19:47:27 +0000
@@ -19,8 +19,14 @@
 import sys
 
 from utah import config
-from utah.url import url_argument
 from utah.group import check_user_group, print_group_error_message
+from utah.run import (
+    common_arguments,
+    custom_arguments,
+    file_arguments,
+    name_argument,
+    virtual_arguments,
+)
 from utah.timeout import timeout, UTAHTimeout
 from run_install_test import run_install_test
 
@@ -38,66 +44,16 @@
                 "\t\t/usr/share/utah/client/examples/master.run \\\n"
                 "\t\t'http://people.canonical.com/~max/max_test.run'"),
         formatter_class=argparse.RawDescriptionHelpFormatter)
-    parser.add_argument('runlists', metavar='runlist', nargs='+',
-                        type=url_argument, help='URLs of runlist files to run')
     parser.add_argument('-m', '--machinetype', metavar='MACHINETYPE',
                         choices=('physical', 'virtual'),
                         help='Type of machine to provision (%(choices)s)')
-    parser.add_argument('-e', '--emulator',
-                        help=('Emulator to use (kvm and qemu are supported, '
-                              'kvm will be favored if available)'))
-    parser.add_argument('-i', '--image', type=url_argument,
-                        help='Image/ISO file to use for installation')
-    parser.add_argument('-k', '--kernel', type=url_argument,
-                        help='Kernel file to use for installation')
-    parser.add_argument('-r', '--initrd', type=url_argument,
-                        help='InitRD file to use for installation')
-    parser.add_argument('-p', '--preseed', type=url_argument,
-                        help='Preseed file to use for installation')
-    parser.add_argument('-b', '--boot',
-                        help='Boot arguments for initial installation')
-    parser.add_argument('-x', '--xml', type=url_argument,
-                        help='XML VM definition file')
-    parser.add_argument('-g', '--gigabytes', action='append',
-                        help=('Size in gigabytes of virtual disk, '
-                              'specify more than once for multiple disks'))
-    parser.add_argument('-s', '--series', metavar='SERIES',
-                        choices=config.serieschoices,
-                        help='Series to use for installation (%(choices)s)')
-    parser.add_argument('-t', '--type', metavar='TYPE',
-                        choices=('desktop', 'server', 'mini', 'alternate'),
-                        help=('Install type to use for installation '
-                              '(%(choices)s)'))
-    parser.add_argument('-a', '--arch', metavar='ARCH',
-                        choices=('i386', 'amd64', 'arm'),
-                        help=('Architecture to use for installation '
-                              '(%(choices)s)'))
     parser.add_argument('-v', '--variant',
                         help='Variant of architecture, i.e., armel, armhf')
-    parser.add_argument('-n', '--no-destroy', action='store_true',
-                        help='Preserve machine after tests have run')
-    parser.add_argument('-d', '--debug', action='store_true',
-                        help='Enable debug logging')
-    parser.add_argument('-j', '--json', action='store_true',
-                        help='Enable json logging (default is YAML)')
-    parser.add_argument('-f', '--files', action='append',
-                        help='File or directory to copy from test system ')
-    parser.add_argument('-o', '--outdir',
-                        help=('Directory to store locally copied files '
-                              '(Default is ' + config.logpath +
-                              '/machine-name)'))
-    parser.add_argument('--diskbus', metavar='DISKBUS',
-                        choices=('virtio', 'sata', 'ide'),
-                        help=('Disk bus to use for customvm installation '
-                              '(%(choices)s)'))
-    parser.add_argument('--name', help='Name of machine to provision'
-                        + ' (currently only supported for physical machine'
-                        + ' provisioning)')
-    parser.add_argument('--rewrite', choices=('all', 'minimal', 'casperonly',
-                        'none'), help='Enable or disable automatic '
-                        'configuration rewriting')
-    parser.add_argument('--dumplogs', action='store_true',
-                        help='Write client output logs to standard out')
+    parser = common_arguments(parser)
+    parser = custom_arguments(parser)
+    parser = file_arguments(parser)
+    parser = name_argument(parser)
+    parser = virtual_arguments(parser)
     return parser
 
 

=== modified file 'utah/config.py'
--- utah/config.py	2012-12-11 09:03:17 +0000
+++ utah/config.py	2012-12-19 19:47:27 +0000
@@ -106,6 +106,9 @@
     nfsconfigfile=os.path.join('/', 'etc', 'exports'),
     # Default options for NFS shares
     nfsoptions='*(ro,async,no_root_squash,no_subtree_check)',
+    # Whether to output the final preseed file as a log file during the main
+    # Provision/Run Tests/Gather Results process
+    outputpreseed=False,
     # Directory where utah client and other needed packages reside
     packagedir=os.path.join('/', 'usr', 'share', 'utah'),
     # Time to wait between power off and power on for physical systems

=== modified file 'utah/provisioning/provisioning.py'
--- utah/provisioning/provisioning.py	2012-12-12 18:56:13 +0000
+++ utah/provisioning/provisioning.py	2012-12-19 19:47:27 +0000
@@ -202,6 +202,8 @@
                 self.logger.debug(path + ' is locally available as '
                                   + getattr(self, item))
 
+        self.finalpreseed = self.preseed
+
         self.logger.debug('Machine init finished')
 
     def _namesetup(self, name=None):
@@ -600,15 +602,37 @@
         """
         if self.clean:
             self.logger.debug('Running cleanup')
+            for function in tuple(self.cleanfunctions):
+                timeout, command, args, kw = function
+                self.logger.debug('Running: ' +
+                                  commandstr(command, *args, **kw))
+                try:
+                    utah.timeout.timeout(timeout, command, *args, **kw)
+                except Exception as err:
+                    logger.warning('Exception while running cleanup '
+                                   'function: {}'.format(str(err)))
+                self.cleanfunctions.remove(function)
+            for command in tuple(self.cleancommands):
+                self._runargs(command)
+                self.cleancommands.remove(command)
             for path in tuple(self.cleanfiles):
                 if os.path.islink(path):
                     self.logger.debug('Removing link ' + path)
                     os.unlink(path)
                 elif os.path.isfile(path):
                     self.logger.debug('Changing permissions of ' + path)
-                    os.chmod(path, 0664)
+                    try:
+                        os.chmod(path, 0664)
+                    except OSError as err:
+                        self.logger.warning('OSError when changing file '
+                                            'permissions: {}'
+                                            .format(str(err)))
                     self.logger.debug('Removing file ' + path)
-                    os.unlink(path)
+                    try:
+                        os.unlink(path)
+                    except OSError as err:
+                        self.logger.warning('OSError when removing file: {}'
+                                            .format(str(err)))
                 elif os.path.isdir(path):
                 # Cribbed from http://svn.python.org
                 # /projects/python/trunk/Mac/BuildScript/build-installer.py
@@ -618,23 +642,24 @@
                             if not os.path.islink(absolute_name):
                                 self.logger.debug('Changing permissions of '
                                                   + absolute_name)
-                                os.chmod(absolute_name, 0775)
+                                try:
+                                    os.chmod(absolute_name, 0775)
+                                except OSError as err:
+                                    self.logger.warning('OSError when '
+                                        'changing directory permissions: {}'
+                                        .format(str(err)))
                     self.logger.debug('Recursively Removing directory '
                                       + path)
-                    shutil.rmtree(path)
+                    try:
+                        shutil.rmtree(path)
+                    except OSError as err:
+                        self.logger.warning('OSError when removing '
+                                            'directory: {}'
+                                            .format(str(err)))                    
                 else:
                     self.logger.debug(path + ' is not a link, file, or '
                                       'directory; not removing')
                 self.cleanfiles.remove(path)
-            for function in tuple(self.cleanfunctions):
-                timeout, command, args, kw = function
-                self.logger.debug('Running: ' +
-                                  commandstr(command, *args, **kw))
-                utah.timeout.timeout(timeout, command, *args, **kw)
-                self.cleanfunctions.remove(function)
-            for command in tuple(self.cleancommands):
-                self._runargs(command)
-                self.cleancommands.remove(command)
         else:
             self.logger.debug('Not cleaning up')
 
@@ -817,6 +842,7 @@
                                                    'initrd.d', 'preseed.cfg')
             with open(output_preseed_filename, 'w') as f:
                 f.write(preseed.dump())
+            self.finalpreseed = output_preseed_filename
         else:
             self.logger.info('Not altering preseed because rewrite is ' +
                              self.rewrite)

=== modified file 'utah/provisioning/vm/vm.py'
--- utah/provisioning/vm/vm.py	2012-12-12 20:55:35 +0000
+++ utah/provisioning/vm/vm.py	2012-12-19 19:47:27 +0000
@@ -528,12 +528,7 @@
         self.logger.info('Setting up final VM')
         self.vm = self.lv.defineXML(ElementTree.tostring(xml.getroot()))
 
-        if self.debug:
-            self.logger.info('Leaving temp directory '
-                             'because debug is enabled: ' + tmpdir)
-        else:
-            self.logger.info('Cleaning up temp directory')
-            shutil.rmtree(tmpdir)
+        self.cleanfile(tmpdir)
         return True
 
     def _start(self):

=== modified file 'utah/run.py'
--- utah/run.py	2012-12-13 18:48:32 +0000
+++ utah/run.py	2012-12-19 19:47:27 +0000
@@ -21,9 +21,89 @@
 import time
 import urllib
 import traceback
+import shutil
 
 from utah import config
 from utah.exceptions import UTAHException
+from utah.url import url_argument
+
+
+def common_arguments(parser):
+    parser.add_argument('runlist', metavar='runlist',
+                        help='URLs of runlist files to run')
+    parser.add_argument('-s', '--series', metavar='SERIES',
+                        choices=config.serieschoices,
+                        help='Series to use for VM creation (%(choices)s)')
+    parser.add_argument('-t', '--type', metavar='TYPE',
+                        choices=('desktop', 'server', 'mini', 'alternate'),
+                        help=('Install type to use for VM creation '
+                              '(%(choices)s)'))
+    parser.add_argument('-a', '--arch', metavar='ARCH',
+                        choices=('i386', 'amd64'),
+                        help=('Architecture to use for VM creation '
+                              '(%(choices)s)'))
+    parser.add_argument('-n', '--no-destroy', action='store_true',
+                        help='Preserve VM after tests have run')
+    parser.add_argument('-d', '--debug', action='store_true',
+                        help='Enable debug logging')
+    parser.add_argument('-j', '--json', action='store_true',
+                        help='Enable json logging (default is YAML)')
+    parser.add_argument('-f', '--files', action='append',
+                        help='File or directory to copy from test system ')
+    parser.add_argument('-o', '--outdir',
+                        help=('Directory to store locally copied files '
+                              '(Default is ' + config.logpath +
+                              '/machine-name)'))
+    parser.add_argument('--dumplogs', action='store_true',
+                        help='Write client output logs to standard out')
+    parser.add_argument('--outputpreseed', action='store_true',
+                        help='Copy preseed to logs directory and list as '
+                        'log file in output')
+    return parser
+
+
+def custom_arguments(parser):
+    parser.add_argument('-i', '--image', type=url_argument,
+                        help='Image/ISO file to use for installation')
+    parser.add_argument('-p', '--preseed', type=url_argument,
+                        help='Preseed file to use for installation')
+    parser.add_argument('-b', '--boot',
+                        help='Boot arguments for initial installation')
+    parser.add_argument('--rewrite', choices=('all', 'minimal', 'casperonly',
+                        'none'), help='Enable or disable automatic '
+                        'configuration rewriting')
+    return parser
+
+
+def file_arguments(parser):
+    parser.add_argument('-k', '--kernel', type=url_argument,
+                        help='Kernel file to use for installation')
+    parser.add_argument('-r', '--initrd', type=url_argument,
+                        help='InitRD file to use for installation')
+    return parser
+
+
+def name_argument(parser):
+    parser.add_argument('--name', help='Name of machine to provision'
+                        + ' (currently only supported for physical machine'
+                        + ' provisioning)')
+    return parser
+
+
+def virtual_arguments(parser):
+    parser.add_argument('-e', '--emulator',
+                        help=('Emulator to use (kvm and qemu are supported, '
+                              'kvm will be favored if available)'))
+    parser.add_argument('-x', '--xml', type=url_argument,
+                        help='XML VM definition file')
+    parser.add_argument('-g', '--gigabytes', action='append',
+                        help=('Size in gigabytes of virtual disk, '
+                              'specify more than once for multiple disks'))
+    parser.add_argument('--diskbus', metavar='DISKBUS',
+                        choices=('virtio', 'sata', 'ide'),
+                        help=('Disk bus to use for customvm installation '
+                              '(%(choices)s)'))
+    return parser
 
 
 def run_tests(args, machine):
@@ -105,14 +185,12 @@
                              'Writing empty reports.')
 
         # Make sure that default logs are written
-        for runlist in args.runlists:
-            _write(runlist)
+        _write(args.runlist)
         exitstatus = 1
     else:
         # Server will return success code only if the execution
         # of every runlist was successful
-        exitstatuses = [_run(runlist) for runlist in args.runlists]
-        exitstatus = int(any(exitstatuses))
+        exitstatus = _run(args.runlist)
 
         if args.files is not None:
             try:
@@ -120,6 +198,17 @@
             except Exception as err:
                 machine.logger.warning('Failed to download files: ' + str(err))
 
+    if args.outputpreseed or config.outputpreseed:
+        if args.outputpreseed:
+            machine.logger.debug('Capturing preseed due to '
+                                 'command line option')
+        elif config.outputpreseed:
+            machine.logger.debug('Capturing preseed due to config option')
+        preseedfile = os.path.join(config.logpath,
+                                   machine.name + '-preseed.cfg')
+        shutil.copyfile(machine.finalpreseed, preseedfile)
+        locallogs.append(preseedfile)
+
     return exitstatus, locallogs