Merge lp:~fginther/cupstream2distro-config/mbs-rebuild-support into lp:cupstream2distro-config

[Francis Ginther]

Enables Meta-Build System rebuilds of downstream projects after autolanding the current project.

This includes:
 - A new mbs-rebuild template to define the parent rebuild jobs, the autolanding jobs are reused as the builder jobs.
 - Updates to the mbs templates to reduce the number of jenkins parameters created.
 - A new archive directory structure to support automatic archive naming from the stack name in the future.
 - New MBS support for the head/mir stack
 - Updates to the oif and unity stacks to use this new method

Enables Meta-Build System rebuilds of downstream projects after autolanding the current project.

This includes:
 - A new mbs-rebuild template to define the parent rebuild jobs, the autolanding jobs are reused as the builder jobs.
 - Updates to the mbs templates to reduce the number of jenkins parameters created.
 - A new archive directory structure to support automatic archive naming from the stack name in the future.
 - New MBS support for the head/mir stack
 - Updates to the oif and unity stacks to use this new method

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:297
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/256/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/54

Click here to trigger a rebuild:
http://s-jenkins:8080/job/cupstream2distro-config-ci/256/rebuild

review: Approve (continuous-integration)

[Martin Mrazik (mrazik)]

Can we strip whitespace from rebuild_job in here (in case somebody specifies rebuild like "job1, job2")?:

46 + for rebuild_job in data.split(','):
47 + rebuild_list.append('-'.join([rebuild_job, 'rebuild']))
48 + ctx['rebuild'] = ','.join(rebuild_list)

The following (needs info only):
795 + rebuild: grail-raring

Would it be too hard to specify only "grail" and the update tool would check the current stack and find out there is a "grail-raring" base job? If it would be too hard maybe we can create a check in the validator for it? This feels a bit error prone/not obvious to me.

Other than that looks good.

review: Needs Fixing

[Francis Ginther (fginther)]

> Can we strip whitespace from rebuild_job in here (in case somebody specifies
> rebuild like "job1, job2")?:
>
> 46 + for rebuild_job in data.split(','):
> 47 + rebuild_list.append('-'.join([rebuild_job,
> 'rebuild']))
> 48 + ctx['rebuild'] = ','.join(rebuild_list)

Done (revision 298)

> The following (needs info only):
> 795 + rebuild: grail-raring
>
> Would it be too hard to specify only "grail" and the update tool would check
> the current stack and find out there is a "grail-raring" base job? If it would
> be too hard maybe we can create a check in the validator for it? This feels a
> bit error prone/not obvious to me.

I originally thought this was going to be hard, so I left it out. But after taking a second look, I found a way to make it work (revision 300). Now, the user just needs to specify the project name to rebuild if it exists in the same stack. If it's not found, it's treated as an actual rebuild job name.

> Other than that looks good.

[Martin Mrazik (mrazik)]

review: Approve

[Francis Ginther (fginther)]

Revision 301 added the ability to update the ppa_target when a rebuild occurs. This is only done when both the 'ppa_target' and 'distributions' values are set. The old MBS jobs did this, it was just an oversight. Projects that don't have a ppa_target will still be rebuilt using the local archive.

Revision 302 and 303 updated the mir rebuild targets at the request of thomi.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:304
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/261/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/59

Click here to trigger a rebuild:
http://s-jenkins:8080/job/cupstream2distro-config-ci/261/rebuild

review: Approve (continuous-integration)

=== modified file 'c2dconfigutils/cu2dUpdateCi.py'
--- c2dconfigutils/cu2dUpdateCi.py	2013-05-22 13:12:26 +0000
+++ c2dconfigutils/cu2dUpdateCi.py	2013-05-29 14:11:26 +0000
@@ -61,24 +61,28 @@
         'concurrent_jenkins_builds',
         'configuration',
         'contact_email',
+        'days_to_keep_builds',
         'disabled',
         'fasttrack',
         'hook_source',
+        'irc_notification',
+        'irc_channel',
         'landing_job',
+        'local_archive_host',
+        'local_archive_login',
+        'local_archive_tmp',
+        'log_rotator',
         'node_label',
+        'num_to_keep_builds',
         'parallel_jobs',
         'postbuild_job',
         'publish',
         'publish_coverage',
         'publish_junit',
         'priority',
+        'rebuild',
         'team',
         'use_description_for_commit',
-        'log_rotator',
-        'days_to_keep_builds',
-        'num_to_keep_builds',
-        'irc_notification',
-        'irc_channel',
     ]
 
     DEFAULT_HOOK_LOCATION = '/tmp/$JOB_NAME-hooks'
@@ -139,6 +143,22 @@
         parameter = JobParameter(name, value)
         ctx['parameter_list'].append(parameter)
 
+    def get_rebuild_job(self, stack, project_name):
+        """ Generates the rebuild job name for a project
+
+        :param stack: the original stack dictionary
+        :param project_name: the project name to lookup
+        :return job_name: the rebuild job name for the requested project
+        """
+        try:
+            project = stack['projects'][project_name]
+            job_name = '{}-rebuild'.format(
+                get_ci_base_job_name(project_name, project))
+        except KeyError:
+            # Allow for a user specified rebuild job
+            job_name = project_name
+        return job_name
+
     def process_project_config(self, project_name, project_config,
                                job_data, builder_job=False):
         """ Generates the template context from a project configuration
@@ -203,6 +223,16 @@
                 script = self._get_build_script(self.AGGREGATE_TESTS_TEMPLATE,
                                                 formatting)
                 ctx['aggregate_tests_script'] = script
+            elif key == 'rebuild':
+                # Only support manually specified rebuild jobs
+                if data:
+                    rebuild_list = []
+                    for rebuild_project in data.split(','):
+                        rebuild_job = self.get_rebuild_job(
+                            job_data['stack'], rebuild_project.strip())
+                        rebuild_list.append(rebuild_job)
+                    ctx['rebuild'] = ','.join(rebuild_list)
+
             elif key in self.TEMPLATE_CONTEXT_KEYS:
                 # These are added as ctx keys only
                 ctx[key] = data
@@ -227,13 +257,14 @@
         self.add_parameter(ctx, 'project_name', project_name)
         return ctx
 
-    def generate_jobs(self, job_list, project_name, job_type, job_config,
-                      job_template, build_template, job_data):
+    def generate_jobs(self, job_list, project_name, job_type, build_type,
+                      job_config, job_template, build_template, job_data):
         """ Generates the main job and builder jobs for a given project
 
         :param job_list: list to hold the generated jobs
         :param project_name: the project name from the stack definition
-        :param job_type: 'ci' or 'autolanding'
+        :param job_type: parent job - 'ci', 'autolanding' or 'rebuild'
+        :param build_type: builder job - 'ci' or 'autolanding'
         :param job_config: dictionary containing the job definition
         :param job_template: template used to define the main job
         :param build_template: template used to define the build jobs
@@ -266,13 +297,17 @@
                     build_list.append(config_name)
 
                 else:
+                    build_name = '-'.join([job_base_name, config_name,
+                                           build_type])
+                    build_list.append(build_name)
+                    if job_type == 'rebuild':
+                        # For rebuild jobs, the autolanding builder jobs will
+                        # be reused. So all that is needed is the build_list.
+                        continue
                     dict_union(build_config, data)
                     ctx = self.process_project_config(project_name,
                                                       build_config, job_data,
                                                       builder_job=True)
-                    build_name = '-'.join([job_base_name, config_name,
-                                           job_type])
-                    build_list.append(build_name)
                     job_data['build_lookup'][config_name] = build_name
                     job_list.append({'name': build_name,
                                      'template': template,
@@ -297,7 +332,8 @@
         stack_ppa = stack.get('ppa', False)
         if stack_ppa == "null":
             stack_ppa = False
-        job_data = {'stack_ppa': stack_ppa}
+        job_data = {'stack': stack,
+                    'stack_ppa': stack_ppa}
 
         # Merge the default config with the project specific config
         project_config = copy.deepcopy(stack['ci_default'])
@@ -305,8 +341,10 @@
 
         ci_template = None
         autolanding_template = None
+        rebuild_template = None
         ci_only_dict = dict()
         autolanding_only_dict = dict()
+        rebuild_only_dict = dict()
 
         # Extract the ci, autolanding or build specific items to make the
         # project configuration purely generic.
@@ -314,10 +352,13 @@
             ci_only_dict = project_config.pop('ci')
         if 'autolanding' in project_config:
             autolanding_only_dict = project_config.pop('autolanding')
+            rebuild_only_dict = copy.deepcopy(autolanding_only_dict)
         if 'ci_template' in project_config:
             ci_template = project_config.pop('ci_template')
         if 'autolanding_template' in project_config:
             autolanding_template = project_config.pop('autolanding_template')
+        if 'rebuild_template' in project_config:
+            rebuild_template = project_config.pop('rebuild_template')
         if 'build_template' in project_config:
             build_template = project_config.pop('build_template')
 
@@ -326,7 +367,7 @@
             ci_dict = copy.deepcopy(project_config)
             if ci_only_dict is not None:
                 dict_union(ci_dict, ci_only_dict)
-            self.generate_jobs(job_list, project_name, 'ci', ci_dict,
+            self.generate_jobs(job_list, project_name, 'ci', 'ci', ci_dict,
                                ci_template, build_template, job_data)
 
         # Create autolanding job, add back in the autolanding dict
@@ -335,9 +376,20 @@
             if autolanding_only_dict is not None:
                 dict_union(autolanding_dict, autolanding_only_dict)
             self.generate_jobs(job_list, project_name, 'autolanding',
+                               'autolanding',
                                autolanding_dict, autolanding_template,
                                build_template, job_data)
 
+        # Create rebuild job, add in the rebuild dict
+        if rebuild_template:
+            rebuild_dict = copy.deepcopy(project_config)
+            if rebuild_only_dict is not None:
+                dict_union(rebuild_dict, rebuild_only_dict)
+            self.generate_jobs(job_list, project_name, 'rebuild',
+                               'autolanding',
+                               rebuild_dict, rebuild_template,
+                               build_template, job_data)
+
     def process_stack(self, job_list, stack, target_project=None):
         """ Process the projects with the stack
 
 
=== modified file 'ci/jenkins-templates/mbs-autolanding-config.xml.tmpl'
--- ci/jenkins-templates/mbs-autolanding-config.xml.tmpl	2013-04-26 16:04:38 +0000
+++ ci/jenkins-templates/mbs-autolanding-config.xml.tmpl	2013-05-29 14:11:26 +0000
@@ -54,7 +54,7 @@
           <configs>
             <hudson.plugins.parameterizedtrigger.CurrentBuildParameters/>
             <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
-                <properties>UPSTREAM_BUILD_NUMBER=$BUILD_NUMBER</properties>
+                <properties>temp_dir={{ local_archive_tmp }}/${local_archive_name}/${project_name}.${BUILD_NUMBER}.autolanding</properties>
             </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
           </configs>
           <projects>{{ builder_list }}</projects>
@@ -85,14 +85,12 @@
       <command>#!/bin/bash
 set -x
 
-temp_dir=${local_archive_tmp}/${project_name}-al-${local_archive_pocket}-${BUILD_NUMBER}
-ppa_build_number=${BUILD_NUMBER}
-
-
-for p in `ssh ${local_archive_login}@${local_archive_host} ls ${temp_dir}`; do
-    ssh ${local_archive_login}@${local_archive_host} dput -ufU --config /home/ubuntu/.dput.cf ${local_archive} ${temp_dir}/${p}/*.changes
+temp_dir={{ local_archive_tmp }}/${local_archive_name}/${project_name}.${BUILD_NUMBER}.autolanding
+
+for p in `ssh {{ local_archive_login }}@{{ local_archive_host }} ls ${temp_dir}`; do
+    ssh {{ local_archive_login }}@{{ local_archive_host }} dput -ufU --config /home/ubuntu/.dput.cf ${local_archive_name} ${temp_dir}/${p}/*.changes
     # Execute mini-dinstall to update the local archive
-    ssh ${local_archive_login}@${local_archive_host} mini-dinstall --no-db --batch --config=&quot;/home/ubuntu/.mini-dinstall-${local_archive}.conf&quot;
+    ssh {{ local_archive_login }}@{{ local_archive_host }} mini-dinstall --no-db --batch --config=&quot;/home/ubuntu/.mini-dinstall-${local_archive_name}.conf&quot;
 done</command>
     </hudson.tasks.Shell>
 {% if aggregate_tests_script %}
@@ -234,6 +232,15 @@
 {% endif %}
     <hudson.plugins.parameterizedtrigger.BuildTrigger>
       <configs>
+{% if rebuild %}
+        <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+          <configs>
+          </configs>
+          <projects>{{ rebuild }}</projects>
+          <condition>SUCCESS</condition>
+          <triggerWithNoParameters>true</triggerWithNoParameters>
+        </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+{% endif %}
         <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
           <configs>
             <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
@@ -252,13 +259,13 @@
         <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
           <configs>
             <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
-              <properties>local_archive_host=$local_archive_host
-local_archive_login=$local_archive_login
-temp_dir=${local_archive_tmp}/${project}-al-${local_archive_pocket}-${BUILD_NUMBER}</properties>
+              <properties>local_archive_host={{ local_archive_host }}
+local_archive_login={{ local_archive_login }}
+temp_dir={{ local_archive_tmp }}/${local_archive_name}/${project_name}.${BUILD_NUMBER}.autolanding</properties>
             </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
           </configs>
-          <projects>generic-cleanup-mbs-pt</projects>
-          <condition>UNSTABLE_OR_WORSE</condition>
+          <projects>generic-cleanup-mbs</projects>
+          <condition>ALWAYS</condition>
           <triggerWithNoParameters>false</triggerWithNoParameters>
         </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
       </configs>
 
=== modified file 'ci/jenkins-templates/mbs-pbuilder-config.xml.tmpl'
--- ci/jenkins-templates/mbs-pbuilder-config.xml.tmpl	2013-05-21 18:18:36 +0000
+++ ci/jenkins-templates/mbs-pbuilder-config.xml.tmpl	2013-05-29 14:11:26 +0000
@@ -26,8 +26,8 @@
           <defaultValue></defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
-          <name>UPSTREAM_BUILD_NUMBER</name>
-          <description>Build number of the upstream job used in the tmp directory with the deb output</description>
+          <name>temp_dir</name>
+          <description>Temporary directory to store the package artifacts</description>
           <defaultValue></defaultValue>
         </hudson.model.StringParameterDefinition>
 {% for parameter in parameter_list %}
@@ -69,23 +69,20 @@
     <hudson.tasks.Shell>
       <command>#!/bin/bash
 set -x
-
-if [ -z &quot;${autolanding}&quot; ]; then
-    # Build was not triggered by autolanding, don't save the build artifacts
+if [ -z &quot;${temp_dir}&quot; ]; then
+    # Build was not triggered by autolanding or rebuild, don't save build artifacts
     exit 0
 fi
 
-tmp_dir=&quot;${local_archive_tmp}/${project_name}-al-${local_archive_pocket}-${UPSTREAM_BUILD_NUMBER}&quot;
-
-# mkdir &quot;${tmp_dir}&quot; can fail due to multiple jobs attempting to create the directory
-ssh ${local_archive_login}@${local_archive_host} mkdir &quot;${tmp_dir}&quot; || true
-ssh ${local_archive_login}@${local_archive_host} mkdir &quot;${tmp_dir}/${JOB_NAME}&quot;
+# mkdir &quot;${temp_dir}&quot; can fail due to multiple jobs attempting to create the directory
+ssh {{ local_archive_login }}@{{ local_archive_host }} mkdir &quot;${temp_dir}&quot; || true
+ssh {{ local_archive_login }}@{{ local_archive_host }} mkdir &quot;${temp_dir}/${JOB_NAME}&quot;
 
 # Switch to the output directory containing the build results
 cd work/output
 
 # Copy the build results to the temporary holding area, if all jobs succeed, these will be dput into the ppa archive.
-scp * ${local_archive_login}@${local_archive_host}:${tmp_dir}/${JOB_NAME}</command>
+scp * {{ local_archive_login }}@{{ local_archive_host }}:${temp_dir}/${JOB_NAME}</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
 
=== added file 'ci/jenkins-templates/mbs-rebuild-config.xml.tmpl'
--- ci/jenkins-templates/mbs-rebuild-config.xml.tmpl	1970-01-01 00:00:00 +0000
+++ ci/jenkins-templates/mbs-rebuild-config.xml.tmpl	2013-05-29 14:11:26 +0000
@@ -0,0 +1,274 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>&lt;B&gt;WARNING:&lt;/B&gt; This job is autogenerated. Any changes to the configuration will be lost.&lt;BR&gt;&#xd;
+&lt;B&gt;PURPOSE:&lt;/B&gt; Autolanding job for {{ target_branch }}&lt;BR&gt;&#xd;
+&lt;B&gt;TEAM:&lt;/B&gt; {{ team }}&lt;BR&gt;&#xd;
+&lt;B&gt;POC:&lt;/B&gt; {{ contact_email }}&lt;BR&gt;&#xd;</description>
+{% if log_rotator %}
+  <logRotator>
+    <daysToKeep>{{ log_rotator.days_to_keep_builds }}</daysToKeep>
+    <numToKeep>{{ log_rotator.num_to_keep_builds }}</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+{% endif %}
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.queueSorter.PrioritySorterJobProperty>
+      <priority>{{ priority }}</priority>
+    </hudson.queueSorter.PrioritySorterJobProperty>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>autolanding</name>
+          <description>Specifies that this is an autolanding/merge job. Used to properly set package version string.</description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+{% for parameter in parameter_list %}
+        <hudson.model.StringParameterDefinition>
+          <name>{{ parameter.name }}</name>
+          <description>{{ parameter.description }}</description>
+          <defaultValue>{{ parameter.value }}</defaultValue>
+        </hudson.model.StringParameterDefinition>
+{% endfor %}
+        <hudson.model.BooleanParameterDefinition>
+          <name>use_description_for_commit</name>
+          <description>If launchpad commit message is not set in Merge Proposal and you use &quot;usr_description_for_commit&quot; then the description will be used for the merge message (i.e. you will see launchpad description in your bzr log).</description>
+          <defaultValue>{{ use_description_for_commit }}</defaultValue>
+        </hudson.model.BooleanParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>{{ disabled }}</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder>
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.CurrentBuildParameters/>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+                <properties>temp_dir={{ local_archive_tmp }}/${local_archive_name}/${project_name}.${BUILD_NUMBER}.rebuild
+landing_candidate=$target_branch</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+          </configs>
+          <projects>{{ builder_list }}</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <block>
+            <buildStepFailureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+            </buildStepFailureThreshold>
+            <unstableThreshold>
+              <name>UNSTABLE</name>
+              <ordinal>1</ordinal>
+              <color>YELLOW</color>
+            </unstableThreshold>
+            <failureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+            </failureThreshold>
+          </block>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash
+set -x
+
+temp_dir={{ local_archive_tmp }}/${local_archive_name}/${project_name}.${BUILD_NUMBER}.rebuild
+
+
+for p in `ssh {{ local_archive_login }}@{{ local_archive_host }} ls ${temp_dir}`; do
+    ssh {{ local_archive_login }}@{{ local_archive_host }} dput -ufU --config /home/ubuntu/.dput.cf ${local_archive_name} ${temp_dir}/${p}/*.changes
+    # Execute mini-dinstall to update the local archive
+    ssh {{ local_archive_login }}@{{ local_archive_host }} mini-dinstall --no-db --batch --config=&quot;/home/ubuntu/.mini-dinstall-${local_archive_name}.conf&quot;
+done</command>
+    </hudson.tasks.Shell>
+{% if aggregate_tests_script %}
+    <hudson.tasks.Shell>
+      <command>{{ aggregate_tests_script }}</command>
+    </hudson.tasks.Shell>
+{% endif %}
+{% if rebuild %}
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder>
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs>
+          </configs>
+          <projects>{{ rebuild }}</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <block>
+            <buildStepFailureThreshold>
+              <name>UNSTABLE</name>
+              <ordinal>1</ordinal>
+              <color>YELLOW</color>
+            </buildStepFailureThreshold>
+            <unstableThreshold>
+              <name>UNSTABLE</name>
+              <ordinal>1</ordinal>
+              <color>YELLOW</color>
+            </unstableThreshold>
+            <failureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+            </failureThreshold>
+          </block>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+{% endif %}
+  </builders>
+  <publishers>
+{% if aggregate_tests_script %}
+    {% if archive_artifacts %}
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>{{ archive_artifacts }}</artifacts>
+      <latestOnly>false</latestOnly>
+    </hudson.tasks.ArtifactArchiver>
+    {% endif %}
+    {% if publish_coverage %}
+    <hudson.plugins.cobertura.CoberturaPublisher>
+      <coberturaReportFile>{{ publish_coverage }}</coberturaReportFile>
+      <onlyStable>false</onlyStable>
+      <healthyTarget>
+        <targets class="enum-map" enum-type="hudson.plugins.cobertura.targets.CoverageMetric">
+          <entry>
+            <hudson.plugins.cobertura.targets.CoverageMetric>CONDITIONAL</hudson.plugins.cobertura.targets.CoverageMetric>
+            <int>70</int>
+          </entry>
+          <entry>
+            <hudson.plugins.cobertura.targets.CoverageMetric>LINE</hudson.plugins.cobertura.targets.CoverageMetric>
+            <int>80</int>
+          </entry>
+          <entry>
+            <hudson.plugins.cobertura.targets.CoverageMetric>METHOD</hudson.plugins.cobertura.targets.CoverageMetric>
+            <int>80</int>
+          </entry>
+        </targets>
+      </healthyTarget>
+      <unhealthyTarget>
+        <targets class="enum-map" enum-type="hudson.plugins.cobertura.targets.CoverageMetric">
+          <entry>
+            <hudson.plugins.cobertura.targets.CoverageMetric>CONDITIONAL</hudson.plugins.cobertura.targets.CoverageMetric>
+            <int>0</int>
+          </entry>
+          <entry>
+            <hudson.plugins.cobertura.targets.CoverageMetric>LINE</hudson.plugins.cobertura.targets.CoverageMetric>
+            <int>0</int>
+          </entry>
+          <entry>
+            <hudson.plugins.cobertura.targets.CoverageMetric>METHOD</hudson.plugins.cobertura.targets.CoverageMetric>
+            <int>0</int>
+          </entry>
+        </targets>
+      </unhealthyTarget>
+      <failingTarget>
+        <targets class="enum-map" enum-type="hudson.plugins.cobertura.targets.CoverageMetric">
+          <entry>
+            <hudson.plugins.cobertura.targets.CoverageMetric>CONDITIONAL</hudson.plugins.cobertura.targets.CoverageMetric>
+            <int>0</int>
+          </entry>
+          <entry>
+            <hudson.plugins.cobertura.targets.CoverageMetric>LINE</hudson.plugins.cobertura.targets.CoverageMetric>
+            <int>0</int>
+          </entry>
+          <entry>
+            <hudson.plugins.cobertura.targets.CoverageMetric>METHOD</hudson.plugins.cobertura.targets.CoverageMetric>
+            <int>0</int>
+          </entry>
+        </targets>
+      </failingTarget>
+      <sourceEncoding>ASCII</sourceEncoding>
+    </hudson.plugins.cobertura.CoberturaPublisher>
+    {% endif %}
+    {% if publish_junit %}
+    <hudson.tasks.junit.JUnitResultArchiver>
+      <testResults>{{ publish_junit }}</testResults>
+      <keepLongStdio>false</keepLongStdio>
+      <testDataPublishers/>
+    </hudson.tasks.junit.JUnitResultArchiver>
+    {% endif %}
+{% endif %}
+{% if contact_email %}
+    <hudson.tasks.Mailer>
+      <recipients>{{ contact_email }}</recipients>
+      <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+      <sendToIndividuals>false</sendToIndividuals>
+    </hudson.tasks.Mailer>
+{% endif %}
+{% if irc_channel and irc_notification %}
+    <hudson.plugins.ircbot.IrcPublisher>
+      <targets>
+        <hudson.plugins.im.GroupChatIMMessageTarget>
+          <name>{{ irc_channel }}</name>
+          <notificationOnly>true</notificationOnly>
+        </hudson.plugins.im.GroupChatIMMessageTarget>
+      </targets>
+      <strategy>{{ irc_notification }}</strategy>
+      <notifyOnBuildStart>false</notifyOnBuildStart>
+      <notifySuspects>false</notifySuspects>
+      <notifyCulprits>false</notifyCulprits>
+      <notifyFixers>false</notifyFixers>
+      <notifyUpstreamCommitters>false</notifyUpstreamCommitters>
+      <buildToChatNotifier class="hudson.plugins.im.build_notify.DefaultBuildToChatNotifier"/>
+      <matrixMultiplier>ONLY_CONFIGURATIONS</matrixMultiplier>
+      <channels/>
+    </hudson.plugins.ircbot.IrcPublisher>
+{% endif %}
+{% if publish %}
+    <hudson.plugins.build__publisher.BuildPublisher>
+      <publishUnstableBuilds>true</publishUnstableBuilds>
+      <publishFailedBuilds>true</publishFailedBuilds>
+      <postActions class="vector"/>
+    </hudson.plugins.build__publisher.BuildPublisher>
+{% endif %}
+    <hudson.plugins.parameterizedtrigger.BuildTrigger>
+      <configs>
+{% if ppa_target and distributions %}
+        <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>ppa_target=${ppa_target}
+packaging_branch=${packaging_branch}
+trunk=${target_branch}
+distributions=${distributions}
+version_string_format=${version_string_format}.${BUILD_NUMBER}
+hook=${dput_hooks}</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+          </configs>
+          <projects>generic-dput</projects>
+          <condition>SUCCESS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+        </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+{% endif %}
+        <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>local_archive_host={{ local_archive_host }}
+local_archive_login={{ local_archive_login }}
+temp_dir={{ local_archive_tmp }}/${local_archive_name}/${project_name}.${BUILD_NUMBER}.rebuild</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+          </configs>
+          <projects>generic-cleanup-mbs</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+        </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.BuildTrigger>
+  </publishers>
+  <buildWrappers/>
+</project>
 
=== modified file 'stacks/head/mir.cfg'
--- stacks/head/mir.cfg	2013-05-29 07:50:01 +0000
+++ stacks/head/mir.cfg	2013-05-29 14:11:26 +0000
@@ -8,9 +8,20 @@
   dependencies:
     - qa
   ci_default:
+    autolanding_template: mbs-autolanding-config.xml.tmpl
+    rebuild_template: mbs-rebuild-config.xml.tmpl
+    hook_source: lp:~private-ps-quality-team/+junk/mbs-archive-hooks
+    hooks: H05set_package_version D00mbs_archive
     configurations:
       raring-amd64:
+        template: mbs-pbuilder-config.xml.tmpl
         node_label: pbuilder
+    local_archive_host: naartjie
+    local_archive_login: ubuntu
+    local_archive_tmp: /home/ubuntu/local-archive
+    local_archive_name: head.mir
+    local_archive_source: http://naartjie/archive/
+    local_archive_pocket: raring
     build_timeout: 120
     autolanding:
       ppa_target: ppa:mir-team/staging
@@ -19,8 +30,8 @@
   projects:
     mir:
       daily_release: False
-      contact_email: [e-mail]
-      hooks: H10enable_coverage B10gcovr_run H15enable_testing D10install_valgrind B09copy_results D09add_ppa-phablet-team-ppa
+      contact_email: [e-mail] [e-mail]
+      hooks: H05set_package_version D00mbs_archive H10enable_coverage B10gcovr_run H15enable_testing D10install_valgrind B09copy_results D09add_ppa-phablet-team-ppa
       archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **/output/*deb'
       publish_coverage: '**/results/coverage.xml'
       publish_junit: '**/results/*test*.xml'
@@ -34,13 +45,14 @@
           template: False
         mir-android-raring-i386-build:
           template: False
+      rebuild: lightdm-mir,unity-system-compositor
       # TODO irc if autolanding fails
     qmir:
       contact_email: [e-mail]
       daily_release: False
     lightdm:
       contact_email: [e-mail]
-      hooks: H40native_hack.py D08add_ppa-qt5-proper
+      hooks: H05set_package_version D00mbs_archive H40native_hack.py D08add_ppa-qt5-proper
       packaging_branch: lp:~lightdm-team/lightdm/trunk-packaging
       daily_release: False
       autolanding:
@@ -48,10 +60,10 @@
         distributions: precise,quantal,raring,saucy
     lightdm-mir:
       target_branch: lp:~mir-team/lightdm/unity
-      contact_email: [e-mail]
-      hooks: D08add_ppa-qt5-proper D09add_ppa-mir-team-staging
+      contact_email: [e-mail] [e-mail]
+      hooks: H05set_package_version D00mbs_archive D08add_ppa-qt5-proper D09add_ppa-mir-team-staging
       daily_release: False
     unity-system-compositor:
       daily_release: False
-      contact_email: [e-mail]
-      hooks: D08add_ppa-qt5-proper D09add_ppa-mir-team-staging
+      contact_email: [e-mail] [e-mail]
+      hooks: H05set_package_version D00mbs_archive D08add_ppa-qt5-proper D09add_ppa-mir-team-staging
 
=== modified file 'stacks/head/oif.cfg'
--- stacks/head/oif.cfg	2013-05-29 07:50:01 +0000
+++ stacks/head/oif.cfg	2013-05-29 14:11:26 +0000
@@ -9,8 +9,9 @@
     contact_email: "[e-mail]"
     team: PS-QA
     autolanding_template: mbs-autolanding-config.xml.tmpl
-    hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check
-    hook_source: lp:~private-ps-quality-team/+junk/oif-hooks
+    rebuild_template: mbs-rebuild-config.xml.tmpl
+    hooks: H05set_package_version D00mbs_archive
+    hook_source: lp:~private-ps-quality-team/+junk/mbs-archive-hooks
     configurations:
       raring-amd64:
         template: mbs-pbuilder-config.xml.tmpl
@@ -24,9 +25,9 @@
         publish_coverage: False
     local_archive_host: naartjie
     local_archive_login: ubuntu
-    local_archive_tmp: /home/ubuntu/ppa_archive/oif-staging
-    local_archive: oif-staging
-    local_archive_source: http://naartjie/archive/oif-staging
+    local_archive_tmp: /home/ubuntu/local-archive
+    local_archive_name: head.oif
+    local_archive_source: http://naartjie/archive/
     local_archive_pocket: raring
   dependencies:
     - qa
@@ -36,6 +37,9 @@
     tests: unity.tests.test_dash.DashRevealTests.test_alt_f4_close_dash
   projects:
     frame:
+      rebuild: grail
     geis:
+      rebuild: libgrip
     grail:
+      rebuild: geis
     libgrip:
 
=== modified file 'stacks/head/unity.cfg'
--- stacks/head/unity.cfg	2013-05-29 07:50:01 +0000
+++ stacks/head/unity.cfg	2013-05-29 14:11:26 +0000
@@ -9,8 +9,9 @@
     contact_email: "[e-mail]"
     team: PS-QA
     autolanding_template: mbs-autolanding-config.xml.tmpl
-    hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check
-    hook_source: lp:~private-ps-quality-team/+junk/mbs-hooks
+    rebuild_template: mbs-rebuild-config.xml.tmpl
+    hooks: H05set_package_version D00mbs_archive
+    hook_source: lp:~private-ps-quality-team/+junk/unity-hooks
     configurations:
       raring-amd64:
         template: mbs-pbuilder-config.xml.tmpl
@@ -22,11 +23,11 @@
         template: mbs-pbuilder-config.xml.tmpl
         node_label: panda-pbuilder
         publish_coverage: False
-    local_archive: staging
+    local_archive_name: head.unity
     local_archive_host: naartjie
     local_archive_login: ubuntu
-    local_archive_tmp: /home/ubuntu/ppa_archive/staging
-    local_archive_source: http://naartjie/archive/staging
+    local_archive_tmp: /home/ubuntu/local-archive
+    local_archive_source: http://naartjie/archive/
     local_archive_pocket: raring
   test_parameters:
     testpackages: unity-autopilot
@@ -41,24 +42,25 @@
     - hud
   projects:
     dee:
-      hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B05xsltproc B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
+      hooks: H05set_package_version D00mbs_archive D10specifictests B05xsltproc B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
       archive_artifacts: '**/results/**'
       publish_coverage: '**/results/coverage.xml'
       publish_junit: '**/results/*test*xml'
       configurations:
         raring-armhf:
-          hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B05xsltproc B09copy_results
+          hooks: H05set_package_version D00mbs_archive D10specifictests B05xsltproc B09copy_results
     compiz:
       daily_release: False # remember we don't want to land compiz trunk before activating this one
       build_timeout: 240
       archive_artifacts: '**/results/**'
       publish_coverage: '**/results/coverage.xml'
       publish_junit: '**/results/*test*xml'
+      rebuild: unity
       autolanding:
-        hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check B09googletests_cmake H15enable_testing D10install_google_test H10enable_coverage B10gcovr_run D10install_lcov
+        hooks: H05set_package_version D00mbs_archive B09googletests_cmake H15enable_testing D10install_google_test H10enable_coverage B10gcovr_run D10install_lcov
         configurations:
           raring-armhf:
-            hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check B09googletests_cmake H15enable_testing D10install_google_test
+            hooks: H05set_package_version D00mbs_archive B09googletests_cmake H15enable_testing D10install_google_test
       ci:
         hooks: D00mbs_archive H15enable_testing D10install_google_test H10enable_coverage B10gcovr_run D10install_lcov B09googletests_cmake
         configurations:
@@ -69,55 +71,56 @@
     libunity:
     libunity-misc:
     nux:
-      hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check B09googletests B09copy_results D10specifictests H10enable_coverage B10gcovr_run D10install_lcov
+      hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results D10specifictests H10enable_coverage B10gcovr_run D10install_lcov
       archive_artifacts: '**/results/**'
       publish_coverage: '**/results/coverage.xml'
       publish_junit: '**/results/*test*xml'
+      rebuild: unity
       configurations:
         raring-armhf:
-          hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check B09googletests B09copy_results D10specifictests
+          hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results D10specifictests
     unity:
       build_timeout: 240
-      hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10install_google_test H10enable_coverage B10gcovr_run B09googletests B09copy_results
+      hooks: H05set_package_version D00mbs_archive D10install_google_test H10enable_coverage B10gcovr_run B09googletests B09copy_results
       archive_artifacts: '**/results/**'
       publish_coverage: '**/results/coverage.xml'
       publish_junit: '**/results/*test*xml'
       configurations:
         raring-armhf:
-          hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10install_google_test B09googletests B09copy_results
+          hooks: H05set_package_version D00mbs_archive D10install_google_test B09googletests B09copy_results
     unity-asset-pool:
     unity-lens-applications:
-      hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
+      hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
       configurations:
         raring-armhf:
-          hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B09copy_results
+          hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results
           archive_artifacts: False
       archive_artifacts: '**/results/**'
       publish_coverage: '**/results/coverage.xml'
     unity-lens-files:
     unity-lens-friends:
     unity-lens-music:
-      hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
+      hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
       configurations:
         raring-armhf:
-          hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B09copy_results
+          hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results
           archive_artifacts: False
       archive_artifacts: '**/results/**'
       publish_coverage: '**/results/coverage.xml'
     unity-lens-photos:
     unity-lens-shopping:
-      hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
+      hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
       configurations:
         raring-armhf:
-          hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B09copy_results
+          hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results
           archive_artifacts: False
       archive_artifacts: '**/results/**'
       publish_coverage: '**/results/coverage.xml'
     unity-lens-video:
-      hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
+      hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
       configurations:
         raring-armhf:
-          hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B09copy_results
+          hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results
           archive_artifacts: False
       archive_artifacts: '**/results/**'
       publish_coverage: '**/results/coverage.xml'
 
=== modified file 'stacks/raring/oif.cfg'
--- stacks/raring/oif.cfg	2013-04-30 18:25:22 +0000
+++ stacks/raring/oif.cfg	2013-05-29 14:11:26 +0000
@@ -10,8 +10,9 @@
     contact_email: "[e-mail]"
     team: PS-QA
     autolanding_template: mbs-autolanding-config.xml.tmpl
-    hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check
-    hook_source: lp:~private-ps-quality-team/+junk/oif-hooks
+    rebuild_template: mbs-rebuild-config.xml.tmpl
+    hooks: H05set_package_version D00mbs_archive
+    hook_source: lp:~private-ps-quality-team/+junk/mbs-archive-hooks
     configurations:
       raring-amd64:
         template: mbs-pbuilder-config.xml.tmpl
@@ -25,9 +26,9 @@
         publish_coverage: False
     local_archive_host: naartjie
     local_archive_login: ubuntu
-    local_archive_tmp: /home/ubuntu/ppa_archive/oif-staging
-    local_archive: oif-staging
-    local_archive_source: http://naartjie/archive/oif-staging
+    local_archive_tmp: /home/ubuntu/local-archive
+    local_archive_name: raring.oif
+    local_archive_source: http://naartjie/archive/
     local_archive_pocket: raring
   dependencies:
     - qa
@@ -39,6 +40,7 @@
     evemu:
       target_branch: lp:evemu/raring
       autolanding_template: autolanding-config.xml.tmpl
+      rebuild_template: False
       configurations:
         raring-amd64:
           template: pbuilder-config.xml.tmpl
@@ -48,9 +50,12 @@
           template: pbuilder-config.xml.tmpl
     frame:
       target_branch: lp:frame/raring
+      rebuild: grail
     geis:
       target_branch: lp:geis/raring
+      rebuild: libgrip
     grail:
       target_branch: lp:grail/raring
+      rebuild: geis
     libgrip:
       target_branch: lp:libgrip/raring
 
=== modified file 'stacks/raring/unity.cfg'
--- stacks/raring/unity.cfg	2013-05-28 17:20:56 +0000
+++ stacks/raring/unity.cfg	2013-05-29 14:11:26 +0000
@@ -10,8 +10,9 @@
     contact_email: "[e-mail]"
     team: PS-QA
     autolanding_template: mbs-autolanding-config.xml.tmpl
-    hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check
-    hook_source: lp:~private-ps-quality-team/+junk/mbs-hooks
+    rebuild_template: mbs-rebuild-config.xml.tmpl
+    hooks: H05set_package_version D00mbs_archive
+    hook_source: lp:~private-ps-quality-team/+junk/unity-hooks
     configurations:
       raring-amd64:
         template: mbs-pbuilder-config.xml.tmpl
@@ -23,11 +24,11 @@
         template: mbs-pbuilder-config.xml.tmpl
         node_label: panda-pbuilder
         publish_coverage: False
-    local_archive: staging
+    local_archive_name: raring.unity
     local_archive_host: naartjie
     local_archive_login: ubuntu
-    local_archive_tmp: /home/ubuntu/ppa_archive/staging
-    local_archive_source: http://naartjie/archive/staging
+    local_archive_tmp: /home/ubuntu/local-archive
+    local_archive_source: http://naartjie/archive/
     local_archive_pocket: raring
   test_parameters:
     testpackages: unity-autopilot
@@ -42,62 +43,64 @@
     compiz:
       build_timeout: 240
       target_branch: lp:compiz/0.9.9
-      hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check B09googletests_cmake H15enable_testing D10install_google_test H10enable_coverage B10gcovr_run D10install_lcov
+      hooks: H05set_package_version D00mbs_archive B09googletests_cmake H15enable_testing D10install_google_test H10enable_coverage B10gcovr_run D10install_lcov
       archive_artifacts: '**/results/**'
       publish_coverage: '**/results/coverage.xml'
       publish_junit: '**/results/*test*xml'
+      rebuild: unity
       autolanding:
-        hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check B09googletests_cmake H15enable_testing D10install_google_test H10enable_coverage B10gcovr_run D10install_lcov
+        hooks: H05set_package_version D00mbs_archive B09googletests_cmake H15enable_testing D10install_google_test H10enable_coverage B10gcovr_run D10install_lcov
         configurations:
           raring-armhf:
-            hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check B09googletests_cmake H15enable_testing D10install_google_test
+            hooks: H05set_package_version D00mbs_archive B09googletests_cmake H15enable_testing D10install_google_test
       ci:
         hooks: H10enable_coverage B02google-tests
         configurations:
           compiz-gles-ci:
             template: False
           raring-armhf:
-            hooks: D00mbs_archive H40enable_gensymbols_check B09googletests H15enable_testing D10install_google_test D10install_valgrind
+            hooks: D00mbs_archive B09googletests H15enable_testing D10install_google_test D10install_valgrind
     dee:
       target_branch: lp:~unity-team/dee/raring
-      hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B05xsltproc B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
+      hooks: H05set_package_version D00mbs_archive D10specifictests B05xsltproc B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
       archive_artifacts: '**/results/**'
       publish_coverage: '**/results/coverage.xml'
       publish_junit: '**/results/*test*xml'
       configurations:
         raring-armhf:
-          hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B05xsltproc B09copy_results
+          hooks: H05set_package_version D00mbs_archive D10specifictests B05xsltproc B09copy_results
     libunity:
       target_branch: lp:libunity/raring
     libunity-misc:
       target_branch: lp:libunity-misc/raring
     nux:
       target_branch: lp:nux/raring
-      hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check B09googletests B09copy_results D10specifictests H10enable_coverage B10gcovr_run D10install_lcov
+      hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results D10specifictests H10enable_coverage B10gcovr_run D10install_lcov
       archive_artifacts: '**/results/**'
       publish_coverage: '**/results/coverage.xml'
       publish_junit: '**/results/*test*xml'
+      rebuild: unity
       configurations:
         raring-armhf:
-          hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check B09googletests B09copy_results D10specifictests
+          hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results D10specifictests
     unity:
       target_branch: lp:unity/7.0
       build_timeout: 240
-      hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10install_google_test H10enable_coverage B10gcovr_run B09googletests B09copy_results
+      hooks: H05set_package_version D00mbs_archive D10install_google_test H10enable_coverage B10gcovr_run B09googletests B09copy_results
       archive_artifacts: '**/results/**'
       publish_coverage: '**/results/coverage.xml'
       publish_junit: '**/results/*test*xml'
       configurations:
         raring-armhf:
-          hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10install_google_test B09googletests B09copy_results
+          hooks: H05set_package_version D00mbs_archive D10install_google_test B09googletests B09copy_results
     unity-asset-pool:
       target_branch: lp:unity-asset-pool/raring
     unity-lens-applications:
       target_branch: lp:unity-lens-applications/raring
-      hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
+      hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
       configurations:
         raring-armhf:
-          hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B09copy_results
+          hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results
           archive_artifacts: False
       archive_artifacts: '**/results/**'
       publish_coverage: '**/results/coverage.xml'
@@ -105,10 +108,10 @@
       target_branch: lp:unity-lens-files/raring
     unity-lens-music:
       target_branch: lp:unity-lens-music/raring
-      hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
+      hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
       configurations:
         raring-armhf:
-          hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B09copy_results
+          hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results
           archive_artifacts: False
       archive_artifacts: '**/results/**'
       publish_coverage: '**/results/coverage.xml'
@@ -116,10 +119,10 @@
       target_branch: lp:unity-lens-photos/raring
     unity-lens-shopping:
       target_branch: lp:unity-lens-shopping/raring
-      hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
+      hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
       configurations:
         raring-armhf:
-          hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B09copy_results
+          hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results
           archive_artifacts: False
       archive_artifacts: '**/results/**'
       publish_coverage: '**/results/coverage.xml'
@@ -127,10 +130,10 @@
       target_branch: lp:unity-scope-gdrive/raring
     unity-lens-video:
       target_branch: lp:unity-lens-video/raring
-      hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
+      hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
       configurations:
         raring-armhf:
-          hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check D10specifictests B09copy_results
+          hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results
           archive_artifacts: False
       archive_artifacts: '**/results/**'
       publish_coverage: '**/results/coverage.xml'
 
=== modified file 'tests/test_cu2dUpdateCi.py'
--- tests/test_cu2dUpdateCi.py	2013-05-22 13:12:26 +0000
+++ tests/test_cu2dUpdateCi.py	2013-05-29 14:11:26 +0000
@@ -272,7 +272,7 @@
         self.assertEqual(expected, actual)
 
 
-class TestGenerateJobs(TestWithScenarios, TestCase):
+class TestGenerateJobs(TestCase):
     job_template = 'ci.xml.tmpl'
     build_template = 'build.xml.tmpl'
 
@@ -288,7 +288,7 @@
                     'foo-raring-i386-ci',
                     'foo-ci']
         job_list = []
-        self.update_ci.generate_jobs(job_list, 'foo', 'ci', config,
+        self.update_ci.generate_jobs(job_list, 'foo', 'ci', 'ci', config,
                                      self.job_template, self.build_template,
                                      {})
         actual = [job['name'] for job in job_list]
@@ -303,7 +303,7 @@
                     'build.xml.tmpl',
                     'ci.xml.tmpl']
         job_list = []
-        self.update_ci.generate_jobs(job_list, 'foo', 'ci', config,
+        self.update_ci.generate_jobs(job_list, 'foo', 'ci', 'ci', config,
                                      self.job_template, self.build_template,
                                      {})
         actual = [job['template'] for job in job_list]
@@ -320,7 +320,7 @@
                     'bar.xml.tmpl',
                     'ci.xml.tmpl']
         job_list = []
-        self.update_ci.generate_jobs(job_list, 'foo', 'ci', config,
+        self.update_ci.generate_jobs(job_list, 'foo', 'ci', 'ci', config,
                                      self.job_template, self.build_template,
                                      {})
         actual = [job['template'] for job in job_list]
@@ -333,12 +333,39 @@
                 'raring-i386': {'node_label': 'pbuilder'}}}
         expected = 'foo-raring-amd64-ci,foo-raring-i386-ci'
         job_list = []
-        self.update_ci.generate_jobs(job_list, 'foo', 'ci', config,
+        self.update_ci.generate_jobs(job_list, 'foo', 'ci', 'ci', config,
                                      self.job_template, self.build_template,
                                      {})
         actual = job_list[2]['ctx']['builder_list']
         self.assertEqual(expected, actual)
 
+    def test_generate_rebuild_builder_list(self):
+        config = {
+            'configurations': {
+                'raring-amd64': {'node_label': 'pbuilder'},
+                'raring-i386': {'node_label': 'pbuilder'}}}
+        expected = 'foo-raring-amd64-autolanding,foo-raring-i386-autolanding'
+        job_list = []
+        self.update_ci.generate_jobs(job_list, 'foo', 'rebuild', 'autolanding',
+                                     config, self.job_template,
+                                     self.build_template, {})
+        actual = job_list[0]['ctx']['builder_list']
+        self.assertEqual(expected, actual)
+
+    def test_generate_rebuild_joblist(self):
+        config = {
+            'configurations': {
+                'raring-amd64': {'node_label': 'pbuilder'},
+                'raring-i386': {'node_label': 'pbuilder'}}}
+        expected = 'foo-rebuild'
+        job_list = []
+        self.update_ci.generate_jobs(job_list, 'foo', 'rebuild', 'autolanding',
+                                     config, self.job_template,
+                                     self.build_template, {})
+        actual = job_list[0]['name']
+        self.assertEqual(expected, actual)
+        self.assertEqual(1, len(job_list))
+
 
 class TestUpdateJenkins(TestCase):
     def setUp(self):
@@ -415,11 +442,13 @@
                 'landing_job': 'generic-land'},
             'projects': {
                 'autopilot': {
+                    'rebuild_template': 'rebuild-config.xml.tmpl',
                     'team': 'Autopilot Team',
                     'contact_email': 'address@email',
                     'distributions': 'raring,quantal,precise',
                     'ppa_target': 'ppa:autopilot/ppa',
                     'hooks': 'parent-hook',
+                    'rebuild': 'autopilot-qt , autopilot-gtk',
                     'autolanding': {
                         'postbuild_job': 'autopilot-docs-upload',
                         'archive_artifacts': '**/output/*deb',
@@ -430,7 +459,13 @@
                             'raring-i386': {
                                 'template': 'autopilot-config.xml.tmpl',
                                 'node_label': 'pbuilder'}}}},
-                'xpathselect': {}}}}
+                'autopilot-gtk': {
+                    'rebuild_template': 'rebuild-config.xml.tmpl',
+                    'target_branch': 'lp:autopilot-gtk/1.0'},
+                'autopilot-qt': {
+                    'rebuild_template': 'rebuild-config.xml.tmpl'},
+                'xpathselect': {
+                    'rebuild': 'autopilot,another-project-rebuild'}}}}
 
     def setUp(self):
         self.update_ci = UpdateCi()
@@ -447,12 +482,27 @@
                               'autopilot-raring-armhf-autolanding',
                               'autopilot-raring-i386-autolanding',
                               'autopilot-autolanding',
+                              'autopilot-rebuild',
+                              'autopilot-qt-raring-amd64-ci',
+                              'autopilot-qt-raring-armhf-ci',
+                              'autopilot-qt-ci',
+                              'autopilot-qt-raring-amd64-autolanding',
+                              'autopilot-qt-raring-armhf-autolanding',
+                              'autopilot-qt-autolanding',
+                              'autopilot-qt-rebuild',
                               'xpathselect-raring-amd64-ci',
                               'xpathselect-raring-armhf-ci',
                               'xpathselect-ci',
                               'xpathselect-raring-amd64-autolanding',
                               'xpathselect-raring-armhf-autolanding',
-                              'xpathselect-autolanding']
+                              'xpathselect-autolanding',
+                              'autopilot-gtk-1.0-raring-amd64-ci',
+                              'autopilot-gtk-1.0-raring-armhf-ci',
+                              'autopilot-gtk-1.0-ci',
+                              'autopilot-gtk-1.0-raring-amd64-autolanding',
+                              'autopilot-gtk-1.0-raring-armhf-autolanding',
+                              'autopilot-gtk-1.0-autolanding',
+                              'autopilot-gtk-1.0-rebuild']
         actual_name_list = [job['name'] for job in self.job_list]
         self.assertEqual(expected_name_list, actual_name_list)
 
@@ -464,12 +514,27 @@
                                   'pbuilder-config.xml.tmpl',
                                   'autopilot-config.xml.tmpl',
                                   'autolanding-config.xml.tmpl',
-                                  'pbuilder-config.xml.tmpl',
-                                  'pbuilder-config.xml.tmpl',
-                                  'ci-config.xml.tmpl',
-                                  'pbuilder-config.xml.tmpl',
-                                  'pbuilder-config.xml.tmpl',
-                                  'autolanding-config.xml.tmpl']
+                                  'rebuild-config.xml.tmpl',
+                                  'pbuilder-config.xml.tmpl',
+                                  'pbuilder-config.xml.tmpl',
+                                  'ci-config.xml.tmpl',
+                                  'pbuilder-config.xml.tmpl',
+                                  'pbuilder-config.xml.tmpl',
+                                  'autolanding-config.xml.tmpl',
+                                  'rebuild-config.xml.tmpl',
+                                  'pbuilder-config.xml.tmpl',
+                                  'pbuilder-config.xml.tmpl',
+                                  'ci-config.xml.tmpl',
+                                  'pbuilder-config.xml.tmpl',
+                                  'pbuilder-config.xml.tmpl',
+                                  'autolanding-config.xml.tmpl',
+                                  'pbuilder-config.xml.tmpl',
+                                  'pbuilder-config.xml.tmpl',
+                                  'ci-config.xml.tmpl',
+                                  'pbuilder-config.xml.tmpl',
+                                  'pbuilder-config.xml.tmpl',
+                                  'autolanding-config.xml.tmpl',
+                                  'rebuild-config.xml.tmpl']
         actual_template_list = [job['template'] for job in self.job_list]
         self.assertEqual(expected_template_list, actual_template_list)
 
@@ -498,6 +563,8 @@
                 self.assertEqual(job['ctx']['priority'], 10000)
             elif job['name'].endswith('autolanding'):
                 self.assertEqual(job['ctx']['priority'], 1000)
+            elif job['name'].endswith('rebuild'):
+                self.assertEqual(job['ctx']['priority'], 1000)
             else:
                 self.assertEqual(job['ctx']['priority'], 100)
 
@@ -554,6 +621,21 @@
         # Make sure no assertion groups were missed
         self.assertEqual(count, 3)
 
+    def test_rebuild_list(self):
+        count = 0
+        for job in self.job_list:
+            if job['name'] == 'xpathselect-autolanding':
+                self.assertEqual(job['ctx']['rebuild'],
+                                 'autopilot-rebuild,another-project-rebuild')
+                count += 1
+            if job['name'] == 'autopilot-autolanding':
+                self.assertEqual(job['ctx']['rebuild'],
+                                 'autopilot-qt-rebuild,'
+                                 'autopilot-gtk-1.0-rebuild')
+                count += 1
+        # Make sure no assertion groups were missed
+        self.assertEqual(count, 2)
+
     def test_target_project(self):
         job_list = []
         target_project = 'autopilot'
@@ -565,7 +647,8 @@
                               'autopilot-raring-amd64-autolanding',
                               'autopilot-raring-armhf-autolanding',
                               'autopilot-raring-i386-autolanding',
-                              'autopilot-autolanding']
+                              'autopilot-autolanding',
+                              'autopilot-rebuild']
         actual_name_list = [job['name'] for job in job_list]
         self.assertEqual(expected_name_list, actual_name_list)