Merge lp:~corey.bryant/charm-helpers/enable-next-branches into lp:charm-helpers

[Corey Bryant]

OpenStack amulet tests are currently broken for the dev branches. This is because we are mixing next branch (the current branch that is being tested) with stable branches (all other charms are branched from the charm store). This patch fixes that.

[lp:~corey.bryant/charm-helpers/enable-next-branches]

215. By Corey Bryant on 2014-09-23

Allow branch locations to be specified for amulet tests. Also enable testing of
openstack dev branches.

216. By Corey Bryant on 2014-09-24

Extend timeout limit for amulet deployment.

[Liam Young (gnuoy)]

A few comments inline

review: Needs Fixing

[Corey Bryant (corey.bryant)]

Hey Liam, thanks for reviewing. A few responses below.

[Corey Bryant (corey.bryant)]

1 more response inline.

[Liam Young (gnuoy)]

approve.

[lp:~corey.bryant/charm-helpers/enable-next-branches]

217. By Corey Bryant on 2014-09-25

Revert hard-coded setup() timeout limit for amulet deployment.
It can be specified via the juju test command line.

=== modified file 'charmhelpers/contrib/amulet/deployment.py'
--- charmhelpers/contrib/amulet/deployment.py	2014-07-29 17:58:27 +0000
+++ charmhelpers/contrib/amulet/deployment.py	2014-09-24 16:17:11 +0000
@@ -24,10 +24,10 @@
         """Add services.
 
            Add services to the deployment where this_service is the local charm
-           that we're focused on testing and other_services are the other
-           charms that come from the charm store.
+           that we're testing and other_services are the other services that
+           are being used in the amulet tests.
            """
-        name, units = range(2)
+        name, units, location = range(3)
 
         if this_service[name] != os.path.basename(os.getcwd()):
             s = this_service[name]
@@ -37,12 +37,13 @@
         self.d.add(this_service[name], units=this_service[units])
 
         for svc in other_services:
-            if self.series:
-                self.d.add(svc[name],
-                           charm='cs:{}/{}'.format(self.series, svc[name]),
-                           units=svc[units])
+            if len(svc) > 2:
+                branch_location = svc[location]
+            elif self.series:
+                branch_location = 'cs:{}/{}'.format(self.series, svc[name]),
             else:
-                self.d.add(svc[name], units=svc[units])
+                branch_location = None
+            self.d.add(svc[name], charm=branch_location, units=svc[units])
 
     def _add_relations(self, relations):
         """Add all of the relations for the services."""
@@ -57,7 +58,7 @@
     def _deploy(self):
         """Deploy environment and wait for all hooks to finish executing."""
         try:
-            self.d.setup()
+            self.d.setup(timeout=900)
             self.d.sentry.wait(timeout=900)
         except amulet.helpers.TimeoutError:
             amulet.raise_status(amulet.FAIL, msg="Deployment timed out")
 
=== modified file 'charmhelpers/contrib/openstack/amulet/deployment.py'
--- charmhelpers/contrib/openstack/amulet/deployment.py	2014-07-29 17:58:27 +0000
+++ charmhelpers/contrib/openstack/amulet/deployment.py	2014-09-24 16:17:11 +0000
@@ -1,3 +1,6 @@
+from bzrlib.branch import Branch
+import os
+import re
 from charmhelpers.contrib.amulet.deployment import (
     AmuletDeployment
 )
@@ -16,11 +19,41 @@
         self.openstack = openstack
         self.source = source
 
+    def _is_dev_branch(self):
+        """Determine if branch being tested is a dev (i.e. next) branch."""
+        branch = Branch.open(os.getcwd())
+        parent = branch.get_parent()
+        pattern = re.compile("^.*/next/$")
+        if (pattern.match(parent)):
+            return True
+        else:
+            return False
+
+    def _determine_branch_locations(self, other_services):
+        """Determine the branch locations for the other services.
+
+           If the branch being tested is a dev branch, then determine the
+           development branch locations for the other services. Otherwise,
+           the default charm store branches will be used."""
+        name = 0
+        if self._is_dev_branch():
+            updated_services = []
+            for svc in other_services:
+                if svc[name] in ['mysql', 'mongodb', 'rabbitmq-server']:
+                    location = 'lp:charms/{}'.format(svc[name])
+                else:
+                    temp = 'lp:~openstack-charmers/charms/trusty/{}/next'
+                    location = temp.format(svc[name])
+                updated_services.append(svc + (location,))
+            other_services = updated_services
+        return other_services
+
     def _add_services(self, this_service, other_services):
-        """Add services to the deployment and set openstack-origin."""
+        """Add services to the deployment and set openstack-origin/source."""
+        name = 0
+        other_services = self._determine_branch_locations(other_services)
         super(OpenStackAmuletDeployment, self)._add_services(this_service,
                                                              other_services)
-        name = 0
         services = other_services
         services.append(this_service)
         use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph']
 
=== modified file 'charmhelpers/contrib/openstack/amulet/utils.py'
--- charmhelpers/contrib/openstack/amulet/utils.py	2014-07-29 17:58:27 +0000
+++ charmhelpers/contrib/openstack/amulet/utils.py	2014-09-24 16:17:11 +0000
@@ -187,15 +187,16 @@
 
         f = opener.open("http://download.cirros-cloud.net/version/released")
         version = f.read().strip()
-        cirros_img = "tests/cirros-{}-x86_64-disk.img".format(version)
+        cirros_img = "cirros-{}-x86_64-disk.img".format(version)
+        local_path = os.path.join('tests', cirros_img)
 
-        if not os.path.exists(cirros_img):
+        if not os.path.exists(local_path):
             cirros_url = "http://{}/{}/{}".format("download.cirros-cloud.net",
                                                   version, cirros_img)
-            opener.retrieve(cirros_url, cirros_img)
+            opener.retrieve(cirros_url, local_path)
         f.close()
 
-        with open(cirros_img) as f:
+        with open(local_path) as f:
             image = glance.images.create(name=image_name, is_public=True,
                                          disk_format='qcow2',
                                          container_format='bare', data=f)