Merge lp:~gandelman-a/cloud-archive-utils/metabug into lp:cloud-archive-utils

[Adam Gandelman]

Adds a new utilitiy script: cloud-archive-metabug, which can be used to quickly open SRU tracking bugs ala Bug #1262788

Updates version constants for new Ubuntu/OS releases and adds some utility mappings.l

[lp:~gandelman-a/cloud-archive-utils/metabug]

18. By Adam Gandelman on 2014-01-03

Rebase on trunk, do not login to LP anonymously

Unmerged revisions

18. By Adam Gandelman on 2014-01-03

Rebase on trunk, do not login to LP anonymously

17. By Adam Gandelman on 2014-01-03

Adds cloud-archive-metabug script, updates existing version constants and adds a few more

=== added file 'bin/cloud-archive-metabug'
--- bin/cloud-archive-metabug	1970-01-01 00:00:00 +0000
+++ bin/cloud-archive-metabug	2014-01-03 00:54:05 +0000
@@ -0,0 +1,95 @@
+#!/usr/bin/python
+
+import optparse
+import sys
+
+from ubuntutools.logger import Logger
+
+from cloudarchive import utils, common
+
+
+MSG_TEMPLATE = """
+This is a meta-bug used for tracking progress of the OpenStack
+%(os_vers)s %(os_series)s stable updates to %(packages_list)s
+in Ubuntu %(ubuntu_series)s %(ubuntu_vers)s and the Ubuntu Cloud Archive.
+"""
+
+
+def die(msg):
+    Logger.error(msg)
+    sys.exit(1)
+
+
+def create_new_metabug(packages, os_vers):
+    '''Creates a new meta bug report affecting a single package
+    and populates with message'''
+    p1 = packages[0]
+    packages_list = ', '.join([p.capitalize() for p in packages])
+    os_series = utils.openstack_series(os_vers)
+    ubuntu_series = utils.ubuntu_series(os_series).capitalize()
+    ubuntu_vers = utils.ubuntu_version(ubuntu_series)
+    Logger.normal('Creating new bug report initially targetting %s' % p1)
+    msg = MSG_TEMPLATE % locals()
+    # TODO: Create and return the bug
+
+
+if __name__ == '__main__':
+    usage = 'usage: %prog [options] [projects]'
+    parser = optparse.OptionParser(usage=usage)
+    parser.add_option('-b', '--bug',
+                      help='Existing bug # to update',
+                      dest='bug_no', action='store')
+    parser.add_option('-v', '--version',
+                      help='OpenStack Stable version (ie, 2013.1.2)',
+                      dest='os_version', action='store')
+    (opts, args) = parser.parse_args()
+
+    if not opts.os_version:
+        die('Must specify an OpenStack stable version')
+    elif not args:
+        die('Must specify a comma-separated list of packages to target')
+
+    packages = [a.strip() for a in args[0].split(',')]
+    os_vers = opts.os_version
+    os_series = utils.openstack_series(os_vers)
+    ubuntu_series = utils.ubuntu_series(os_series)
+
+    Logger.normal(
+        'Meta-bug will target %s/%s affecting: %s' %
+        (ubuntu_series, os_series, ' '.join(packages)))
+
+    if not opts.bug_no:
+        bug = create_new_metabug(packages, os_vers)
+    else:
+        bug = utils.get_bug(opts.bug_no)
+
+    for p in packages:
+        affects_package = False
+        has_task = False
+        found = False
+
+        for task in utils.affected_packages(bug):
+            if task.name != p:
+                found = False
+                continue
+
+            # ensure metabug tasks are invalidated against ubuntu dev rel.
+            if task.series == common.UBUNTU_DEV:
+                if task.status != 'Invalid':
+                    utils.set_task_status(task.lp_task, status='Invalid')
+                affects_package = True
+
+            if task.series == ubuntu_series:
+                if task.status != 'Confirmed':
+                    utils.set_task_status(task.lp_task, status='Confirmed')
+                has_task = True
+
+        if not affects_package:
+            utils.create_task(
+                bug=bug, package=p, series=common.UBUNTU_DEV, status='Invalid')
+
+        if not has_task:
+            utils.create_task(
+                bug=bug, package=p, series=ubuntu_series, status='Confirmed')
+
+    utils.set_cloud_archive_task_status(bug, 'Confirmed')

=== modified file 'bin/cloud-archive-sru-released'
--- bin/cloud-archive-sru-released	2013-07-01 20:47:20 +0000
+++ bin/cloud-archive-sru-released	2014-01-03 00:54:05 +0000
@@ -61,4 +61,6 @@
         sys.exit(0)
 
     utils.set_cloud_archive_task_status(lp_bug, status='Fix Released')
-    utils.post_message(bug=lp_bug, message=msg)
+    utils.post_message(
+        bug=lp_bug, message=msg,
+        subject='Fix Released in the Ubuntu Cloud Archive')

=== modified file 'cloudarchive/common.py'
--- cloudarchive/common.py	2013-12-03 21:50:47 +0000
+++ cloudarchive/common.py	2014-01-03 00:54:05 +0000
@@ -22,6 +22,15 @@
     "icehouse",
 ]
 
+
+OS_VERSION = {
+    "2012.2": "folsom",
+    "2013.1": "grizzly",
+    "2013.2": "havana",
+    "2014.1": "icehouse",
+}
+
+
 SOURCE_RELEASE = {
     "folsom": "quantal",
     "grizzly": "raring",
@@ -30,11 +39,22 @@
 }
 
 UBUNTU_SERIES = [
+    'precise',
+    'quantal',
     'raring',
     'saucy',
     'trusty',
 ]
 
+
+UBUNTU_VERSION = {
+    '12.04': 'precise',
+    '12.10': 'quantal',
+    '13.04': 'raring',
+    '13.10': 'saucy',
+    '14.04': 'trust',
+}
+
 UBUNTU_DEV = UBUNTU_SERIES[-1]
 UBUNTU_STABLE = UBUNTU_SERIES[-2]
 

=== modified file 'cloudarchive/utils.py'
--- cloudarchive/utils.py	2013-12-03 19:49:46 +0000
+++ cloudarchive/utils.py	2014-01-03 00:54:05 +0000
@@ -1,18 +1,28 @@
 import logging
+import os
 import re
 
+from collections import namedtuple
+
 from apt_pkg import version_compare
 
 from ubuntutools.logger import Logger
-from common import SERIES, SOURCE_RELEASE, LTS_SERIES
+from common import (
+    SERIES, SOURCE_RELEASE, LTS_SERIES, OS_VERSION, UBUNTU_DEV, UBUNTU_VERSION)
 
 from ubuntutools.lp.lpapicache import (Launchpad, Distribution,
                                        PackageNotFoundException)
 
+from lazr.restfulclient.errors import BadRequest
+
 
 def get_lp():
+    if os.getenv('LP_STAGING'):
+        service = 'staging'
+    else:
+        service = 'production'
     if not Launchpad.logged_in:
-        Launchpad.login_anonymously()
+        Launchpad.login(service=service)
 
 
 def ubuntu_series(os_series):
@@ -22,6 +32,17 @@
             return SOURCE_RELEASE[r]
 
 
+def ubuntu_version(ubuntu_series):
+    '''Return the Ubuntu version number for a given series codename'''
+    ubuntu_series = ubuntu_series.lower()
+    for vers, codename in UBUNTU_VERSION.iteritems():
+        if codename == ubuntu_series:
+            return vers
+    Logger.error(
+        'Could not determine Ubuntu version from series %s' % ubuntu_series)
+    raise Exception
+
+
 def lts_series(os_series):
     '''Return the LTS cloud archive series for a given OpenStack Release'''
     for u, o in LTS_SERIES.iteritems():
@@ -29,6 +50,16 @@
             return u
 
 
+def openstack_series(os_version):
+    '''Return OpenStack series name for a version string'''
+    for vers, codename in OS_VERSION.iteritems():
+        if os_version.startswith(vers):
+            return codename
+    Logger.error(
+        'Could not obtain OpenStack series for version: %s' % os_version)
+    raise Exception
+
+
 def query_ca_ppa(ppa='folsom-staging', owner='ubuntu-cloud-archive',
                  release=SERIES):
     ''' Query a PPA for source packages and versions '''
@@ -90,11 +121,58 @@
 
 def affected_packages(bug):
     '''Return a list of affected Ubuntu packages for given bug number'''
-    tgts = [task.target.name for task in bug.bug_tasks
-            if task.target.name != 'cloud-archive']
+    bug_task = namedtuple('bug_task', 'name series status lp_task')
+    tgts = []
+    for task in bug.bug_tasks:
+        tgt = task.target
+        if (not hasattr(tgt, 'distribution') or
+           tgt.distribution.name != 'ubuntu'):
+            continue
+        if not hasattr(tgt, 'distroseries'):
+            # tasks affecting dev release have no distroseries
+            tgts.append(
+                bug_task(tgt.name, UBUNTU_DEV, task.status, task))
+        else:
+            tgts.append(
+                bug_task(tgt.name, tgt.distroseries.name, task.status, task))
     return list(set(tgts))
 
 
+def set_task_status(task, status):
+    Logger.normal(
+        'Setting status %s on %s' % (status, task.bug_target_display_name))
+    task.status = status
+    task.lp_save()
+
+
+def create_task(bug, package, series=UBUNTU_DEV, status='Confirmed'):
+    Logger.normal(
+        'Creating %s task affecting %s (%s) on (LP: %s).' %
+        (status, package, series, bug.id))
+    lp = get_lp()
+    archive = lp.distributions['ubuntu']
+    pkg = archive.getSourcePackage(name=package)
+
+    task = None
+    try:
+        task = bug.addTask(target=pkg)
+    except BadRequest as e:
+        if e.content.startswith('A fix for this bug has already been'):
+            tsks = affected_packages(bug)
+            for _package, _series, _status, _task in tsks:
+                if _package == package and series == series:
+                    task = _task
+                    break
+        else:
+            raise e
+
+    if not task:
+        Logger.error('Error adding task to bug')
+        raise Exception
+
+    set_task_status(task, status)
+
+
 def meta_bug_distribution(bug):
     '''Return a list of Ubuntu releases a meta bug has been released to'''
     bug_tasks = [bt for bt in bug.bug_tasks
@@ -116,7 +194,7 @@
     return sorted(rels).pop()
 
 
-def post_message(bug, message):
+def post_message(bug, message, subject=None):
     '''Posts message to a bug'''
     bug.newMessage(content=message,
                    subject='Fix Released in the Ubuntu Cloud Archive.')
@@ -125,17 +203,20 @@
 
 def set_cloud_archive_task_status(bug, status):
     '''Sets status on a cloud archive bug task'''
-    bug_task = [bt for bt in bug.bug_tasks
-                if bt.bug_target_name == 'cloud-archive'].pop()
+    tasks = [bt for bt in bug.bug_tasks
+             if bt.bug_target_name == 'cloud-archive']
 
-    if not bug_task:
-        logging.error('Bug %s does not affect cloud archive, cant set status.')
-        raise Exception
+    if tasks:
+        bug_task = tasks.pop()
+    else:
+        lp = get_lp()
+        ca = lp.projects['cloud-archive']
+        bug_task = bug.addTask(target=ca)
 
     bug_task.status = status
     bug_task.lp_save()
-    logging.info('Status set on cloud-archive task (LP: #%s): %s.' %
-                 (bug.id, status))
+    Logger.normal('Status set on cloud-archive task (LP: #%s): %s.' %
+                  (bug.id, status))
 
 
 def outdated_packages(os_release):