Merge lp:~1chb1n/charms/trusty/glance/next-amulet-debug-and-makefile into lp:~openstack-charmers-archive/charms/trusty/glance/next

[Liam Young]

auto normalize amulet test definitions and amulet make targets; charm-helper sync.

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

charm_lint_check #3538 glance for 1chb1n mp256581
    LINT OK: passed

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

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

charm_unit_test #3326 glance for 1chb1n mp256581
    UNIT OK: passed

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

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

charm_amulet_test #3293 glance for 1chb1n mp256581
    AMULET FAIL: amulet-test failed

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

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

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

charm_lint_check #3577 glance for 1chb1n mp256581
    LINT OK: passed

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

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

charm_unit_test #3365 glance for 1chb1n mp256581
    UNIT OK: passed

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

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

charm_amulet_test #3334 glance for 1chb1n mp256581
    AMULET OK: passed

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

=== modified file 'Makefile'
--- Makefile	2015-03-21 01:36:16 +0000
+++ Makefile	2015-04-17 15:52:01 +0000
@@ -26,10 +26,7 @@
 	# /!\ Note: The -v should only be temporary until Amulet sends
 	# raise_status() messages to stderr:
 	#   https://bugs.launchpad.net/amulet/+bug/1320357
-	@juju test -v -p AMULET_HTTP_PROXY --timeout 900 \
-        00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse \
-        16-basic-trusty-icehouse-git 17-basic-trusty-juno \
-        18-basic-trusty-juno-git
+	@juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
 
 publish: lint unit_test
 	bzr push lp:charms/glance
 
=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2015-04-16 19:53:49 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-04-17 15:52:01 +0000
@@ -459,6 +459,11 @@
 
                 ctxt['rabbitmq_hosts'] = ','.join(sorted(rabbitmq_hosts))
 
+        oslo_messaging_flags = conf.get('oslo-messaging-flags', None)
+        if oslo_messaging_flags:
+            ctxt['oslo_messaging_flags'] = config_flags_parser(
+                oslo_messaging_flags)
+
         if not context_complete(ctxt):
             return {}
 
 
=== renamed file 'tests/14-basic-precise-icehouse' => 'tests/014-basic-precise-icehouse'
=== renamed file 'tests/15-basic-trusty-icehouse' => 'tests/015-basic-trusty-icehouse'
=== renamed file 'tests/17-basic-trusty-juno' => 'tests/016-basic-trusty-juno'
=== 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-04-17 15:52:01 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic glance deployment on trusty-kilo."""
+
+from basic_deployment import GlanceBasicDeployment
+
+if __name__ == '__main__':
+    deployment = GlanceBasicDeployment(series='trusty',
+                                         openstack='cloud:trusty-kilo',
+                                         source='cloud:trusty-updates/kilo')
+    deployment.run_tests()
 
=== added file 'tests/018-basic-utopic-juno'
--- tests/018-basic-utopic-juno	1970-01-01 00:00:00 +0000
+++ tests/018-basic-utopic-juno	2015-04-17 15:52:01 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic Glance deployment on utopic-juno."""
+
+from basic_deployment import GlanceBasicDeployment
+
+if __name__ == '__main__':
+    deployment = GlanceBasicDeployment(series='utopic')
+    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-04-17 15:52:01 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic Glance deployment on vivid-kilo."""
+
+from basic_deployment import GlanceBasicDeployment
+
+if __name__ == '__main__':
+    deployment = GlanceBasicDeployment(series='vivid')
+    deployment.run_tests()
 
=== renamed file 'tests/16-basic-trusty-icehouse-git' => 'tests/050-basic-trusty-icehouse-git'
=== renamed file 'tests/18-basic-trusty-juno-git' => 'tests/051-basic-trusty-juno-git'
=== modified file 'tests/basic_deployment.py' (properties changed: +x to -x)