Merge lp:~1chb1n/charms/trusty/hacluster/next-amulet-update-15.12b into lp:~openstack-charmers/charms/trusty/hacluster/next

[Ryan Beisner]

Amulet tests: add and enable known-passing U:OS targets (all but systemd-based); enable debug/verbose on deployed services to improve failure troubleshooting.

Amulet tests: add and enable known-passing U:OS targets (all but systemd-based); enable debug/verbose on deployed services to improve failure troubleshooting.

I'd be all for landing this proposal as-is, for the improvements to the hacluster (& haproxy) test coverage. The systemd-based combo issues shall be addressed separately.

Vivid-Kilo and Wily-Liberty are not enabled due to:
https://bugs.launchpad.net/charms/+source/hacluster/+bug/1527403

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

charm_unit_test #14515 hacluster-next for 1chb1n mp280854
    UNIT OK: passed

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

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

charm_lint_check #15555 hacluster-next for 1chb1n mp280854
    LINT OK: passed

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

[lp:~1chb1n/charms/trusty/hacluster/next-amulet-update-15.12b]

67. By Ryan Beisner on 2015-12-17

amulet tests: disable W-L in this proposal, address separately

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

charm_lint_check #15556 hacluster-next for 1chb1n mp280854
    LINT OK: passed

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

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

charm_unit_test #14516 hacluster-next for 1chb1n mp280854
    UNIT OK: passed

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

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

charm_amulet_test #8326 hacluster-next for 1chb1n mp280854
    AMULET OK: passed

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

[David Ames (thedac)]

Agreed this can land now.

Merging.

review: Approve

=== added file 'tests/016-basic-trusty-juno'
--- tests/016-basic-trusty-juno	1970-01-01 00:00:00 +0000
+++ tests/016-basic-trusty-juno	2015-12-17 15:26:54 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic hacluster deployment on trusty-juno."""
+
+from basic_deployment import HAClusterBasicDeployment
+
+if __name__ == '__main__':
+    deployment = HAClusterBasicDeployment(series='trusty',
+                                         openstack='cloud:trusty-juno',
+                                         source='cloud:trusty-updates/juno')
+    deployment.run_tests()
 
=== added file 'tests/017-basic-trusty-kilo'
--- tests/017-basic-trusty-kilo	1970-01-01 00:00:00 +0000
+++ tests/017-basic-trusty-kilo	2015-12-17 15:26:54 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic hacluster deployment on trusty-kilo."""
+
+from basic_deployment import HAClusterBasicDeployment
+
+if __name__ == '__main__':
+    deployment = HAClusterBasicDeployment(series='trusty',
+                                         openstack='cloud:trusty-kilo',
+                                         source='cloud:trusty-updates/kilo')
+    deployment.run_tests()
 
=== added file 'tests/019-basic-vivid-kilo'
--- tests/019-basic-vivid-kilo	1970-01-01 00:00:00 +0000
+++ tests/019-basic-vivid-kilo	2015-12-17 15:26:54 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic hacluster deployment on vivid-kilo."""
+
+from basic_deployment import HAClusterBasicDeployment
+
+if __name__ == '__main__':
+    deployment = HAClusterBasicDeployment(series='vivid')
+    deployment.run_tests()
 
=== added file 'tests/020-basic-trusty-liberty'
--- tests/020-basic-trusty-liberty	1970-01-01 00:00:00 +0000
+++ tests/020-basic-trusty-liberty	2015-12-17 15:26:54 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic hacluster deployment on trusty-liberty."""
+
+from basic_deployment import HAClusterBasicDeployment
+
+if __name__ == '__main__':
+    deployment = HAClusterBasicDeployment(series='trusty',
+                                         openstack='cloud:trusty-liberty',
+                                         source='cloud:trusty-updates/liberty')
+    deployment.run_tests()
 
=== added file 'tests/021-basic-wily-liberty'
--- tests/021-basic-wily-liberty	1970-01-01 00:00:00 +0000
+++ tests/021-basic-wily-liberty	2015-12-17 15:26:54 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic hacluster deployment on wily-liberty."""
+
+from basic_deployment import HAClusterBasicDeployment
+
+if __name__ == '__main__':
+    deployment = HAClusterBasicDeployment(series='wily')
+    deployment.run_tests()
 
=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-12-16 15:18:35 +0000
+++ tests/basic_deployment.py	2015-12-17 15:26:54 +0000
@@ -58,9 +58,13 @@
     def _configure_services(self):
         keystone_config = {'admin-password': 'openstack',
                            'admin-token': 'ubuntutesting',
+                           'debug': 'true',
+                           'verbose': 'true',
                            'vip': self._vip}
         mysql_config = {'dataset-size': '50%'}
+        hacluster_config = {'debug': 'true'}
         configs = {'keystone': keystone_config,
+                   'hacluster': hacluster_config,
                    'mysql': mysql_config}
         super(HAClusterBasicDeployment, self)._configure_services(configs)