Merge lp:~canonical-platform-qa/qa-jenkins-jobs/auto_ci-land_upgrade_testing into lp:qa-jenkins-jobs

[Christopher Lee]

Template autolanding and ci jobs to add auto-upgrade-testing.

Template autolanding and ci jobs to add auto-upgrade-testing.

[Max Brustkern (nuclearbob)]

We've talked about creating separate macros files. Would this be a good time to start that, since we're directly reusing a lot of code from other jobs? It seems like otherwise, some of these job names will overlap as well. Even if we don't go as far as making a generic macros file, maybe making a generic autolanding job set would work.

[Christopher Lee (veebers)]

Sorry Max, I forgot to set the pre-req. branch. There isn't as much duplication as the diff lead us to believe.

I have a plan to simplify things a little further still.

[Max Brustkern (nuclearbob)]

Looks good.

review: Approve

[lp:~canonical-platform-qa/qa-jenkins-jobs/auto_ci-land_upgrade_testing]

28. By Christopher Lee on 2016-03-07

Merge parent

29. By Christopher Lee on 2016-03-07

Merge parent

=== modified file 'mp-ci-autoland/ci-jobs.yaml'
--- mp-ci-autoland/ci-jobs.yaml	2016-03-07 23:19:26 +0000
+++ mp-ci-autoland/ci-jobs.yaml	2016-03-07 23:19:26 +0000
@@ -195,9 +195,13 @@
     name: 'ci-details'
     jobs:
         - 'build-{dist}-{arch}-package'
-        - 'trigger-autopilot-ci'
-        - 'autopilot-ci'
+        - 'trigger-{target_project}-ci'
+        - '{target_project}-ci'
         - 'generic-update-mp'
+    target_project:
+        # Must be projects lp:<name>
+        - 'autopilot'
+        - 'auto-upgrade-testing'
     dist:
         - wily
     arch:
@@ -230,16 +234,16 @@
             description: 'The revision of the processed branch'
 
 - job-template:
-    name: 'trigger-autopilot-ci'
+    name: 'trigger-{target_project}-ci'
     description: |
-        Poll and trigger autopilot-ci when there is a new MP that needs it.
+        Poll and trigger {target_project}-ci when there is a new MP that needs it.
     node: 'jenkins-slave-2'
     triggers:
       - timed: 'H/5 * * * *'
     builders:
       - shell: |
-            BRANCH_NAME=lp:autopilot
-            TARGET_JOB=autopilot-ci
+            BRANCH_NAME=lp:{target_project}
+            TARGET_JOB={target_project}-ci
             # TARGET_JOB needs to already exist.
 
             launchpadTrigger --lock-name=$JOB_NAME --job=$TARGET_JOB --branch=$BRANCH_NAME --trigger-ci
@@ -247,16 +251,16 @@
             exit 0
 
 - job-template:
-    name: 'autopilot-ci'
+    name: '{target_project}-ci'
     description: |
-        Build packages and run tests for an Autopilot merge proposal
+        Build packages and run tests for an {target_project} merge proposal
     node: 'jenkins-slave-2'
     # This token is the string that was setup for the launchpad bot.
     auth-token: BUILD_ME
     builders:
         - trigger-deb-builders:
             landing_candidate: {landing_candidate}
-            target_branch: 'lp:autopilot'
+            target_branch: 'lp:{target_project}'
             hooks: 'H05set_package_version H10strip_native_depends'
             parallelism: 1
         - upcopy-i386-from-downstream
@@ -317,6 +321,7 @@
     description: |
         Build a debian package for {dist} - {arch}.
     node: 'jenkins-slave-2'
+    # TODO: Explore if concurrent will work for us.
     # concurrent: 'true' ?
     parameters:
         - string:
@@ -344,15 +349,23 @@
         - collect-debs
 
 - project:
-    name: 'autopilot-autolanding'
-    # Make this paramatised perhaps
+    name: 'project-autolanding'
+    description: |
+      Autolanding jobs for projects in QA control
     jobs:
-      - 'autopilot-autoland'
-      - 'trigger-autopilot-autoland'
+      - '{target_project}-autoland'
+      - 'trigger-{target_project}-autoland'
       - 'generic-land-mp'
-      
+    target_project:
+      # Must be lp:<name>
+      - 'autopilot'
+      - 'auto-upgrade-testing'
+
 - job-template:
-    name: 'autopilot-autoland'
+    name: '{target_project}-autoland'
+    description: |
+      Gets triggered when a MP exists that meets autoland criteria. Merges with
+      {target_project} trunk.
     node: 'jenkins-slave-2'
     # This token is the string that was setup for the launchpad bot.
     auth-token: BUILD_ME
@@ -369,18 +382,20 @@
     builders:
       - trigger-deb-builders:
             landing_candidate: {landing_candidate}
-            target_branch: 'lp:autopilot'
+            target_branch: 'lp:{target_project}'
             hooks: 'H05set_package_version H10strip_native_depends'
             parallelism: 1
       - 'trigger-generic-land-mp'
     publishers:
       - 'trigger-generic-land-mp-failed'
-        
+
 - builder:
     name: 'trigger-generic-land-mp'
+    description: |
+      Run when an autolanding job succeeds to update the MP with the success details.
     builders:
       - trigger-builds:
-          - project: 
+          - project:
               - 'generic-land-mp'
             block: 'true'
             predefined-parameters: |
@@ -393,12 +408,14 @@
               build-step-failure-threshold: 'never'
               unstable-threshold: 'never'
               failure-threshold: 'never'
-                
+
 - publisher:
     name: 'trigger-generic-land-mp-failed'
+    description: |
+      Run when an autolanding job fails to update the MP with the failure details.
     publishers:
         - trigger-parameterized-builds:
-          - project: 
+          - project:
                 - 'generic-land-mp'
             condition: 'UNSTABLE_OR_WORSE'
             predefined-parameters: |
@@ -407,21 +424,25 @@
                 ci_branch=$landing_candidate
                 ci_merge_proposal=$merge_proposal
                 ci_revision=$candidate_revision
-    
+
 - job-template:
-    name: 'trigger-autopilot-autoland'
+    name: 'trigger-{target_project}-autoland'
+    description: |
+      Poll and trigger {target_project}-ci when there is a new MP that needs it.
     node: 'jenkins-slave-2'
     triggers:
       - timed: 'H/5 * * * *'
     builders:
       - shell: |
-            BRANCH_NAME=lp:autopilot
-            TARGET_JOB=autopilot-autoland
+            BRANCH_NAME=lp:{target_project}
+            TARGET_JOB={target_project}-autoland
 
             launchpadTrigger --lock-name=$JOB_NAME --job=$TARGET_JOB --branch=$BRANCH_NAME --autoland
-      
+
 - job-template:
     name: 'generic-land-mp'
+    description: |
+      Updates a MP with the autoland results (Success/Failure)
     node: 'jenkins-slave-2'
     parameters:
       - string: