Merge lp:~smoser/cloud-archive-utils/add-cloud-tools into lp:cloud-archive-utils

[Scott Moser]

add cloud-tools support.

2 primary things here:
 * add bin/cloud-archive-tools-backport an analog of cloud-archive-backport
   but for the cloud-tools pocket.
 * make do_backport a wrapper around newly added do_explicit_backport
   do_explicit_backport just contains explicit arguments for each of the
   things that do_backport was figuring out internally.
   do_backport should remain backwards compatible.

[Adam Gandelman (gandelman-a)]

LGTM.

review: Approve

[lp:~smoser/cloud-archive-utils/add-cloud-tools]

16. By Adam Gandelman on 2013-09-16

[smoser] add cact (cloud archive cloud tools) dput-ng profile

=== added file 'bin/cloud-archive-tools-backport'
--- bin/cloud-archive-tools-backport	1970-01-01 00:00:00 +0000
+++ bin/cloud-archive-tools-backport	2013-09-16 19:00:42 +0000
@@ -0,0 +1,51 @@
+#! /usr/bin/python
+
+import optparse
+import sys
+
+from cloudarchive.backport import do_explicit_backport, CABackportException
+from cloudarchive.common import UBUNTU_DEV, UBUNTU_STABLE, SERIES
+from ubuntutools.logger import Logger
+
+if __name__ == '__main__':
+    usage = 'usage: %prog [options] package(s)'
+    parser = optparse.OptionParser(usage=usage)
+    parser.add_option('-N', '--next',
+                      help='target cloud-tools-next rather than '
+                           'cloud-tools-staging',
+                      dest='next', action='store_true', default=False)
+    parser.add_option('-c', '--changelog-message',
+                      help='Changelog message to use.',
+                      dest='changelog', action='store')
+    parser.add_option('-s', '--suffix',
+                      help='Backport suffix to use (default=~cloud0).',
+                      dest='suffix', action='store', default="~cloud0")
+    parser.add_option('-o', '--outdir',
+                      help='Directory to save source package',
+                      dest='out_dir', action='store', default=None)
+    parser.add_option('-y', '--yes', help='Assume yes to any prompt.',
+                      dest='assume_yes', action='store_true', default=False)
+    (opts, args) = parser.parse_args()
+
+    if len(args) == 0:
+        parser.print_usage()
+        sys.exit(1)
+    else:
+        packages = args
+
+    chlog_dist = SERIES
+    changes_dist = SERIES
+    if opts.next:
+        ubuntu_series = UBUNTU_DEV
+        target_ppa = 'cloud-tools-next'
+    else:
+        ubuntu_series = UBUNTU_STABLE
+        target_ppa = 'cloud-tools-staging'
+
+    for package in args:
+        Logger.normal('Backporting %s from %s to %s.',
+                      package, ubuntu_series, target_ppa)
+        do_explicit_backport(package, ubuntu_series, target_ppa, chlog_dist,
+                             changes_dist=SERIES, message=opts.changelog,
+                             suffix=opts.suffix, out_dir=opts.out_dir,
+                             assume_yes=opts.assume_yes)
 
=== modified file 'cloudarchive/backport.py'
--- cloudarchive/backport.py	2013-08-28 18:42:45 +0000
+++ cloudarchive/backport.py	2013-09-16 19:00:42 +0000
@@ -32,6 +32,23 @@
 def do_backport(package, release, message=None, suffix="~cloud0",
                 out_dir=None, assume_yes=False):
 
+    ubuntu_series = SOURCE_RELEASE[release]
+    os_series = release
+    check_ppa = "{}-staging".format(os_series)
+    chlog_dist = '{}-{}'.format(SERIES, os_series)
+
+    return do_explicit_backport(package, ubuntu_series=ubuntu_series,
+                                check_ppa=check_ppa, chlog_dist=chlog_dist,
+                                changes_dist=SERIES, message=message,
+                                suffix=suffix, out_dir=out_dir,
+                                assume_yes=assume_yes)
+
+
+def do_explicit_backport(package, ubuntu_series, check_ppa, chlog_dist,
+                         changes_dist=SERIES,
+                         message=None, suffix="~cloud0", out_dir=None,
+                         assume_yes=False):
+
     if not out_dir:
         out_dir = os.getcwd()
     else:
@@ -42,20 +59,20 @@
 
     archive = Distribution('ubuntu').getArchive()
     Logger.normal('Looking for package %s in %s',
-                  package, SOURCE_RELEASE[release])
+                  package, ubuntu_series)
 
     pkgs = []
     for pocket in ['Security', 'Release', 'Updates']:
         try:
-            pkg = archive.getSourcePackage(
-                package, SOURCE_RELEASE[release], pocket=pocket)
+            pkg = archive.getSourcePackage(package, ubuntu_series,
+                                           pocket=pocket)
             pkgs.append(pkg)
         except PackageNotFoundException:
             pass
 
     if not pkgs:
         raise CABackportException("Unable to find source package %s in %s",
-                                  package, SOURCE_RELEASE[release])
+                                  package, ubuntu_series)
 
     # find the most recent upload in all pockets.
     pkgs = sorted(pkgs, cmp=version_compare,
@@ -68,9 +85,9 @@
     Logger.normal('Backporting from %s.' % spph.getSeriesAndPocket())
     Logger.normal('Version: %s', version)
 
-    old_version = utils.get_package_version(package, release)
+    old_version = utils.get_package_version(package, ppa=check_ppa)
     Logger.normal('Existing version for %s in %s Cloud Archive: %s',
-                  package, release, old_version)
+                  package, ubuntu_series, old_version)
     if not old_version:
         old_version = "0"
     new_version = '{}{}'.format(version, suffix)
@@ -81,7 +98,7 @@
 
     out_dir = os.path.join(out_dir, '{}-{}'.format(package, new_version))
 
-    dirname = '{}-{}'.format(package, SOURCE_RELEASE[release])
+    dirname = '{}-{}'.format(package, ubuntu_series)
     dirname = os.path.join(out_dir, dirname)
 
     for d in [out_dir, dirname]:
@@ -119,7 +136,7 @@
         '--newversion', new_version,
         '--force-bad-version',
         '--preserve',
-        '--distribution', '{}-{}'.format(SERIES, release),
+        '--distribution', chlog_dist,
         '--force-distribution', message
     ]
     check_call(cmd, cwd=dirname)
@@ -128,8 +145,9 @@
         'debuild', '--no-lintian',
         '-S', '-sa', '-nc', '-uc', '-us',
         '-v{}'.format(previous_version),
-        '--changes-option=-DDistribution={}'.format(SERIES)
+        '--changes-option=-DDistribution={}'.format(changes_dist)
     ]
+
     if version_compare(upstream_version(version),
                        upstream_version(old_version)) == 1:
         cmd.append('-sa')
 
=== modified file 'cloudarchive/common.py'
--- cloudarchive/common.py	2013-07-01 20:47:20 +0000
+++ cloudarchive/common.py	2013-09-16 19:00:42 +0000
@@ -27,6 +27,14 @@
     "havana": "saucy"
 }
 
+UBUNTU_SERIES = [
+    'raring',
+    'saucy',
+]
+
+UBUNTU_DEV = UBUNTU_SERIES[-1]
+UBUNTU_STABLE = UBUNTU_SERIES[-2]
+
 LTS_SERIES = {
     'precise': ['essex', 'folsom', 'grizzly', 'havana', 'icehouse']
 }
 
=== modified file 'cloudarchive/dput/scripts.py'
--- cloudarchive/dput/scripts.py	2013-06-20 13:02:22 +0000
+++ cloudarchive/dput/scripts.py	2013-09-16 19:00:42 +0000
@@ -39,6 +39,7 @@
     else:
         logger.info('OK: Upload is targetting Ubuntu: %s.', distribution)
 
+    logger.info("profile: %s", profile)
     openstack_target = changes.get("Changes").split()[2]\
         .strip(';').split('-')[-1]
     upload_target = profile['incoming'].split('/')[-1].split('-')[0]
 
=== modified file 'cloudarchive/utils.py'
--- cloudarchive/utils.py	2013-08-21 01:23:49 +0000
+++ cloudarchive/utils.py	2013-09-16 19:00:42 +0000
@@ -3,6 +3,7 @@
 
 from apt_pkg import version_compare
 
+from ubuntutools.logger import Logger
 from common import SERIES, SOURCE_RELEASE, LTS_SERIES
 
 from ubuntutools.lp.lpapicache import (Launchpad, Distribution,
@@ -32,6 +33,8 @@
                  release=SERIES):
     ''' Query a PPA for source packages and versions '''
     get_lp()
+    Logger.normal("query_ca_ppa: checking ppa=%s, release=%s, owner=%s",
+                  ppa, release, owner)
     ppa = Launchpad.people[owner].getPPAByName(name=ppa)
     distro = ppa.distribution.getSeries(name_or_version=release)
     out = {}
@@ -61,13 +64,17 @@
     return pkgs[0].getVersion()
 
 
-def get_package_version(package, os_series="folsom"):
+def get_package_version(package, os_series="folsom", ppa=None):
     ''' Retrieve the version of package from the staging PPA for os_series '''
-    source_versions = query_ca_ppa(ppa="{}-staging".format(os_series),
-                                   release=SERIES)
+    if ppa is None:
+        ppa = "{}-staging".format(os_series)
+    
+    source_versions = query_ca_ppa(ppa=ppa, release=SERIES)
+
     if package in source_versions:
         return source_versions[package]
     else:
+        Logger.normal("quering distro for %s", package)
         return query_distro(package)
 
 
 
=== added file 'dput.d/profiles/cact.json'
--- dput.d/profiles/cact.json	1970-01-01 00:00:00 +0000
+++ dput.d/profiles/cact.json	2013-09-16 19:00:42 +0000
@@ -0,0 +1,10 @@
+{
+    "meta": "ubuntu",
+    "fqdn": "ppa.launchpad.net",
+    "incoming": "~ubuntu-cloud-archive/cloud-tools-%(cact)s",
+    "+hooks": [
+    ],
+    "-hooks": [
+        "suite-mismatch"
+    ]
+}