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

Proposed by Ryan Beisner
Status: Merged
Merged at revision: 61
Proposed branch: lp:~1chb1n/charms/trusty/hacluster/next-amulet-update-15.12b
Merge into: lp:~openstack-charmers/charms/trusty/hacluster/next
Diff against target: 92 lines (+55/-0)
6 files modified
tests/016-basic-trusty-juno (+11/-0)
tests/017-basic-trusty-kilo (+11/-0)
tests/019-basic-vivid-kilo (+9/-0)
tests/020-basic-trusty-liberty (+11/-0)
tests/021-basic-wily-liberty (+9/-0)
tests/basic_deployment.py (+4/-0)
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/hacluster/next-amulet-update-15.12b
Reviewer Review Type Date Requested Status
David Ames (community) Approve
Review via email: mp+280854@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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

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

67. By Ryan Beisner

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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

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

Revision history for this message
David Ames (thedac) wrote :

Agreed this can land now.

Merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'tests/016-basic-trusty-juno'
2--- tests/016-basic-trusty-juno 1970-01-01 00:00:00 +0000
3+++ tests/016-basic-trusty-juno 2015-12-17 15:26:54 +0000
4@@ -0,0 +1,11 @@
5+#!/usr/bin/python
6+
7+"""Amulet tests on a basic hacluster deployment on trusty-juno."""
8+
9+from basic_deployment import HAClusterBasicDeployment
10+
11+if __name__ == '__main__':
12+ deployment = HAClusterBasicDeployment(series='trusty',
13+ openstack='cloud:trusty-juno',
14+ source='cloud:trusty-updates/juno')
15+ deployment.run_tests()
16
17=== added file 'tests/017-basic-trusty-kilo'
18--- tests/017-basic-trusty-kilo 1970-01-01 00:00:00 +0000
19+++ tests/017-basic-trusty-kilo 2015-12-17 15:26:54 +0000
20@@ -0,0 +1,11 @@
21+#!/usr/bin/python
22+
23+"""Amulet tests on a basic hacluster deployment on trusty-kilo."""
24+
25+from basic_deployment import HAClusterBasicDeployment
26+
27+if __name__ == '__main__':
28+ deployment = HAClusterBasicDeployment(series='trusty',
29+ openstack='cloud:trusty-kilo',
30+ source='cloud:trusty-updates/kilo')
31+ deployment.run_tests()
32
33=== added file 'tests/019-basic-vivid-kilo'
34--- tests/019-basic-vivid-kilo 1970-01-01 00:00:00 +0000
35+++ tests/019-basic-vivid-kilo 2015-12-17 15:26:54 +0000
36@@ -0,0 +1,9 @@
37+#!/usr/bin/python
38+
39+"""Amulet tests on a basic hacluster deployment on vivid-kilo."""
40+
41+from basic_deployment import HAClusterBasicDeployment
42+
43+if __name__ == '__main__':
44+ deployment = HAClusterBasicDeployment(series='vivid')
45+ deployment.run_tests()
46
47=== added file 'tests/020-basic-trusty-liberty'
48--- tests/020-basic-trusty-liberty 1970-01-01 00:00:00 +0000
49+++ tests/020-basic-trusty-liberty 2015-12-17 15:26:54 +0000
50@@ -0,0 +1,11 @@
51+#!/usr/bin/python
52+
53+"""Amulet tests on a basic hacluster deployment on trusty-liberty."""
54+
55+from basic_deployment import HAClusterBasicDeployment
56+
57+if __name__ == '__main__':
58+ deployment = HAClusterBasicDeployment(series='trusty',
59+ openstack='cloud:trusty-liberty',
60+ source='cloud:trusty-updates/liberty')
61+ deployment.run_tests()
62
63=== added file 'tests/021-basic-wily-liberty'
64--- tests/021-basic-wily-liberty 1970-01-01 00:00:00 +0000
65+++ tests/021-basic-wily-liberty 2015-12-17 15:26:54 +0000
66@@ -0,0 +1,9 @@
67+#!/usr/bin/python
68+
69+"""Amulet tests on a basic hacluster deployment on wily-liberty."""
70+
71+from basic_deployment import HAClusterBasicDeployment
72+
73+if __name__ == '__main__':
74+ deployment = HAClusterBasicDeployment(series='wily')
75+ deployment.run_tests()
76
77=== modified file 'tests/basic_deployment.py'
78--- tests/basic_deployment.py 2015-12-16 15:18:35 +0000
79+++ tests/basic_deployment.py 2015-12-17 15:26:54 +0000
80@@ -58,9 +58,13 @@
81 def _configure_services(self):
82 keystone_config = {'admin-password': 'openstack',
83 'admin-token': 'ubuntutesting',
84+ 'debug': 'true',
85+ 'verbose': 'true',
86 'vip': self._vip}
87 mysql_config = {'dataset-size': '50%'}
88+ hacluster_config = {'debug': 'true'}
89 configs = {'keystone': keystone_config,
90+ 'hacluster': hacluster_config,
91 'mysql': mysql_config}
92 super(HAClusterBasicDeployment, self)._configure_services(configs)
93

Subscribers

People subscribed via source and target branches