Update amulet test definitions for Newton

- Remove Precise-Icehouse Amulet test definitions if they exist.

- Add Xenial-Newton Amulet test definitions.

- Add Yakkety-Newton Amulet test definitions.

- Use the percona-cluster charm in tests instead of the mysql charm.

Change-Id: Ie29ee6af6b255ac1a1ac15f666b9d1b3ee9f3ee9

hooks/charmhelpers/contrib/openstack/utils.py

@@ -229,6 +229,7 @@ GIT_DEFAULT_REPOS = {
 GIT_DEFAULT_BRANCHES = {
     'liberty': 'stable/liberty',
     'mitaka': 'stable/mitaka',
+    'newton': 'stable/newton',
     'master': 'master',
 }
 
@@ -735,12 +736,12 @@ def git_os_codename_install_source(projects_yaml):
 
         if projects in GIT_DEFAULT_BRANCHES.keys():
             if projects == 'master':
-                return 'newton'
+                return 'ocata'
             return projects
 
         if 'release' in projects:
             if projects['release'] == 'master':
-                return 'newton'
+                return 'ocata'
             return projects['release']
 
     return None

tests/basic_deployment.py

@@ -34,6 +34,7 @@ class CephBasicDeployment(OpenStackAmuletDeployment):
         self._auto_wait_for_status(exclude_services=exclude_services)
 
         self._configure_proxy()
+        self.d.sentry.wait()
         self._initialize_tests()
         self._auto_wait_for_status()
 

tests/charmhelpers/contrib/openstack/amulet/deployment.py

@@ -156,7 +156,7 @@ class OpenStackAmuletDeployment(AmuletDeployment):
         use_source = list(set(
             use_source + ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
                           'ceph-osd', 'ceph-radosgw', 'ceph-mon',
-                          'ceph-proxy']))
+                          'ceph-proxy', 'percona-cluster', 'lxd']))
 
         # Charms which can not use openstack-origin, ie. many subordinates
         no_origin = list(set(

tests/charmhelpers/contrib/openstack/amulet/utils.py

@@ -306,10 +306,8 @@ class OpenStackAmuletUtils(AmuletUtils):
                                   password, tenant):
         """Authenticates admin user with cinder."""
         # NOTE(beisner): cinder python client doesn't accept tokens.
-        service_ip = \
-            keystone_sentry.relation('shared-db',
-                                     'mysql:shared-db')['private-address']
-        ept = "http://{}:5000/v2.0".format(service_ip.strip().decode('utf-8'))
+        keystone_ip = keystone_sentry.info['public-address']
+        ept = "http://{}:5000/v2.0".format(keystone_ip.strip().decode('utf-8'))
         return cinder_client.Client(username, password, tenant, ept)
 
     def authenticate_keystone_admin(self, keystone_sentry, user, password,
@@ -317,10 +315,9 @@ class OpenStackAmuletUtils(AmuletUtils):
                                     keystone_ip=None):
         """Authenticates admin user with the keystone admin endpoint."""
         self.log.debug('Authenticating keystone admin...')
-        unit = keystone_sentry
         if not keystone_ip:
-            keystone_ip = unit.relation('shared-db',
-                                        'mysql:shared-db')['private-address']
+            keystone_ip = keystone_sentry.info['public-address']
+
         base_ep = "http://{}:35357".format(keystone_ip.strip().decode('utf-8'))
         if not api_version or api_version == 2:
             ep = base_ep + "/v2.0"

tests/gate-basic-precise-icehouse

@@ -1,11 +0,0 @@
-#!/usr/bin/python
-
-"""Amulet tests on a basic ceph deployment on precise-icehouse."""
-
-from basic_deployment import CephBasicDeployment
-
-if __name__ == '__main__':
-    deployment = CephBasicDeployment(series='precise',
-                                     openstack='cloud:precise-icehouse',
-                                     source='cloud:precise-updates/icehouse')
-    deployment.run_tests()

tests/gate-basic-trusty-juno

@@ -1,11 +0,0 @@
-#!/usr/bin/python
-
-"""Amulet tests on a basic ceph deployment on trusty-juno."""
-
-from basic_deployment import CephBasicDeployment
-
-if __name__ == '__main__':
-    deployment = CephBasicDeployment(series='trusty',
-                                     openstack='cloud:trusty-juno',
-                                     source='cloud:trusty-updates/juno')
-    deployment.run_tests()

tests/gate-basic-xenial-newton

@@ -0,0 +1,11 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic ceph deployment on xenial-newton."""
+
+from basic_deployment import CephBasicDeployment
+
+if __name__ == '__main__':
+    deployment = CephBasicDeployment(series='xenial',
+                                     openstack='cloud:xenial-newton',
+                                     source='cloud:xenial-updates/newton')
+    deployment.run_tests()

tests/gate-basic-yakkety-newton

@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic ceph deployment on yakkety-newton."""
+
+from basic_deployment import CephBasicDeployment
+
+if __name__ == '__main__':
+    deployment = CephBasicDeployment(series='yakkety')
+    deployment.run_tests()

tests/tests.yaml

@@ -1,6 +1,6 @@
 # Bootstrap the model if necessary.
 bootstrap: True
-# Re-use bootstrap node instead of destroying/re-bootstrapping.
+# Re-use bootstrap node.
 reset: True
 # Use tox/requirements to drive the venv instead of bundletester's venv feature.
 virtualenv: False