Merge lp:~javier.collado/ubuntu-test-runlists/jenkins-smoketest-setup-publish-flag into lp:~canonical-ci-engineering/ubuntu-test-runlists/jenkins-smoketest-setup

[Javier Collado]

This branch adds a command line flag (publish) that is used to set when to
publish job results.

The default value is false, so the user has to explicitly pass it to set job
configuration to publish. This way a user can verify that the job works fine
and then run the script again with `--publish` to publish future results.

[Max Brustkern (nuclearbob)]

Seems completely straightforward to me. Have you tested it? Do we have a good way to test this on a dummy instance or something? I usually just edit the code to dump the xml, but that's probably not the best way to do it.

review: Approve

[Javier Collado (javier.collado)]

I've tested it using the staging jenkins instance. Also, I'm using it to test
other changes in the usual instance combined with prefix to avoid overwriting
the real jobs until I'm sure everything works fine. Merging then.

review: Approve

=== modified file 'setup-jobs.py'
--- setup-jobs.py	2013-03-27 11:08:41 +0000
+++ setup-jobs.py	2013-03-27 12:27:39 +0000
@@ -70,6 +70,10 @@
                         help=("Prefix to be used for job names. "
                               "This is useful to test job changes "
                               "without overwriting the configuration."))
+    parser.add_argument("--publish", action="store_true",
+                        help=("Publish build results. "
+                              "This is useful to test job changes "
+                              "without overwriting the configuration."))
     return parser
 
 
@@ -296,7 +300,8 @@
                                            scripts_url=scripts_url,
                                            command=command,
                                            node=args.node,
-                                           jobtype=jobtype)
+                                           jobtype=jobtype,
+                                           publish=args.publish)
                 result, text = update_jenkins(instance, args.dryrun, jobname,
                                               smokexml)
                 if not result:
@@ -320,7 +325,8 @@
                 isopath=isopath,
                 jobs=default_jobname,
                 imageurl=args.imageurl,
-                node=args.node)
+                node=args.node,
+                publish=args.publish)
             result, text = update_jenkins(instance, args.dryrun, jobname,
                                           defaultxml)
             if not result:

=== modified file 'templates/base.xml.jinja'
--- templates/base.xml.jinja	2012-12-13 16:57:59 +0000
+++ templates/base.xml.jinja	2013-03-27 12:27:39 +0000
@@ -40,11 +40,13 @@
       <descriptionForFailed>\1</descriptionForFailed>
       <setForMatrix>false</setForMatrix>
     </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
+{% if publish %}
     <hudson.plugins.build__publisher.BuildPublisher>
       <publishUnstableBuilds>true</publishUnstableBuilds>
       <publishFailedBuilds>true</publishFailedBuilds>
       <postActions class="vector"/>
     </hudson.plugins.build__publisher.BuildPublisher>
+{% endif %}
 {% block artifacts %}
     <hudson.tasks.ArtifactArchiver>
       <artifacts>**/*</artifacts>