Merge lp:~canonical-platform-qa/qa-jenkins-jobs/snap-channel-support into lp:qa-jenkins-jobs

[Richard Huddie]

Update the app launch tests trigger job to look in beta channel for updates first, followed by edge channel if no revision found in beta.

- Remove the SNAP_CHANNEL parameter, which was fixed to use edge channel
- Check beta channel for updates first, followed by edge channel
- Remove channel name from the dictionary key used to store saved revision as this is now not needed

This should be landed in parallel with: https://code.launchpad.net/~canonical-platform-qa/ubuntu-system-tests/snap-channel-support/+merge/320393

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

PASSED: Continuous integration, rev:236
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/167/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/584
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/584/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/581
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/581/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2168/console

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

review: Approve (continuous-integration)

[Max Brustkern (nuclearbob)]

Looks good to me. I suppose removing the old data isn't really necessary.

review: Approve

[Santiago Baldassin (sbaldassin)]

Looks good to me

review: Approve

=== modified file 'jobs/ubuntu-system-tests/jobs.yaml'
--- jobs/ubuntu-system-tests/jobs.yaml	2017-03-15 16:33:44 +0000
+++ jobs/ubuntu-system-tests/jobs.yaml	2017-03-21 14:27:35 +0000
@@ -196,10 +196,6 @@
             default: '{deb-triggers}'
             description: Debs to monitor for updates to trigger new build.
         - string:
-            name: SNAP_CHANNEL
-            default: 'edge'
-            description: Channel to install snaps from.
-        - string:
             name: CORE_SERIES
             default: '16'
             description: Series of Ubuntu-core used.

=== modified file 'jobs/ubuntu-system-tests/upgrade_trigger.py'
--- jobs/ubuntu-system-tests/upgrade_trigger.py	2017-02-27 14:19:41 +0000
+++ jobs/ubuntu-system-tests/upgrade_trigger.py	2017-03-21 14:27:35 +0000
@@ -30,9 +30,10 @@
     'https://search.apps.ubuntu.com/api/v1/snaps/details/{n}?channel={c}'
 )
 SNAP_DATA_FILE_NAME = 'snap-data.json'
-KEY_SNAP = '{n}-{a}-{s}-{c}'
+KEY_SNAP = '{n}-{a}-{s}'
 KEY_REV = 'revision'
 JENKINS_DATA = '/etc/jenkins_jobs/jenkins_jobs.ini'
+CHANNELS = ['beta', 'edge']
 
 jenkins = None
 
@@ -52,16 +53,24 @@
     return json.loads(data) if data else {}
 
 
-def get_published_snap_revision(name, arch, series, channel):
-    """Return revision of specified published snap."""
-    url = STORE_QUERY_URL.format(n=name, c=channel)
+def get_published_snap_revision(name, arch, series):
+    """Return channel and revision of specified published snap.
+    This will look at the beta channel first and then the edge
+    channel, using the first revision that is found.
+    """
     headers = {'X-Ubuntu-Series': series, 'X-Ubuntu-Architecture': arch}
-    return int(requests.get(url, headers=headers).json()[KEY_REV])
-
-
-def get_current_snap_revision(snap_data, name, arch, series, channel):
+    for channel in CHANNELS:
+        url = STORE_QUERY_URL.format(n=name, c=channel)
+        response = requests.get(url, headers=headers)
+        if response.ok:
+            rev = int(response.json()[KEY_REV])
+            return channel, rev
+    raise RuntimeError('No published revision found for snap {n}.')
+
+
+def get_current_snap_revision(snap_data, name, arch, series):
     """Return revision of currently tested snap."""
-    key_snap = KEY_SNAP.format(n=name, a=arch, s=series, c=channel)
+    key_snap = KEY_SNAP.format(n=name, a=arch, s=series)
     try:
         rev = int(snap_data[key_snap][KEY_REV])
     except (KeyError, TypeError, ValueError):
@@ -70,9 +79,9 @@
 
 
 def save_published_snap_revision(work_dir, snap_data, name, arch, series,
-                                 channel, revision):
+                                 revision):
     """Save the published snap revision for future comparison."""
-    key_snap = KEY_SNAP.format(n=name, a=arch, s=series, c=channel)
+    key_snap = KEY_SNAP.format(n=name, a=arch, s=series)
     if key_snap not in snap_data:
         snap_data[key_snap] = {}
     snap_data[key_snap][KEY_REV] = revision
@@ -81,20 +90,19 @@
         f.write(json.dumps(snap_data))
 
 
-def run_snap_trigger_check(work_dir, name, arch, series, channel):
+def run_snap_trigger_check(work_dir, name, arch, series):
     """Return status indicating if a new revision of snap is published. If a
     new version is available then update the saved data file with this value.
     """
     snap_data = get_snap_data(work_dir)
-    current = get_current_snap_revision(
-        snap_data, name, arch, series, channel)
-    published = get_published_snap_revision(name, arch, series, channel)
+    current = get_current_snap_revision(snap_data, name, arch, series)
+    channel, published = get_published_snap_revision(name, arch, series)
     if published > current:
         print('New revision detected for: {n} {a} {c} {s} :: previous: {e} :: '
               'new: {p}.'.format(n=name, a=arch, c=channel, s=series,
                                  e=current, p=published))
         save_published_snap_revision(
-            work_dir, snap_data, name, arch, series, channel, published)
+            work_dir, snap_data, name, arch, series, published)
         return True
     return False
 
@@ -135,12 +143,11 @@
     unity8_mode = os.getenv('UNITY8_MODE')
     device = os.getenv('DEVICE')
     series = os.getenv('CORE_SERIES')
-    channel = os.getenv('SNAP_CHANNEL')
     suite = os.getenv('SUITE')
     snap_triggers = os.getenv('SNAP_TRIGGERS')
     filters = os.getenv('FILTERS')
     for snap in snap_triggers.split():
-        if run_snap_trigger_check(work_dir, snap, arch, series, channel):
+        if run_snap_trigger_check(work_dir, snap, arch, series):
             # Run a new build of required test job
             job_name = (
                 'ust-test-{s}-{f}-{r}-{m}-{a}-{d}-unity8-'