Merge ~saviq/jenkaas-jobs:add-autolanding into ~michihenning/jenkaas-jobs:master

[Michał Sawicz]

diff --git a/jenkaas_jobs/yaml/launchpad/launchpad.yaml b/jenkaas_jobs/yaml/launchpad/launchpad.yaml
index 6b38245..3cd22dc 100644
--- a/jenkaas_jobs/yaml/launchpad/launchpad.yaml
+++ b/jenkaas_jobs/yaml/launchpad/launchpad.yaml
@@ -13,7 +13,7 @@
 
 - job-group:
     name: lp-{project}-autolanding
-    branch: {project}
+    branch: lp:{project}
     jobs:
     - lp-{project}-trigger-autolanding
     - lp-{project}-autoland
diff --git a/project-example.yaml b/project-example.yaml
index 587558d..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
@@ -153,15 +153,18 @@
 
 # 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.
-# Note that the branch for even-another-project *must* match the branch specified above, otherwise
-# the MR will land in the wrong branch!
-#
-# - project:
-#     name: your-project-autolanding
-#     autopkgtest_filter: *autopkgtest_filter
-#     project:
-#     - your-other-project
-#     - even-another-project:
-#         branch: lp:{project}/devel
-#     jobs:
-#     - lp-{project}-autolanding
+# 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/launchpad/lp-three-autoland.xml b/tests/fixtures/launchpad/lp-three-autoland.xml
index 0eec3e2..7660caa 100644
--- a/tests/fixtures/launchpad/lp-three-autoland.xml
+++ b/tests/fixtures/launchpad/lp-three-autoland.xml
@@ -86,7 +86,7 @@ target_branch=lp:three/devel
           <configs>
             <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
               <properties>build_run=build#${TRIGGERED_BUILD_NUMBER_build}
-testnames=
+testnames=test-three
 </properties>
             </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
             <hudson.plugins.parameterizedtrigger.matrix.MatrixSubsetBuildParameters>
diff --git a/tests/fixtures/launchpad/lp-two-autoland.xml b/tests/fixtures/launchpad/lp-two-autoland.xml
index 1e537ae..8613b23 100644
--- a/tests/fixtures/launchpad/lp-two-autoland.xml
+++ b/tests/fixtures/launchpad/lp-two-autoland.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project>
   <actions/>
-  <description>Auto-land top-approved merge proposal in lp:two/devel&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <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>
@@ -49,7 +49,7 @@
             <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
               <properties>source_branch=${landing_candidate}
 source_revision=${candidate_revision}
-target_branch=lp:two/devel
+target_branch=lp:two
 </properties>
             </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
           </configs>
@@ -86,11 +86,11 @@ target_branch=lp:two/devel
           <configs>
             <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
               <properties>build_run=build#${TRIGGERED_BUILD_NUMBER_build}
-testnames=
+testnames=test-one test-two
 </properties>
             </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
             <hudson.plugins.parameterizedtrigger.matrix.MatrixSubsetBuildParameters>
-              <filter>two_autopkgtest_filter</filter>
+              <filter>(label=="armhf").implies(testname=="test-one")</filter>
             </hudson.plugins.parameterizedtrigger.matrix.MatrixSubsetBuildParameters>
           </configs>
           <projects>test-0-autopkgtest</projects>
diff --git a/tests/fixtures/launchpad/lp-two-trigger-autolanding.xml b/tests/fixtures/launchpad/lp-two-trigger-autolanding.xml
index 5d9f5d7..6af75ad 100644
--- a/tests/fixtures/launchpad/lp-two-trigger-autolanding.xml
+++ b/tests/fixtures/launchpad/lp-two-trigger-autolanding.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project>
   <actions/>
-  <description>Auto-land top-approved changes for lp:two/devel&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <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>
@@ -33,7 +33,7 @@
 # log all commands and abort on error
 set -ex
 
-launchpadTrigger --lock-name=${JOB_NAME} --job=lp-two-autoland --branch=lp:two/devel --autoland || true
+launchpadTrigger --lock-name=${JOB_NAME} --job=lp-two-autoland --branch=lp:two --autoland || true
 </command>
     </hudson.tasks.Shell>
   </builders>
diff --git a/tests/project.yaml b/tests/project.yaml
index e4abf1f..f28afc5 100644
--- a/tests/project.yaml
+++ b/tests/project.yaml
@@ -22,11 +22,10 @@
         '' 
     project:
     - one
-    - two:
+    - two: &two
         autopkgtest_names: test-one test-two
-        autopkgtest_filter: &two_autopkg_test_filter
-            (label==&quot;armhf&quot;).implies(testname==&quot;test-one&quot;)
-    - three:
+        autopkgtest_filter: (label==&quot;armhf&quot;).implies(testname==&quot;test-one&quot;)
+    - three: &three
         branch: lp:three/devel
     jobs:
     - prepare-jobs
@@ -42,10 +41,9 @@
     name: test-autolanding
     autopkgtest_filter: *autopkgtest_filter
     project:
-    - two:
-        autopkgtest_filter: two_autopkgtest_filter
-        branch: lp:two/devel
+    - two: *two
     - three:
-        branch: lp:three/devel
+        <<: *three
+        autopkgtest_names: test-three
     jobs:
     - lp-{project}-autolanding