Merge lp:~canonical-platform-qa/qa-jenkins-jobs/ust-minor-moves into lp:qa-jenkins-jobs

[Allan LeSage]

Minor adjustments for ust including node labels.

A few minor moves including adopting a node-labeling convention to route traffic better, disabling periodic jobs, a minor rename.

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:175
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/55/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/3370
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/3370/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/3370
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/3370/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/880/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/55/rebuild

review: Approve (continuous-integration)

[lp:~canonical-platform-qa/qa-jenkins-jobs/ust-minor-moves]

176. By Allan LeSage on 2016-09-09

Remove periodic jobs altogether.

[Max Brustkern (nuclearbob)]

Looks good!

review: Approve

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:176
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/56/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/3371
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/3371/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/3371
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/3371/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/881/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/56/rebuild

review: Approve (continuous-integration)

=== modified file 'jobs/ubuntu-system-tests/ci-jobs.yaml'
--- jobs/ubuntu-system-tests/ci-jobs.yaml	2016-08-26 20:49:32 +0000
+++ jobs/ubuntu-system-tests/ci-jobs.yaml	2016-09-09 20:00:53 +0000
@@ -106,6 +106,6 @@
             steps:
                 - trigger-builds:
                     - project:
-                        - 'ust_rc-proposed_krillin_sanity_test'
+                        - 'ust-ci-krillin'
                       block: true
                       property-file: $WORKSPACE/ust-parameters.txt

=== modified file 'jobs/ubuntu-system-tests/jobs.yaml'
--- jobs/ubuntu-system-tests/jobs.yaml	2016-08-31 21:34:38 +0000
+++ jobs/ubuntu-system-tests/jobs.yaml	2016-09-09 20:00:53 +0000
@@ -22,7 +22,6 @@
         - regression
     automation_status:
         - stable
-        - unstable
     channel:
         - 'rc'
         - 'rc-proposed'
@@ -32,14 +31,14 @@
             device_node: krillin-02||krillin-06
         - arale:
             device_channel: 'meizu.en'
-            device_node: arale-06
+            device_node: arale-06||arale-05
     jobs:
         - 'flash-device'
         - 'ust_{channel}_{device}_{test_level}'
         - 'ust_{channel}_{device}_{test_level}_test'
-        - 'ust_{channel}_{device}_periodic'
         - 'ust_report-results-to-practitest'
         - 'ust_rc-proposed_{device}_{automation_status}'
+        - 'ust-ci-{device}'
 
 - job-template:
     name: 'flash-device'
@@ -106,6 +105,18 @@
 
 - job-template:
     <<: *UST_DEFAULT_JOB_TEMPLATE
+    name: 'ust-ci-{device}'
+    description: |
+        Run tests from merge proposals.
+    node: ust-ci-{device}
+    parameters:
+        - ubuntu-system-tests-parameters:
+            tests_to_run: ''
+            channel: rc-proposed
+            device_channel: '{device_channel}'
+
+- job-template:
+    <<: *UST_DEFAULT_JOB_TEMPLATE
     name: 'ust_{channel}_{device}_{test_level}'
     description: |
         Triggered by image publication, reports results to PractiTest.
@@ -114,6 +125,7 @@
             tests_to_run: '{test_level}'
             channel: '{channel}'
             device_channel: '{device_channel}'
+    node: ust-{device}
     triggers:
         - new-system-image-published-trigger:
             channel: '{channel}'
@@ -138,25 +150,6 @@
 
 - job-template:
     <<: *UST_DEFAULT_JOB_TEMPLATE
-    name: 'ust_{channel}_{device}_periodic'
-    description: |
-        Run a single reliable test a few times a day to scout for device problems.
-    parameters:
-        - ubuntu-system-tests-parameters:
-            tests_to_run: ubuntu_system_tests.tests.test_add_contact.AddContactSystemTest.test_add_contact_with_name_and_number
-            channel: '{channel}'
-            device_channel: '{device_channel}'
-    triggers:
-        - timed: "H */6 * * *"
-    publishers:
-        - archive:
-            artifacts: 'results/**/*'
-            allow-empty: 'true'
-        - junit:
-            results: 'results/artifacts/test-results.xml'
-
-- job-template:
-    <<: *UST_DEFAULT_JOB_TEMPLATE
     name: 'ust_rc-proposed_{device}_{automation_status}'
     description: |
         Run stable or unstable tests periodically.
@@ -165,6 +158,7 @@
             tests_to_run: '{automation_status}'
             channel: rc-proposed
             device_channel: '{device_channel}'
+    node: ust-{device}
     triggers:
         - timed: '@daily'
     publishers: