Merge lp:~canonical-platform-qa/qa-jenkins-jobs/snapcore-upgrade-candidate into lp:qa-jenkins-jobs

[Max Brustkern]

Rename tests that are already using candidate to have candidate in the name

The current upgrade jobs are using --candidate in the snap refresh lines, so I'd like to rename them to reflect that. After that, I'll update the spread-vm.sh script in lp:snapcore-qa-tests to actually respect the $CHANNEL environment variable for upgrades.

[Jean-Baptiste Lallement (jibel)]

LGTM thanks

review: Approve

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

PASSED: Continuous integration, rev:237
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/168/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/585
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/585/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/582
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/582/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2177/console

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

review: Approve (continuous-integration)

=== modified file 'jobs/snapcore-qa-tests/jobs.yaml'
--- jobs/snapcore-qa-tests/jobs.yaml	2017-03-07 10:35:58 +0000
+++ jobs/snapcore-qa-tests/jobs.yaml	2017-03-22 16:07:45 +0000
@@ -29,7 +29,7 @@
         - pc-i386
     jobs:
         - snapcore-candidate-{model}-spread
-        - snapcore-stable-upgrade-{model}-spread
+        - snapcore-candidate-upgrade-{model}-spread
 
 - builder:
     name: snap-vm
@@ -82,9 +82,9 @@
             allow-empty: 'true'
 
 - job-template:
-    name: snapcore-stable-upgrade-{model}-spread
+    name: snapcore-candidate-upgrade-{model}-spread
     description: |
-        This job runs the spread tests on released ubuntu core 16 image upgrade to current stable for the {model} model
+        This job runs the spread tests on released ubuntu core 16 image upgrade to current candidate for the {model} model
         Defined in lp:qa-jenkins-jobs
     node: iso-testing
     triggers:
@@ -97,7 +97,7 @@
         - snap-vm:
             user: 'nuclearbob'
             image: '/var/cache/auto-upgrade-testing/ubuntu-core-16-{model}.img'
-            channel: 'stable'
+            channel: 'candidate'
             model: ''
             upgrade: '-upgrade'
     publishers: