Merge ~michihenning/jenkaas-jobs:master into jenkaas-jobs:master

[Michi Henning]

Added auto-landing jobs.

Added auto-landing jobs. Auto-landing can be enabled/disabled on a per-project basis, and it's possible to set a default in the project.yaml file.

I've tested with the unity-api jenkaas, and it seems to be doing all the right things.

[Michał Sawicz (saviq)]

I think I would rather not create the autolanding jobs for projects that don't use that - or at least instead of exiting early from the script - disabling the trigger and autolanding jobs [1].

You also need to add a .xml fixture so that the job is tested against a known-working configuration [2] [3]. The test will pick it up automagically when the .xml is named the same as the generated job. Note you will have to edit the xml a bit (especially around log rotation, which JJB generates differently than Jenkins returns it - I can give you a hand with that).

[1] http://docs.openstack.org/infra/jenkins-job-builder/definition.html?highlight=disabled
[2] https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-trigger-autolanding/config.xml
[3] https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-autoland/config.xml

review: Needs Fixing

a61ef6c... by Michi Henning on 2016-05-04

Conditional build step for autolanding trigger.

[Michi Henning (michihenning)]

I looked long and hard for a way to generate a job based on a condition. There is a multi-job plugin that appears to be able to do this: http://docs.openstack.org/infra/jenkins-job-builder/project_multijob.html
But we don't have that installed at the moment. If we add the plugin, I think it would be possible to create the project-specific autolanding jobs based on the setting of the parameter, so we wouldn't have two extra jobs for projects that don't use autolanding.

Because it appears to be impossible to negate a boolean parameter, I didn't use the disabled parameter and used a conditional build step instead. That avoids calling the shell script when autolanding is disabled.

4b33afc... by Michi Henning on 2016-05-04

Fixed parameter description and removed unused properties.

[Michi Henning (michihenning)]

I had a bunch of replies to your inline comments. Unfortunately, every time another revision is pushed, all the inline comments are lost :-(

I fixed the incorrect parameter descriptions and removed the unused properties.

[Michi Henning (michihenning)]

I'm having problems with the tests. When I run

python3 tests/test_jenkaas_jobs.py

on trunk, the tests pass.

In my branch, I get a failure (without the additional fixtures that need to be added):

AIL: testGeneratedJob_2_credentials_3_launchpad_plugin (__main__.TestJenkaasJobs)
Test that the generated job XML is equal to the fixture
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/ddt.py", line 122, in wrapper
    return func(self, *args, **kwargs)
  File "tests/test_jenkaas_jobs.py", line 78, in testGeneratedJob
    "Generated xml is different to what was expected.")
AssertionError: <Element 'matrix-project' at 0x7fe28324d410> != <Element 'matrix-project' at 0x7fe283216830> : Generated xml is different to what was expected.

It's not clear to me why this is failing.

To generate the test xml, I'm using

jenkins-jobs --conf ../unity-api-team-jenkins.conf test tests/project.yaml:`pwd`/jenkaas_jobs/yaml/ -o project.test

I take it that's the correct way to generate the xml so I can use it to create the test fixture files?

[Michał Sawicz (saviq)]

W dniu 04.05.2016 o 04:24, Michi Henning pisze:
> I looked long and hard for a way to generate a job based on a condition. There is a multi-job plugin that appears to be able to do this: http://docs.openstack.org/infra/jenkins-job-builder/project_multijob.html
> But we don't have that installed at the moment. If we add the plugin, I think it would be possible to create the project-specific autolanding jobs based on the setting of the parameter, so we wouldn't have two extra jobs for projects that don't use autolanding.

We could have a separate lp-{project}-autoland job group instead of
adding them to lp-{project} - this way I could not include that in our
config and would not get any jobs generated for this.

To enable it for a few projects you would have to then add a new minimal
project to your yaml. This would unfortunately mean you have to pass on
at least autopkgtest_filter between the two projects (but then again you
might want a different set of tests for autolanding).

Something like:

- project:
  name: foo-autolanding
  autopkgtest_filter: *autopkgtest_filter
  project:
  - foo
  - bar
  jobs:
  - lp-{project}-autoland

So, by default, you'd just add lp-{project}-autoland to your main
project/jobs - but if you wanted more flexibility - you'd do the above.

> Because it appears to be impossible to negate a boolean parameter, I didn't use the disabled parameter and used a conditional build step instead. That avoids calling the shell script when autolanding is disabled.

Interesting. I'd probably go the other way and have a
autolanding_disabled parameter then. Not sure if we still need it with
the above, though. You can always disable autolanding temporarily in the
web ui, or drop the jobs altogether.

> I had a bunch of replies to your inline comments. Unfortunately, every time another revision is pushed, all the inline comments are lost

They don't disappear - you just need to select the diff where they were
made on in the "Preview Diff" dropdown - or use the link "show inline
comments" that'd be there if you sent them. They should still be in your
browser's local storage, so you should be able to send them still.

> I fixed the incorrect parameter descriptions and removed the unused properties.

Tx.

> python3 tests/test_jenkaas_jobs.py

Use "nosetests", you'll get logging output by default.

> In my branch, I get a failure (without the additional fixtures that need to be added):
>
> AIL: testGeneratedJob_2_credentials_3_launchpad_plugin (__main__.TestJenkaasJobs)
> Test that the generated job XML is equal to the fixture
> ----------------------------------------------------------------------
> Traceback (most recent call last):
> File "/usr/lib/python3/dist-packages/ddt.py", line 122, in wrapper
> return func(self, *args, **kwargs)
> File "tests/test_jenkaas_jobs.py", line 78, in testGeneratedJob
> "Generated xml is different to what was expected.")
> AssertionError: <Element 'matrix-project' at 0x7fe28324d410> != <Element 'matrix-project' at 0x7fe283216830> : Generated xml is different to what was expected.
>
> It's not clear to me why this is failing.

With nosetests you'll see http://pastebin.ubuntu.com/16212853/...

0916de8... by Michi Henning on 2016-05-05

Separate job group for autolanding.

46d8e42... by Michi Henning on 2016-05-05

Autolanding comments for project example.

4744e16... by Michi Henning on 2016-05-05

Fixed failing credentials test.

a4633b8... by Michi Henning on 2016-05-05

Test fixture for lp-generic-land-mp.xml

8896edf... by Michi Henning on 2016-05-05

Added test fixtures for test project autolanding.

a0d3944... by Michi Henning on 2016-05-05

Modified project.yaml for tests.

31554da... by Michi Henning on 2016-05-05

Fixed whitespace.

[Michi Henning (michihenning)]

Thanks heaps for all your help!

I think what's there now is closer.

I had endless problems with nosetests:

nosetests: error: Error reading config file 'setup.cfg': no such option 'with-ignore-docstrings'

I have nose-ignore-docstring installed. Not sure why it still bitches about the option. I muddled through without it for this. I think the test fixtures should be OK now.

dc98e23... by Michał Sawicz on 2016-05-05

Fix branch references

e156b78... by Michał Sawicz on 2016-05-05

Fix autolanding test fixtures and use references

Using references to projects we can reduce duplication and make
sure changes are applied across the board.

df6b4f7... by Michał Sawicz on 2016-05-05

Use references in project-example.yaml

[Michał Sawicz (saviq)]

I've fixed up a few things - please pull/merge lp:~saviq/jenkaas-jobs:add-autolanding [1] here.

A few errors there were due to using JJB-generated definitions as fixtures instead of downloading a known-working jenkins config.xml.

Can you please revert the changes to AUTHORS and ChangeLog, I'll take care of that in master.

[1] https://code.launchpad.net/~saviq/jenkaas-jobs/+git/jenkaas-jobs/+merge/293860

review: Needs Fixing

99fa61c... by Michi Henning on 2016-05-06

Reverted changes to AUTHORS and ChangeLog.

[Michi Henning (michihenning)]

Thanks for that! I apologize for being so inept. I'm still unfamiliar with the python testing and the JBB/yaml idioms :-(

diff --git a/jenkaas_jobs/yaml/defaults.yaml b/jenkaas_jobs/yaml/defaults.yaml
index aaf5825..805878b 100644
--- a/jenkaas_jobs/yaml/defaults.yaml
+++ b/jenkaas_jobs/yaml/defaults.yaml
@@ -6,6 +6,7 @@
     # These jobs will not be shown on the Launchpad MP comments
     blacklisted_jobs: |
       - "lp-generic-update-mp"
+      - "lp-generic-land-mp"
 
     # How many build runs to keep artifacts for. This applies to both source
     # and binary builds, also note you can only cover a third of your available
diff --git a/jenkaas_jobs/yaml/launchpad/launchpad.yaml b/jenkaas_jobs/yaml/launchpad/launchpad.yaml
index 51686dc..3cd22dc 100644
--- a/jenkaas_jobs/yaml/launchpad/launchpad.yaml
+++ b/jenkaas_jobs/yaml/launchpad/launchpad.yaml
@@ -2,10 +2,18 @@
     name: launchpad-jobs
     jobs:
     - lp-generic-update-mp
+    - lp-generic-land-mp
 
 - job-group:
     name: lp-{project}
     branch: lp:{project}
     jobs:
     - lp-{project}-trigger
-    - lp-{project}-ci
\ No newline at end of file
+    - lp-{project}-ci
+
+- job-group:
+    name: lp-{project}-autolanding
+    branch: lp:{project}
+    jobs:
+    - lp-{project}-trigger-autolanding
+    - lp-{project}-autoland
diff --git a/jenkaas_jobs/yaml/launchpad/lp-autoland.yaml b/jenkaas_jobs/yaml/launchpad/lp-autoland.yaml
new file mode 100644
index 0000000..19f3f30
--- /dev/null
+++ b/jenkaas_jobs/yaml/launchpad/lp-autoland.yaml
@@ -0,0 +1,60 @@
+- job-template:
+    name: lp-{project}-autoland
+    project-type: freestyle
+    description: 'Auto-land top-approved merge proposal in {branch}'
+    node: monitor
+    concurrent: true
+    auth-token: BUILD_ME
+    logrotate:
+      daysToKeep: 60
+    properties:
+    - rebuild
+    parameters:
+    - string:
+        name: landing_candidate
+        description: Launchpad branch to process
+    - string:
+        name: candidate_revision
+        description: Branch revision to process
+    - string:
+        name: merge_proposal
+        description: Merge proposal to process
+    builders:
+    - trigger-builds:
+        - project:
+          - build
+          block: true
+          predefined-parameters: |
+            source_branch=${{landing_candidate}}
+            source_revision=${{candidate_revision}}
+            target_branch={branch}
+    - matrix-trigger:
+        job: test-0-autopkgtest
+        parameters: |
+          build_run=build#${{TRIGGERED_BUILD_NUMBER_build}}
+          testnames={autopkgtest_names}
+        filter: '{autopkgtest_filter}'
+    wrappers:
+    - timestamps
+    - build-name:
+        name: ${{ENV,var="landing_candidate"}}
+    publishers:
+    - trigger-parameterized-builds:
+      - project:
+        - lp-generic-land-mp
+        predefined-parameters: |
+          ci_result=PASSED
+          ci_build=${{BUILD_URL}}
+          ci_branch=${{landing_candidate}}
+          ci_merge_proposal=${{merge_proposal}}
+          ci_revision=${{candidate_revision}}
+        condition: SUCCESS
+      - project:
+        - lp-generic-land-mp
+        predefined-parameters: |
+          ci_result=FAILED
+          ci_build=${{BUILD_URL}}
+          ci_branch=${{landing_candidate}}
+          ci_merge_proposal=${{merge_proposal}}
+          ci_revision=${{candidate_revision}}
+        condition: UNSTABLE_OR_WORSE
diff --git a/jenkaas_jobs/yaml/launchpad/lp-generic-land-mp.sh b/jenkaas_jobs/yaml/launchpad/lp-generic-land-mp.sh
new file mode 100644
index 0000000..9c19c81
--- /dev/null
+++ b/jenkaas_jobs/yaml/launchpad/lp-generic-land-mp.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# log all commands and abort on error
+set -ex
+
+autoland --test-result="${ci_result}" --build-job-url="${ci_build}" --merge-proposal="${ci_merge_proposal}" --revision="${ci_revision}"
diff --git a/jenkaas_jobs/yaml/launchpad/lp-generic-land-mp.yaml b/jenkaas_jobs/yaml/launchpad/lp-generic-land-mp.yaml
new file mode 100644
index 0000000..3145341
--- /dev/null
+++ b/jenkaas_jobs/yaml/launchpad/lp-generic-land-mp.yaml
@@ -0,0 +1,30 @@
+- job-template:
+    name: lp-generic-land-mp
+    project-type: freestyle
+    description: 'Auto-land top-approved merge proposal on Launchpad.'
+    node: launchpad
+    logrotate:
+      numToKeep: 100
+    parameters:
+    - string:
+        name: ci_result
+        description: Result of the CI build
+    - string:
+        name: ci_build
+        description: Jenkins URL of the build
+    - string:
+        name: ci_branch
+        description: Launchpad branch that was processed
+    - string:
+        name: ci_merge_proposal
+        description: Launchpad merge proposal that was processed        
+    - string:
+        name: ci_revision
+        description: Revision of the processed branch        
+    wrappers:
+    - timestamps
+    - build-name:
+        name: ${{ENV,var="ci_branch"}}
+    builders:
+    - shell:
+        !include-raw-escape: lp-generic-land-mp.sh
diff --git a/jenkaas_jobs/yaml/launchpad/lp-trigger-autolanding.sh b/jenkaas_jobs/yaml/launchpad/lp-trigger-autolanding.sh
new file mode 100644
index 0000000..488a91b
--- /dev/null
+++ b/jenkaas_jobs/yaml/launchpad/lp-trigger-autolanding.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# log all commands and abort on error
+set -ex
+
+launchpadTrigger --lock-name=${{JOB_NAME}} --job=lp-{project}-autoland --branch={branch} --autoland || true
diff --git a/jenkaas_jobs/yaml/launchpad/lp-trigger-autolanding.yaml b/jenkaas_jobs/yaml/launchpad/lp-trigger-autolanding.yaml
new file mode 100644
index 0000000..d1f8b97
--- /dev/null
+++ b/jenkaas_jobs/yaml/launchpad/lp-trigger-autolanding.yaml
@@ -0,0 +1,17 @@
+- job-template:
+    name: lp-{project}-trigger-autolanding
+    project-type: freestyle
+    description: 'Auto-land top-approved changes for {branch}'
+    node: launchpad-{project}
+    logrotate:
+      numToKeep: 10
+    triggers:
+    - timed: # every five minutes
+        H/5 * * * *
+    properties:
+    - rebuild
+    wrappers:
+    - timestamps
+    builders:
+    - shell:
+        !include-raw: lp-trigger-autolanding.sh
diff --git a/project-example.yaml b/project-example.yaml
index dceb47a..dbd7205 100644
--- a/project-example.yaml
+++ b/project-example.yaml
@@ -91,7 +91,7 @@
     # of them by putting the same key under the entry in the "jobs" key.
 
     # Default space-separated list of autopkgtest names.
-    autopkgtest_names: ''
+    autopkgtest_names: &autopkgtest_names ''
     
     # Which autopktests to run on which architectures.
     #
@@ -99,7 +99,7 @@
     #
     # FIXME: this has to use XML entities for & due to a Jenkins Job Builder
     #        limitation.
-    autopkgtest_filter:
+    autopkgtest_filter: &autopkgtest_filter
       (label=="amd64" && testname=="test-name.sh") || (label=="phone-armhf" && testname=="autopilot.sh" && release=="vivid+overlay")
 
     # A list of Launchpad projects to configure for CI, each of which can have
@@ -107,8 +107,8 @@
     project:
     - your-project:
         autopkgtest_names: test-name.sh autopilot.sh
-    - your-other-project
-    - even-another-project:
+    - your-other-project: &your_other_project
+    - even-another-project: &even_another_project
         # You can direct the trigger and CI jobs at a branch different than
         # lp:{project}
         branch: lp:another-branch
@@ -145,3 +145,26 @@
     # from the list of projects above.
     - lp-{project}
 
+    # If you want to autoland all projects defined above, enable the following line, which will
+    # result in autolanding for your-project, your-other-project, and even-another-project in
+    # their respective branches.
+    #
+    # - lp-{project}-autolanding
+
+# If only some projects defined above use autolanding, you can selectively enable them by adding
+# the project below. This example enables autolanding for your-other-project and even-another-project.
+# The per-project variables need to be set here - use references, unless you want the configurations
+# to differ. You might for example want a wider set of tests to run during autolanding. In that case
+# you can still use references and only override a single parameter.
+
+- project:
+    name: your-project-autolanding
+    autopkgtest_names: *autopkgtest_names
+    autopkgtest_filter: *autopkgtest_filter
+    project:
+    - your-other-project: *your_other_project
+    - even-another-project:
+        <<: *even_another_project
+        autopkgtest_names: test-name.sh autopilot.sh integration.sh
+    jobs:
+    - lp-{project}-autolanding
\ No newline at end of file
diff --git a/tests/fixtures/credentials/credentials-3-launchpad-plugin.xml b/tests/fixtures/credentials/credentials-3-launchpad-plugin.xml
index dd96e9b..8b7ae74 100644
--- a/tests/fixtures/credentials/credentials-3-launchpad-plugin.xml
+++ b/tests/fixtures/credentials/credentials-3-launchpad-plugin.xml
@@ -104,6 +104,7 @@ jenkins_build_token: &quot;BUILD_ME&quot;
 # affected merge proposal (in the &quot;Executed test runs:&quot; section)
 jobs_blacklisted_from_messages:
 - &quot;lp-generic-update-mp&quot;
+- &quot;lp-generic-land-mp&quot;
 
 
 #message that is used for &quot;testing in progress&quot; comment
diff --git a/tests/fixtures/launchpad/lp-generic-land-mp.xml b/tests/fixtures/launchpad/lp-generic-land-mp.xml
new file mode 100644
index 0000000..5b8e67c
--- /dev/null
+++ b/tests/fixtures/launchpad/lp-generic-land-mp.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <actions/>
+  <description>Auto-land top-approved merge proposal on Launchpad.&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <assignedNode>launchpad</assignedNode>
+  <canRoam>false</canRoam>
+  <logRotator>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>100</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>ci_result</name>
+          <description>Result of the CI build</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>ci_build</name>
+          <description>Jenkins URL of the build</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>ci_branch</name>
+          <description>Launchpad branch that was processed</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>ci_merge_proposal</name>
+          <description>Launchpad merge proposal that was processed</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>ci_revision</name>
+          <description>Revision of the processed branch</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash
+
+# log all commands and abort on error
+set -ex
+
+autoland --test-result="${ci_result}" --build-job-url="${ci_build}" --merge-proposal="${ci_merge_proposal}" --revision="${ci_revision}"
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+      <template>${ENV,var="ci_branch"}</template>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
diff --git a/tests/fixtures/launchpad/lp-three-autoland.xml b/tests/fixtures/launchpad/lp-three-autoland.xml
new file mode 100644
index 0000000..7660caa
--- /dev/null
+++ b/tests/fixtures/launchpad/lp-three-autoland.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <actions/>
+  <description>Auto-land top-approved merge proposal in lp:three/devel&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <authToken>BUILD_ME</authToken>
+  <concurrentBuild>true</concurrentBuild>
+  <assignedNode>monitor</assignedNode>
+  <canRoam>false</canRoam>
+  <logRotator>
+    <daysToKeep>60</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings>
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>landing_candidate</name>
+          <description>Launchpad branch to process</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>candidate_revision</name>
+          <description>Branch revision to process</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>merge_proposal</name>
+          <description>Merge proposal to process</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <builders>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder>
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>source_branch=${landing_candidate}
+source_revision=${candidate_revision}
+target_branch=lp:three/devel
+</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+          </configs>
+          <projects>build</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+          <block>
+            <buildStepFailureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </buildStepFailureThreshold>
+            <unstableThreshold>
+              <name>UNSTABLE</name>
+              <ordinal>1</ordinal>
+              <color>YELLOW</color>
+              <completeBuild>true</completeBuild>
+            </unstableThreshold>
+            <failureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </failureThreshold>
+          </block>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder>
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>build_run=build#${TRIGGERED_BUILD_NUMBER_build}
+testnames=test-three
+</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+            <hudson.plugins.parameterizedtrigger.matrix.MatrixSubsetBuildParameters>
+              <filter/>
+            </hudson.plugins.parameterizedtrigger.matrix.MatrixSubsetBuildParameters>
+          </configs>
+          <projects>test-0-autopkgtest</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+          <block>
+            <buildStepFailureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </buildStepFailureThreshold>
+            <unstableThreshold>
+              <name>UNSTABLE</name>
+              <ordinal>1</ordinal>
+              <color>YELLOW</color>
+              <completeBuild>true</completeBuild>
+            </unstableThreshold>
+            <failureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </failureThreshold>
+          </block>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+  </builders>
+  <publishers>
+    <hudson.plugins.parameterizedtrigger.BuildTrigger>
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>ci_result=PASSED
+ci_build=${BUILD_URL}
+ci_branch=${landing_candidate}
+ci_merge_proposal=${merge_proposal}
+ci_revision=${candidate_revision}
+</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+          </configs>
+          <projects>lp-generic-land-mp</projects>
+          <condition>SUCCESS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+        </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+        <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>ci_result=FAILED
+ci_build=${BUILD_URL}
+ci_branch=${landing_candidate}
+ci_merge_proposal=${merge_proposal}
+ci_revision=${candidate_revision}
+</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+          </configs>
+          <projects>lp-generic-land-mp</projects>
+          <condition>UNSTABLE_OR_WORSE</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+        </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.BuildTrigger>
+  </publishers>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+      <template>${ENV,var=&quot;landing_candidate&quot;}</template>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
diff --git a/tests/fixtures/launchpad/lp-three-trigger-autolanding.xml b/tests/fixtures/launchpad/lp-three-trigger-autolanding.xml
new file mode 100644
index 0000000..1694b1e
--- /dev/null
+++ b/tests/fixtures/launchpad/lp-three-trigger-autolanding.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <actions/>
+  <description>Auto-land top-approved changes for lp:three/devel&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <assignedNode>launchpad-three</assignedNode>
+  <canRoam>false</canRoam>
+  <logRotator>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>10</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings>
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <triggers class="vector">
+    <hudson.triggers.TimerTrigger>
+      <spec>H/5 * * * *</spec>
+    </hudson.triggers.TimerTrigger>
+  </triggers>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash
+
+# log all commands and abort on error
+set -ex
+
+launchpadTrigger --lock-name=${JOB_NAME} --job=lp-three-autoland --branch=lp:three/devel --autoland || true
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper/>
+  </buildWrappers>
+</project>
diff --git a/tests/fixtures/launchpad/lp-two-autoland.xml b/tests/fixtures/launchpad/lp-two-autoland.xml
new file mode 100644
index 0000000..8613b23
--- /dev/null
+++ b/tests/fixtures/launchpad/lp-two-autoland.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <actions/>
+  <description>Auto-land top-approved merge proposal in lp:two&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <authToken>BUILD_ME</authToken>
+  <concurrentBuild>true</concurrentBuild>
+  <assignedNode>monitor</assignedNode>
+  <canRoam>false</canRoam>
+  <logRotator>
+    <daysToKeep>60</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings>
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>landing_candidate</name>
+          <description>Launchpad branch to process</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>candidate_revision</name>
+          <description>Branch revision to process</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>merge_proposal</name>
+          <description>Merge proposal to process</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <builders>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder>
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>source_branch=${landing_candidate}
+source_revision=${candidate_revision}
+target_branch=lp:two
+</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+          </configs>
+          <projects>build</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+          <block>
+            <buildStepFailureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </buildStepFailureThreshold>
+            <unstableThreshold>
+              <name>UNSTABLE</name>
+              <ordinal>1</ordinal>
+              <color>YELLOW</color>
+              <completeBuild>true</completeBuild>
+            </unstableThreshold>
+            <failureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </failureThreshold>
+          </block>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder>
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>build_run=build#${TRIGGERED_BUILD_NUMBER_build}
+testnames=test-one test-two
+</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+            <hudson.plugins.parameterizedtrigger.matrix.MatrixSubsetBuildParameters>
+              <filter>(label=="armhf").implies(testname=="test-one")</filter>
+            </hudson.plugins.parameterizedtrigger.matrix.MatrixSubsetBuildParameters>
+          </configs>
+          <projects>test-0-autopkgtest</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+          <block>
+            <buildStepFailureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </buildStepFailureThreshold>
+            <unstableThreshold>
+              <name>UNSTABLE</name>
+              <ordinal>1</ordinal>
+              <color>YELLOW</color>
+              <completeBuild>true</completeBuild>
+            </unstableThreshold>
+            <failureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </failureThreshold>
+          </block>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+  </builders>
+  <publishers>
+    <hudson.plugins.parameterizedtrigger.BuildTrigger>
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>ci_result=PASSED
+ci_build=${BUILD_URL}
+ci_branch=${landing_candidate}
+ci_merge_proposal=${merge_proposal}
+ci_revision=${candidate_revision}
+</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+          </configs>
+          <projects>lp-generic-land-mp</projects>
+          <condition>SUCCESS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+        </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+        <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>ci_result=FAILED
+ci_build=${BUILD_URL}
+ci_branch=${landing_candidate}
+ci_merge_proposal=${merge_proposal}
+ci_revision=${candidate_revision}
+</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+          </configs>
+          <projects>lp-generic-land-mp</projects>
+          <condition>UNSTABLE_OR_WORSE</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+        </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.BuildTrigger>
+  </publishers>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+      <template>${ENV,var=&quot;landing_candidate&quot;}</template>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
diff --git a/tests/fixtures/launchpad/lp-two-trigger-autolanding.xml b/tests/fixtures/launchpad/lp-two-trigger-autolanding.xml
new file mode 100644
index 0000000..6af75ad
--- /dev/null
+++ b/tests/fixtures/launchpad/lp-two-trigger-autolanding.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <actions/>
+  <description>Auto-land top-approved changes for lp:two&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <assignedNode>launchpad-two</assignedNode>
+  <canRoam>false</canRoam>
+  <logRotator>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>10</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings>
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <triggers class="vector">
+    <hudson.triggers.TimerTrigger>
+      <spec>H/5 * * * *</spec>
+    </hudson.triggers.TimerTrigger>
+  </triggers>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash
+
+# log all commands and abort on error
+set -ex
+
+launchpadTrigger --lock-name=${JOB_NAME} --job=lp-two-autoland --branch=lp:two --autoland || true
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper/>
+  </buildWrappers>
+</project>
diff --git a/tests/project.yaml b/tests/project.yaml
index d0892af..f28afc5 100644
--- a/tests/project.yaml
+++ b/tests/project.yaml
@@ -18,12 +18,14 @@
       (release=="vivid+overlay")
     chroot_filter:
       (node=="jenkins-slave-2").implies(arch=="amd64" || arch=="i386") && (node=="cyclops-node02").implies(arch=="armhf")
+    autopkgtest_filter: &autopkgtest_filter
+        '' 
     project:
     - one
-    - two:
+    - two: &two
         autopkgtest_names: test-one test-two
         autopkgtest_filter: (label==&quot;armhf&quot;).implies(testname==&quot;test-one&quot;)
-    - three:
+    - three: &three
         branch: lp:three/devel
     jobs:
     - prepare-jobs
@@ -33,4 +35,15 @@
     - test-jobs
     - launchpad-jobs
     - device-flash
-    - lp-{project}
\ No newline at end of file
+    - lp-{project}
+
+- project:
+    name: test-autolanding
+    autopkgtest_filter: *autopkgtest_filter
+    project:
+    - two: *two
+    - three:
+        <<: *three
+        autopkgtest_names: test-three
+    jobs:
+    - lp-{project}-autolanding