Juju Charms Collection
glance package

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

  1. Trusty Tahr (14.04)
  2. next-amulet-debug-and-makefile
  3. Merge into next
Proposed by Liam Young
Status: Merged
Merged at revision: 108
Proposed branch: lp:~1chb1n/charms/trusty/glance/next-amulet-debug-and-makefile
Merge into: lp:~openstack-charmers-archive/charms/trusty/glance/next
Diff against target: 82 lines (+35/-4)
5 files modified
Makefile (+1/-4)
hooks/charmhelpers/contrib/openstack/context.py (+5/-0)
tests/017-basic-trusty-kilo (+11/-0)
tests/018-basic-utopic-juno (+9/-0)
tests/019-basic-vivid-kilo (+9/-0)
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/glance/next-amulet-debug-and-makefile
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+256690@code.launchpad.net

This proposal supersedes a proposal from 2015-04-16.

Description of the change

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

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

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

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

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

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

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

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

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

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2015-03-21 01:36:16 +0000
3+++ Makefile 2015-04-17 15:52:01 +0000
4@@ -26,10 +26,7 @@
5 # /!\ Note: The -v should only be temporary until Amulet sends
6 # raise_status() messages to stderr:
7 # https://bugs.launchpad.net/amulet/+bug/1320357
8- @juju test -v -p AMULET_HTTP_PROXY --timeout 900 \
9- 00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse \
10- 16-basic-trusty-icehouse-git 17-basic-trusty-juno \
11- 18-basic-trusty-juno-git
12+ @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
13
14 publish: lint unit_test
15 bzr push lp:charms/glance
16
17=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
18--- hooks/charmhelpers/contrib/openstack/context.py 2015-04-16 19:53:49 +0000
19+++ hooks/charmhelpers/contrib/openstack/context.py 2015-04-17 15:52:01 +0000
20@@ -459,6 +459,11 @@
21
22 ctxt['rabbitmq_hosts'] = ','.join(sorted(rabbitmq_hosts))
23
24+ oslo_messaging_flags = conf.get('oslo-messaging-flags', None)
25+ if oslo_messaging_flags:
26+ ctxt['oslo_messaging_flags'] = config_flags_parser(
27+ oslo_messaging_flags)
28+
29 if not context_complete(ctxt):
30 return {}
31
32
33=== renamed file 'tests/14-basic-precise-icehouse' => 'tests/014-basic-precise-icehouse'
34=== renamed file 'tests/15-basic-trusty-icehouse' => 'tests/015-basic-trusty-icehouse'
35=== renamed file 'tests/17-basic-trusty-juno' => 'tests/016-basic-trusty-juno'
36=== added file 'tests/017-basic-trusty-kilo'
37--- tests/017-basic-trusty-kilo 1970-01-01 00:00:00 +0000
38+++ tests/017-basic-trusty-kilo 2015-04-17 15:52:01 +0000
39@@ -0,0 +1,11 @@
40+#!/usr/bin/python
41+
42+"""Amulet tests on a basic glance deployment on trusty-kilo."""
43+
44+from basic_deployment import GlanceBasicDeployment
45+
46+if __name__ == '__main__':
47+ deployment = GlanceBasicDeployment(series='trusty',
48+ openstack='cloud:trusty-kilo',
49+ source='cloud:trusty-updates/kilo')
50+ deployment.run_tests()
51
52=== added file 'tests/018-basic-utopic-juno'
53--- tests/018-basic-utopic-juno 1970-01-01 00:00:00 +0000
54+++ tests/018-basic-utopic-juno 2015-04-17 15:52:01 +0000
55@@ -0,0 +1,9 @@
56+#!/usr/bin/python
57+
58+"""Amulet tests on a basic Glance deployment on utopic-juno."""
59+
60+from basic_deployment import GlanceBasicDeployment
61+
62+if __name__ == '__main__':
63+ deployment = GlanceBasicDeployment(series='utopic')
64+ deployment.run_tests()
65
66=== added file 'tests/019-basic-vivid-kilo'
67--- tests/019-basic-vivid-kilo 1970-01-01 00:00:00 +0000
68+++ tests/019-basic-vivid-kilo 2015-04-17 15:52:01 +0000
69@@ -0,0 +1,9 @@
70+#!/usr/bin/python
71+
72+"""Amulet tests on a basic Glance deployment on vivid-kilo."""
73+
74+from basic_deployment import GlanceBasicDeployment
75+
76+if __name__ == '__main__':
77+ deployment = GlanceBasicDeployment(series='vivid')
78+ deployment.run_tests()
79
80=== renamed file 'tests/16-basic-trusty-icehouse-git' => 'tests/050-basic-trusty-icehouse-git'
81=== renamed file 'tests/18-basic-trusty-juno-git' => 'tests/051-basic-trusty-juno-git'
82=== modified file 'tests/basic_deployment.py' (properties changed: +x to -x)

Subscribers

People subscribed via source and target branches