Merge lp:~javier.collado/utah/bug1178650 into lp:utah

[Javier Collado]

This branch removes hardy and oneiric from the default values since they are
not supported anymore.

Besides this, it automates the run_utah_tests.py help output in the
documentation so that it's generated from the source code.

[Andy Doan (doanac)]

As per:

32 +# Generate file being included in the introduction

nice trick!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-09 23:36:07 +0000
+++ debian/changelog	2013-05-10 12:37:25 +0000
@@ -8,6 +8,7 @@
   * Apply retry strategy to install UTAH client package (LP: #1175732)
   * Added phoenix manpage (LP: #1067704)
   * Apply all overrides in tslist.run to the test cases (LP: #1178238)
+  * Removed unsupported distributions from defaults (LP: #1178650)
 
  -- Javier Collado <[e-mail]>  Tue, 07 May 2013 16:06:48 +0200
 

=== modified file 'docs/Makefile'
--- docs/Makefile	2012-09-05 07:43:32 +0000
+++ docs/Makefile	2013-05-10 12:37:25 +0000
@@ -40,6 +40,7 @@
 
 clean:
 	-rm -rf $(BUILDDIR)/*
+	-rm source/*.txt      # Autogenerated content for introduction section
 	-rm source/man/*.txt  # Autogenerated content for man pages
 
 html:

=== modified file 'docs/source/conf.py'
--- docs/source/conf.py	2013-05-08 13:28:00 +0000
+++ docs/source/conf.py	2013-05-10 12:37:25 +0000
@@ -149,6 +149,19 @@
 
     return description, options, epilog
 
+# Generate file being included in the introduction
+module_name = 'run_utah_tests'
+module = __import__(module_name)
+parser = module.get_parser()
+filename = '{}.txt'.format(module_name)
+with open(filename, 'w') as f:
+    lines = ['    {}'.format(line)
+             for line in parser.format_help().splitlines()]
+    lines.insert(0, '::\n\n')
+    f.write('\n'.join(lines))
+
+
+# Generate files included by man pages
 module_and_script_names = (
     ('client', 'utah'),
     ('run_utah_tests', 'run_utah_tests.py'),

=== modified file 'docs/source/introduction.rst'
--- docs/source/introduction.rst	2012-10-26 09:47:09 +0000
+++ docs/source/introduction.rst	2013-05-10 12:37:25 +0000
@@ -86,54 +86,9 @@
 just the test runner, install the utah-client package.
 
 
-Usage of run_utah_tests.py:
-
-::
-
-    Usage: run_utah_tests.py [-h]
-                             [-m {physical,virtual}]
-                             [-i IMAGE] [-k KERNEL] [-r INITRD] [-p PRESEED]
-                             [-s {hardy,lucid,natty,oneiric,precise,quantal}]
-                             [-t {desktop,server,mini,alternate}]
-                             [-a {i386,amd64,arm}] [-v VARIANT]
-                             [-n] [-d] [-j]
-                             runlist [runlist ...]
-
-    Provision a machine and run one or more UTAH runlists there.
-
-    positional arguments:
-      runlist               URLs of runlist files to run
-
-    optional arguments:
-      -h, --help            show this help message and exit
-      -m {physical,virtual}, --machinetype {physical,virtual}
-                            Type of machine to provision
-      -i IMAGE, --image IMAGE
-                            Image/ISO file to use for installation
-      -k KERNEL, --kernel KERNEL
-                            Kernel file to use for installation
-      -r INITRD, --initrd INITRD
-                            InitRD file to use for installation
-      -p PRESEED, --preseed PRESEED
-                            Preseed file to use for installation
-      -s {hardy,lucid,natty,oneiric,precise,quantal}, --series {hardy,lucid,natty,oneiric,precise,quantal}
-                            Series to use for installation
-      -t {desktop,server,mini,alternate}, --type {desktop,server,mini,alternate}
-                            Install type to use for installation
-      -a {i386,amd64,arm}, --arch {i386,amd64,arm}
-                            Architecture to use for installation
-      -v VARIANT, --variant VARIANT
-                            Variant of architecture, i.e., armel, armhf
-      -n, --no-destroy      Preserve machine after tests have run
-      -d, --debug           Enable debug logging
-      -j, --json            Enable json logging (default is YAML)
-
-For example::
-
-   sudo -i -u utah /usr/share/utah/examples/run_utah_tests.py \
-       -s precise -t server -a i386 \
-       /usr/share/utah/client/examples/master.run \
-       'http://people.canonical.com/~max/max_test.run'
+Usage of ``run_utah_tests.py``:
+
+.. include:: run_utah_tests.txt
 
 How to start writing tests?
 ---------------------------

=== modified file 'examples/run_utah_tests.py'
--- examples/run_utah_tests.py	2013-05-01 23:57:13 +0000
+++ examples/run_utah_tests.py	2013-05-10 12:37:25 +0000
@@ -62,9 +62,7 @@
 def get_parser():
     parser = argparse.ArgumentParser(
         description=('Provision a machine '
-                     'and run one or more UTAH runlists there.\n\n'
-                     'The appropriate run_*.py script will be called, '
-                     'depending on the parameters passed.'),
+                     'and run one or more UTAH runlists there.'),
         epilog=("For example:\n"
                 "Provision a VM using a precise server image "
                 "with i386 architecture and run the given runlist\n"

=== modified file 'utah/config.py'
--- utah/config.py	2013-05-03 23:07:50 +0000
+++ utah/config.py	2013-05-10 12:37:25 +0000
@@ -159,9 +159,7 @@
     runtimeout=None,
     # Available releases
     serieschoices=[
-        'hardy',
         'lucid',
-        'oneiric',
         'precise',
         'quantal',
         'raring',