Merge lp:~marcoceppi/charms/trusty/mysql/fix-testing into lp:charms/trusty/mysql

[Marco Ceppi]

[Marco Ceppi (marcoceppi)]

This fixes testing for Charm CI, kicking off this merge to see what OSCI says about the change.

The majority of these patches need to land in the upstream charms, this is just a workaround until that happens.

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #9862 mysql for marcoceppi mp272261
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/9862/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #10680 mysql for marcoceppi mp272261
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/10680/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6719 mysql for marcoceppi mp272261
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 124
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12543146/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6719/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6737 mysql for marcoceppi mp272261
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6737/

[lp:~marcoceppi/charms/trusty/mysql/fix-testing]

150. By Marco Ceppi on 2015-09-24

vivid containers in Juju are broken atm

=== modified file 'hooks/common.py'
--- hooks/common.py	2015-02-25 17:10:21 +0000
+++ hooks/common.py	2015-09-24 21:29:04 +0000
@@ -95,7 +95,7 @@
         raise RuntimeError('Persistent storage contains old data. '
                            'Please investigate and migrate data manually '
                            'to: {}'.format(new_path))
-    os.chmod(new_path, 0700)
+    os.chmod(new_path, 0o700)
     if os.path.isdir('/etc/apparmor.d/local'):
         render('apparmor.j2', '/etc/apparmor.d/local/usr.sbin.mysqld',
                context={'path': os.path.join(new_path, '')})

=== removed file 'tests/019-basic-vivid-kilo'
--- tests/019-basic-vivid-kilo	2015-06-30 21:51:50 +0000
+++ tests/019-basic-vivid-kilo	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#!/usr/bin/python
-
-"""Amulet tests on a basic mysql deployment on vivid-kilo."""
-
-from basic_deployment import MySQLBasicDeployment
-
-if __name__ == '__main__':
-    deployment = MySQLBasicDeployment(series='vivid')
-    deployment.run_tests()

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-07-02 03:19:28 +0000
+++ tests/basic_deployment.py	2015-09-24 21:29:04 +0000
@@ -42,6 +42,8 @@
         other_services = [{'name': 'keystone'}]
         super(MySQLBasicDeployment, self)._add_services(this_service,
                                                         other_services)
+        self.d.expose('keystone')
+        self.d.expose('mysql')
 
     def _add_relations(self):
         """Add all of the relations for the services."""
@@ -62,9 +64,15 @@
     def _initialize_tests(self):
         """Perform final initialization before tests get run."""
         # Access the sentries for inspecting service units
-        self.mysql_sentry = self.d.sentry.unit['mysql/0']
-        self.keystone_sentry = self.d.sentry.unit['keystone/0']
+        self.mysql_sentry = self.d.sentry['mysql'][0]
+        self.keystone_sentry = self.d.sentry['keystone'][0]
 
+        self.keystone_sentry.run('open-port 5000')
+        self.keystone_sentry.run('open-port 35357')
+        self.keystone_sentry.run('open-port 8888')
+        self.keystone_sentry.run('open-port 35347')
+        self.keystone_sentry.run('open-port 4990')
+        self.mysql_sentry.run('open-port 3306')
         # Authenticate keystone admin
         self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
                                                       user='admin',
@@ -108,7 +116,7 @@
         unit = self.mysql_sentry
         relation = ['shared-db', 'keystone:shared-db']
         expected_data = {
-            'allowed_units': 'keystone/0',
+            'allowed_units': self.keystone_sentry.info['unit_name'],
             'private-address': u.valid_ip,
             'password': u.not_null,
             'db_host': u.valid_ip

=== added file 'tests/broken-on-local-019-basic-vivid-kilo'
--- tests/broken-on-local-019-basic-vivid-kilo	1970-01-01 00:00:00 +0000
+++ tests/broken-on-local-019-basic-vivid-kilo	2015-09-24 21:29:04 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic mysql deployment on vivid-kilo."""
+
+from basic_deployment import MySQLBasicDeployment
+
+if __name__ == '__main__':
+    deployment = MySQLBasicDeployment(series='vivid')
+    deployment.run_tests()

=== modified file 'tests/charmhelpers/contrib/openstack/amulet/utils.py'
--- tests/charmhelpers/contrib/openstack/amulet/utils.py	2015-06-30 21:55:14 +0000
+++ tests/charmhelpers/contrib/openstack/amulet/utils.py	2015-09-24 21:29:04 +0000
@@ -189,9 +189,7 @@
                                     tenant):
         """Authenticates admin user with the keystone admin endpoint."""
         self.log.debug('Authenticating keystone admin...')
-        unit = keystone_sentry
-        service_ip = unit.relation('shared-db',
-                                   'mysql:shared-db')['private-address']
+        service_ip = keystone_sentry.info['public-address']
         ep = "http://{}:35357/v2.0".format(service_ip.strip().decode('utf-8'))
         return keystone_client.Client(username=user, password=password,
                                       tenant_name=tenant, auth_url=ep)

=== added file 'tests/tests.yaml'
--- tests/tests.yaml	1970-01-01 00:00:00 +0000
+++ tests/tests.yaml	2015-09-24 21:29:04 +0000
@@ -0,0 +1,2 @@
+# tests: "0([0-9]+)-((setup|configs)|basic-(precise|trusty)-(icehouse|juno|kilo))"
+tests: "0*"