Merge lp:~ev/ubuntu-ci-services-itself/phase0-ppa into lp:ubuntu-ci-services-itself

[Evan]

- Bring charmhelpers into the rabbitmq-worker charm.
- Use PPA versions of the dependencies for the bsb, image builder, and test runner components.

This kills the remaining installs of pip packages to the production deployment. This ensures that if pypi goes down or the egg has a flaky install routine, we're still able to get through a deployment.

By using a "release" PPA, we ensure a predictable and reproducible environment by sticking to the same dependency versions unless we explicitly upload a new one.

- Bring charmhelpers into the rabbitmq-worker charm.
- Use PPA versions of the dependencies for the bsb, image builder, and test runner components.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:277
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~ev/ubuntu-ci-services-itself/phase0-ppa/+merge/208811/+edit-commit-message

http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/250/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/250/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:277
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/251/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/251/rebuild

review: Approve (continuous-integration)

[Andy Doan (doanac)]

makes me so happy.

NOTE: we have one pip dependency still lurking here:

 http://bazaar.launchpad.net/~ev/ubuntu-ci-services-itself/phase0-ppa/view/head:/charms/precise/restish/hooks/hooks.py#L93

but we can probably treat that in a separate MP

review: Approve

=== added file 'charms/precise/rabbitmq-worker/Makefile'
--- charms/precise/rabbitmq-worker/Makefile	1970-01-01 00:00:00 +0000
+++ charms/precise/rabbitmq-worker/Makefile	2014-02-28 14:19:37 +0000
@@ -0,0 +1,24 @@
+PWD := $(shell pwd)
+SOURCEDEPS_DIR ?= $(shell dirname $(PWD))/.sourcecode
+PYTHON := /usr/bin/env python
+CONFIGMANAGER := $(PWD)/bin/cm.py
+
+
+sourcedeps: $(PWD)/config-manager.txt clean
+	@echo Updating source dependencies...
+	@$(PYTHON) cm.py -c $(PWD)/config-manager.txt \
+		-p $(SOURCEDEPS_DIR) \
+		-t $(PWD)
+	@$(PYTHON) build/charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
+		-c charm-helpers.yaml \
+		-b build/charm-helpers \
+		-d hooks/charmhelpers
+	@echo Do not forget to commit the updated files if any.
+	#@cd $(PWD)/build/charm-helpers; \
+		#@$(PYTHON) setup.py install --install-purelib=$(PWD)/lib \
+			#--install-scripts=$(PWD)/lib/bin
+
+clean:
+	rm -fr hooks/charmhelpers build/charm-helpers ../.sourcecode
+
+.PHONY: sourcedeps

=== added directory 'charms/precise/rabbitmq-worker/build'
=== added file 'charms/precise/rabbitmq-worker/charm-helpers.yaml'
--- charms/precise/rabbitmq-worker/charm-helpers.yaml	1970-01-01 00:00:00 +0000
+++ charms/precise/rabbitmq-worker/charm-helpers.yaml	2014-02-28 14:19:37 +0000
@@ -0,0 +1,4 @@
+include:
+    - core
+    - fetch
+    - contrib.charmsupport

=== added file 'charms/precise/rabbitmq-worker/cm.py'
--- charms/precise/rabbitmq-worker/cm.py	1970-01-01 00:00:00 +0000
+++ charms/precise/rabbitmq-worker/cm.py	2014-02-28 14:19:37 +0000
@@ -0,0 +1,172 @@
+# Copyright 2014 Canonical Ltd. All rights reserved.
+
+import os
+import re
+import sys
+import errno
+import hashlib
+import subprocess
+import optparse
+import urllib
+
+from os import curdir
+from bzrlib.branch import Branch
+from bzrlib.plugin import load_plugins
+load_plugins()
+from bzrlib.plugins.launchpad import account as lp_account
+
+if 'GlobalConfig' in dir(lp_account):
+    from bzrlib.config import LocationConfig as LocationConfiguration
+    _ = LocationConfiguration
+else:
+    from bzrlib.config import LocationStack as LocationConfiguration
+    _ = LocationConfiguration
+
+
+def get_ubunet_branch_config(config_file):
+    """
+    Retrieves the sourcedeps configuration for an ubunet source dir.
+    Returns a dict of (branch, revspec) tuples, keyed by branch name.
+    """
+    branches = {}
+    with open(config_file, 'r') as stream:
+        for line in stream:
+            line = line.split('#')[0].strip()
+            match = re.match(r'(\S+)\s+'
+                             'bzr\+ssh://([^/]+)/([^;]+)'
+                             '(?:;revno=(\d+))?', line)
+            if match:
+                name, host, branch, revno = match.group(1, 2, 3, 4)
+                if revno is None:
+                    revspec = "-1"
+                else:
+                    revspec = revno
+                branches[name] = (host, branch, revspec)
+    return branches
+
+
+def main(config_file, parent_dir, target_dir, verbose):
+    """Do the deed."""
+
+    try:
+        os.makedirs(parent_dir)
+    except OSError, e:
+        if e.errno != errno.EEXIST:
+            raise
+
+    bzr_config = LocationConfiguration(parent_dir)
+    get_lp_login = lp_account.get_lp_login
+    username = get_lp_login(bzr_config) or get_lp_login()
+    if username is None:
+        raise RuntimeError("Unable to determine launchpad login")
+    quoted_username = urllib.quote(username)
+
+    branches = sorted(get_ubunet_branch_config(config_file).iteritems())
+    for branch_name, (host, quoted_branch_spec, revspec) in branches:
+        revno = int(revspec)
+
+        # qualify mirror branch name with hash of remote repo path to deal
+        # with changes to the remote branch URL over time
+        branch_spec_digest = hashlib.sha1(quoted_branch_spec).hexdigest()
+        branch_directory = branch_spec_digest
+
+        source_path = os.path.join(parent_dir, branch_directory)
+        destination_path = os.path.join(target_dir, branch_name)
+
+        # Remove leftover symlinks/stray files.
+        try:
+            os.remove(destination_path)
+        except OSError, e:
+            if e.errno != errno.EISDIR and e.errno != errno.ENOENT:
+                raise
+
+        branch_url = ("bzr+ssh://%s@%s/%s" %
+                      (quoted_username, host, quoted_branch_spec))
+        lp_url = "lp:" + quoted_branch_spec.replace("+branch/", "")
+
+        # Create the local mirror branch if it doesn't already exist
+        if verbose:
+            sys.stderr.write('%30s: ' % (branch_name,))
+            sys.stderr.flush()
+
+        fresh = False
+        if not os.path.exists(source_path):
+            subprocess.check_call(['bzr', 'branch', '-q',
+                                   '--', branch_url, source_path])
+            fresh = True
+
+        source_branch = Branch.open(source_path)
+
+        # Freshen the source branch if required (-1 means we want tip).
+        if not fresh and (revno == -1 or revno > source_branch.revno()):
+            subprocess.check_call(['bzr', 'pull', '-q', '--overwrite', '-r',
+                                   str(revno), '-d', source_path,
+                                   '--', branch_url])
+
+        if os.path.exists(destination_path):
+            # Overwrite the destination with the appropriate revision.
+            subprocess.check_call(['bzr', 'clean-tree', '--force', '-q',
+                                   '--ignored', '-d', destination_path])
+            subprocess.check_call(['bzr', 'pull', '-q', '--overwrite',
+                                   '-r', str(revno),
+                                   '-d', destination_path, '--', source_path])
+        else:
+            # Create a new branch.
+            subprocess.check_call(['bzr', 'branch', '-q', '--hardlink',
+                                   '-r', str(revno),
+                                   '--', source_path, destination_path])
+
+        # Check the state of the destination branch.
+        destination_branch = Branch.open(destination_path)
+        destination_revno = destination_branch.revno()
+
+        if verbose:
+            sys.stderr.write('checked out %4s of %s\n' %
+                             ("r" + str(destination_revno), lp_url))
+            sys.stderr.flush()
+
+        if revno != -1 and destination_revno != revno:
+            raise RuntimeError("Expected revno %d but got revno %d" %
+                               (revno, destination_revno))
+
+if __name__ == '__main__':
+    parser = optparse.OptionParser(
+        usage="%prog [options]",
+        description=(
+            "Add a lightweight checkout in <target> for each "
+            "corresponding file in <parent>."),
+        add_help_option=False)
+    parser.add_option(
+        '-p', '--parent', dest='parent', default=None,
+        help=("The directory of the parent tree."),
+        metavar="DIR")
+    parser.add_option(
+        '-t', '--target', dest='target', default=curdir,
+        help=("The directory of the target tree."),
+        metavar="DIR")
+    parser.add_option(
+        '-c', '--config', dest='config', default=None,
+        help=("The config file to be used for config-manager."),
+        metavar="DIR")
+    parser.add_option(
+        '-q', '--quiet', dest='verbose', action='store_false',
+        help="Be less verbose.")
+    parser.add_option(
+        '-h', '--help', action='help',
+        help="Show this help message and exit.")
+    parser.set_defaults(verbose=True)
+
+    options, args = parser.parse_args()
+
+    if options.parent is None:
+        parser.error(
+            "Parent directory not specified.")
+
+    if options.target is None:
+        parser.error(
+            "Target directory not specified.")
+
+    sys.exit(main(config_file=options.config,
+                  parent_dir=options.parent,
+                  target_dir=options.target,
+                  verbose=options.verbose))

=== added file 'charms/precise/rabbitmq-worker/config-manager.txt'
--- charms/precise/rabbitmq-worker/config-manager.txt	1970-01-01 00:00:00 +0000
+++ charms/precise/rabbitmq-worker/config-manager.txt	2014-02-28 14:19:37 +0000
@@ -0,0 +1,5 @@
+# After making changes to this file, to ensure that the charm payload
+# is up-to-date do:
+#
+# make
+build/charm-helpers bzr+ssh://bazaar.launchpad.net/~charm-helpers/charm-helpers/devel;revno=99

=== modified file 'charms/precise/rabbitmq-worker/config.yaml'
--- charms/precise/rabbitmq-worker/config.yaml	2014-02-17 10:13:29 +0000
+++ charms/precise/rabbitmq-worker/config.yaml	2014-02-28 14:19:37 +0000
@@ -51,3 +51,28 @@
       type: string
       default: '/'
       description: The vhost in the rabbitMQ server.
+
+  # Apt
+  install_sources:
+      type: string
+      default: ""
+      description: |
+          YAML list of additional installation sources, as a string. The number
+          of install_sources must match the number of install_keys. For
+          example:
+            install_sources: |
+             - ppa:project1/ppa
+             - ppa:project2/ppa
+  install_keys:
+      type: string
+      default: ""
+      description: |
+          YAML list of GPG keys for installation sources, as a string. For apt
+          repository URLs, use the public key ID used to verify package
+          signatures. For other sources such as PPA, use empty string. This
+          list must have the same number of elements as install_sources, even
+          if the key items are all empty string. An example to go with the
+          above for install_sources:
+            install_keys: |
+             - ""
+             - ""

=== modified file 'charms/precise/rabbitmq-worker/hooks/hooks.py'
--- charms/precise/rabbitmq-worker/hooks/hooks.py	2014-02-17 10:13:29 +0000
+++ charms/precise/rabbitmq-worker/hooks/hooks.py	2014-02-28 14:19:37 +0000
@@ -7,6 +7,7 @@
 import subprocess
 import sys
 import textwrap
+import charmhelpers.fetch
 
 
 def juju_info(msg):
@@ -80,13 +81,15 @@
 
 
 def install(config):
+    charmhelpers.fetch.configure_sources(update=True)
+
     pkgs = [x for x in config.get('packages', '').split(' ') if x]
     pkgs.append('python-amqplib')
     pkgs.append('python-pip')
     pkgs.append('bzr')
 
     juju_info('installing apt packages...')
-    subprocess.check_call(['apt-get', 'install', '-y', '-q'] + pkgs)
+    charmhelpers.fetch.apt_install(pkgs)
 
     pip_pkgs = [x for x in config.get('pip-packages', '').split(' ') if x]
     if pip_pkgs:

=== modified file 'juju-deployer/branch-source-builder.yaml.tmpl'
--- juju-deployer/branch-source-builder.yaml.tmpl	2014-02-18 23:43:39 +0000
+++ juju-deployer/branch-source-builder.yaml.tmpl	2014-02-28 14:19:37 +0000
@@ -23,8 +23,11 @@
                 branch: ${CI_BRANCH}
                 tarball: ${CI_PAYLOAD_URL}
                 unit-config: include-base64://configs/unit_config.yaml
-                packages: dput
-                pip-packages: dput
+                packages: "dput python-dput"
+                install_sources: |
+                    - ${CI_PPA}
+                install_keys: |
+                    - ""
         rabbit:
             branch: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/rabbitmq-server@46
             charm: rabbitmq

=== modified file 'juju-deployer/image-builder.yaml.tmpl'
--- juju-deployer/image-builder.yaml.tmpl	2014-02-26 05:13:02 +0000
+++ juju-deployer/image-builder.yaml.tmpl	2014-02-28 14:19:37 +0000
@@ -23,10 +23,13 @@
                 vcs: ${CI_CODE_SOURCE}
                 branch: ${CI_BRANCH}
                 tarball: ${CI_PAYLOAD_URL}
-                packages: "qemu-utils"
-                pip-packages: "python-glanceclient python-swiftclient==1.8.0"
+                packages: "qemu-utils python-glanceclient python-swiftclient"
                 uid: root
                 unit-config: include-base64://configs/unit_config.yaml
+                install_sources: |
+                    - ${CI_PPA}
+                install_keys: |
+                    - ""
         rabbit:
             branch: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/rabbitmq-server@46
             charm: rabbitmq

=== modified file 'juju-deployer/test-runner.yaml.tmpl'
--- juju-deployer/test-runner.yaml.tmpl	2014-02-19 23:49:36 +0000
+++ juju-deployer/test-runner.yaml.tmpl	2014-02-28 14:19:37 +0000
@@ -30,10 +30,13 @@
                 vcs: ${CI_CODE_SOURCE}
                 branch: ${CI_BRANCH}
                 tarball: ${CI_PAYLOAD_URL}
-                packages: "python-requests"
-                pip-packages: "python-novaclient python-swiftclient==1.8.0"
+                packages: "python-requests python-novaclient python-swiftclient"
                 unit-config: include-base64://configs/unit_config.yaml
                 uid: root
+                install_sources: |
+                    - ${CI_PPA}
+                install_keys: |
+                    - ""
         rabbit:
             branch: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/rabbitmq-server@46
             charm: rabbitmq