Juju Charms Collection
nova-cloud-controller package

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

  1. Trusty Tahr (14.04)
  2. next-amulet-debug-and-makefile
  3. Merge into next
Proposed by Ryan Beisner
Status: Merged
Merged at revision: 156
Proposed branch: lp:~1chb1n/charms/trusty/nova-cloud-controller/next-amulet-debug-and-makefile
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 228 lines (+64/-49)
12 files modified
Makefile (+1/-2)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+5/-2)
hooks/charmhelpers/contrib/openstack/context.py (+5/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+4/-1)
tests/016-basic-trusty-juno (+12/-0)
tests/017-basic-trusty-kilo (+12/-0)
tests/018-basic-utopic-juno (+10/-0)
tests/019-basic-vivid-kilo (+10/-0)
tests/11-basic-precise-folsom (+0/-18)
tests/12-basic-precise-grizzly (+0/-12)
tests/13-basic-precise-havana (+0/-12)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+5/-2)
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/nova-cloud-controller/next-amulet-debug-and-makefile
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+256577@code.launchpad.net

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 :

charm_lint_check #3534 nova-cloud-controller-next for 1chb1n mp256577
    LINT OK: passed

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

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

charm_unit_test #3322 nova-cloud-controller-next for 1chb1n mp256577
    UNIT OK: passed

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

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

charm_amulet_test #3289 nova-cloud-controller-next for 1chb1n mp256577
    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/10836259/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3289/

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

charm_lint_check #3573 nova-cloud-controller-next for 1chb1n mp256577
    LINT OK: passed

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

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

charm_unit_test #3361 nova-cloud-controller-next for 1chb1n mp256577
    UNIT OK: passed

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

Revision history for this message
Liam Young (gnuoy) wrote :

Approve

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

charm_amulet_test #3330 nova-cloud-controller-next for 1chb1n mp256577
    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/10839314/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3330/

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

charm_amulet_test #3358 nova-cloud-controller-next for 1chb1n mp256577
    AMULET OK: passed

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2014-09-29 21:03:48 +0000
+++ Makefile 2015-04-16 21:46:13 +0000
@@ -18,8 +18,7 @@
18 # coreycb note: The -v should only be temporary until Amulet sends18 # coreycb note: The -v should only be temporary until Amulet sends
19 # raise_status() messages to stderr:19 # raise_status() messages to stderr:
20 # https://bugs.launchpad.net/amulet/+bug/132035720 # https://bugs.launchpad.net/amulet/+bug/1320357
21 @juju test -v -p AMULET_HTTP_PROXY --timeout 900 \21 @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
22 00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse
2322
24sync: bin/charm_helpers_sync.py23sync: bin/charm_helpers_sync.py
25 @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml24 @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
2625
=== modified file 'hooks/charmhelpers/contrib/openstack/amulet/deployment.py'
--- hooks/charmhelpers/contrib/openstack/amulet/deployment.py 2015-04-16 10:25:41 +0000
+++ hooks/charmhelpers/contrib/openstack/amulet/deployment.py 2015-04-16 21:46:13 +0000
@@ -101,7 +101,8 @@
101 """101 """
102 (self.precise_essex, self.precise_folsom, self.precise_grizzly,102 (self.precise_essex, self.precise_folsom, self.precise_grizzly,
103 self.precise_havana, self.precise_icehouse,103 self.precise_havana, self.precise_icehouse,
104 self.trusty_icehouse, self.trusty_juno, self.trusty_kilo) = range(8)104 self.trusty_icehouse, self.trusty_juno, self.trusty_kilo,
105 self.utopic_juno, self.vivid_kilo) = range(10)
105 releases = {106 releases = {
106 ('precise', None): self.precise_essex,107 ('precise', None): self.precise_essex,
107 ('precise', 'cloud:precise-folsom'): self.precise_folsom,108 ('precise', 'cloud:precise-folsom'): self.precise_folsom,
@@ -110,7 +111,9 @@
110 ('precise', 'cloud:precise-icehouse'): self.precise_icehouse,111 ('precise', 'cloud:precise-icehouse'): self.precise_icehouse,
111 ('trusty', None): self.trusty_icehouse,112 ('trusty', None): self.trusty_icehouse,
112 ('trusty', 'cloud:trusty-juno'): self.trusty_juno,113 ('trusty', 'cloud:trusty-juno'): self.trusty_juno,
113 ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo}114 ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo,
115 ('utopic', None): self.utopic_juno,
116 ('vivid', None): self.vivid_kilo}
114 return releases[(self.series, self.openstack)]117 return releases[(self.series, self.openstack)]
115118
116 def _get_openstack_release_string(self):119 def _get_openstack_release_string(self):
117120
=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py 2015-04-13 08:51:41 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py 2015-04-16 21:46:13 +0000
@@ -459,6 +459,11 @@
459459
460 ctxt['rabbitmq_hosts'] = ','.join(sorted(rabbitmq_hosts))460 ctxt['rabbitmq_hosts'] = ','.join(sorted(rabbitmq_hosts))
461461
462 oslo_messaging_flags = conf.get('oslo-messaging-flags', None)
463 if oslo_messaging_flags:
464 ctxt['oslo_messaging_flags'] = config_flags_parser(
465 oslo_messaging_flags)
466
462 if not context_complete(ctxt):467 if not context_complete(ctxt):
463 return {}468 return {}
464469
465470
=== modified file 'hooks/charmhelpers/contrib/openstack/utils.py'
--- hooks/charmhelpers/contrib/openstack/utils.py 2015-04-13 08:51:41 +0000
+++ hooks/charmhelpers/contrib/openstack/utils.py 2015-04-16 21:46:13 +0000
@@ -524,9 +524,10 @@
524 projects = yaml.load(projects_yaml)524 projects = yaml.load(projects_yaml)
525 _git_validate_projects_yaml(projects, core_project)525 _git_validate_projects_yaml(projects, core_project)
526526
527 old_environ = dict(os.environ)
528
527 if 'http_proxy' in projects.keys():529 if 'http_proxy' in projects.keys():
528 os.environ['http_proxy'] = projects['http_proxy']530 os.environ['http_proxy'] = projects['http_proxy']
529
530 if 'https_proxy' in projects.keys():531 if 'https_proxy' in projects.keys():
531 os.environ['https_proxy'] = projects['https_proxy']532 os.environ['https_proxy'] = projects['https_proxy']
532533
@@ -544,6 +545,8 @@
544 repo_dir = _git_clone_and_install_single(repo, branch, parent_dir,545 repo_dir = _git_clone_and_install_single(repo, branch, parent_dir,
545 update_requirements=True)546 update_requirements=True)
546547
548 os.environ = old_environ
549
547550
548def _git_validate_projects_yaml(projects, core_project):551def _git_validate_projects_yaml(projects, core_project):
549 """552 """
550553
=== renamed file 'tests/10-basic-precise-essex' => 'tests/010-basic-precise-essex'
=== renamed file 'tests/14-basic-precise-icehouse' => 'tests/014-basic-precise-icehouse'
=== renamed file 'tests/15-basic-trusty-icehouse' => 'tests/015-basic-trusty-icehouse'
=== 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-04-16 21:46:13 +0000
@@ -0,0 +1,12 @@
1#!/usr/bin/python
2
3"""Amulet tests on a basic nova cloud controller deployment on
4 trusty-juno."""
5
6from basic_deployment import NovaCCBasicDeployment
7
8if __name__ == '__main__':
9 deployment = NovaCCBasicDeployment(series='trusty',
10 openstack='cloud:trusty-juno',
11 source='cloud:trusty-updates/juno')
12 deployment.run_tests()
013
=== 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-16 21:46:13 +0000
@@ -0,0 +1,12 @@
1#!/usr/bin/python
2
3"""Amulet tests on a basic nova cloud controller deployment on
4 trusty-kilo."""
5
6from basic_deployment import NovaCCBasicDeployment
7
8if __name__ == '__main__':
9 deployment = NovaCCBasicDeployment(series='trusty',
10 openstack='cloud:trusty-kilo',
11 source='cloud:trusty-updates/kilo')
12 deployment.run_tests()
013
=== 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-16 21:46:13 +0000
@@ -0,0 +1,10 @@
1#!/usr/bin/python
2
3"""Amulet tests on a basic nova cloud controller deployment on
4 utopic-juno."""
5
6from basic_deployment import NovaCCBasicDeployment
7
8if __name__ == '__main__':
9 deployment = NovaCCBasicDeployment(series='utopic')
10 deployment.run_tests()
011
=== 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-16 21:46:13 +0000
@@ -0,0 +1,10 @@
1#!/usr/bin/python
2
3"""Amulet tests on a basic nova cloud controller deployment on
4 vivid-kilo."""
5
6from basic_deployment import NovaCCBasicDeployment
7
8if __name__ == '__main__':
9 deployment = NovaCCBasicDeployment(series='vivid')
10 deployment.run_tests()
011
=== removed file 'tests/11-basic-precise-folsom'
--- tests/11-basic-precise-folsom 2014-07-11 17:34:39 +0000
+++ tests/11-basic-precise-folsom 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
1#!/usr/bin/python
2
3"""Amulet tests on a basic nova cloud controller deployment on
4 precise-folsom."""
5
6import amulet
7from basic_deployment import NovaCCBasicDeployment
8
9if __name__ == '__main__':
10 # NOTE(coreycb): Skipping failing test until resolved. 'nova-manage db sync'
11 # fails in shared-db-relation-changed (only fails on folsom)
12 message = "Skipping failing test until resolved"
13 amulet.raise_status(amulet.SKIP, msg=message)
14
15 deployment = NovaCCBasicDeployment(series='precise',
16 openstack='cloud:precise-folsom',
17 source='cloud:precise-updates/folsom')
18 deployment.run_tests()
190
=== removed file 'tests/12-basic-precise-grizzly'
--- tests/12-basic-precise-grizzly 2014-07-11 17:34:39 +0000
+++ tests/12-basic-precise-grizzly 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1#!/usr/bin/python
2
3"""Amulet tests on a basic nova cloud controller deployment on
4 precise-grizzly."""
5
6from basic_deployment import NovaCCBasicDeployment
7
8if __name__ == '__main__':
9 deployment = NovaCCBasicDeployment(series='precise',
10 openstack='cloud:precise-grizzly',
11 source='cloud:precise-updates/grizzly')
12 deployment.run_tests()
130
=== removed file 'tests/13-basic-precise-havana'
--- tests/13-basic-precise-havana 2014-07-11 17:34:39 +0000
+++ tests/13-basic-precise-havana 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1#!/usr/bin/python
2
3"""Amulet tests on a basic nova cloud controller deployment on
4 precise-havana."""
5
6from basic_deployment import NovaCCBasicDeployment
7
8if __name__ == '__main__':
9 deployment = NovaCCBasicDeployment(series='precise',
10 openstack='cloud:precise-havana',
11 source='cloud:precise-updates/havana')
12 deployment.run_tests()
130
=== modified file 'tests/charmhelpers/contrib/openstack/amulet/deployment.py'
--- tests/charmhelpers/contrib/openstack/amulet/deployment.py 2015-04-16 10:25:41 +0000
+++ tests/charmhelpers/contrib/openstack/amulet/deployment.py 2015-04-16 21:46:13 +0000
@@ -101,7 +101,8 @@
101 """101 """
102 (self.precise_essex, self.precise_folsom, self.precise_grizzly,102 (self.precise_essex, self.precise_folsom, self.precise_grizzly,
103 self.precise_havana, self.precise_icehouse,103 self.precise_havana, self.precise_icehouse,
104 self.trusty_icehouse, self.trusty_juno, self.trusty_kilo) = range(8)104 self.trusty_icehouse, self.trusty_juno, self.trusty_kilo,
105 self.utopic_juno, self.vivid_kilo) = range(10)
105 releases = {106 releases = {
106 ('precise', None): self.precise_essex,107 ('precise', None): self.precise_essex,
107 ('precise', 'cloud:precise-folsom'): self.precise_folsom,108 ('precise', 'cloud:precise-folsom'): self.precise_folsom,
@@ -110,7 +111,9 @@
110 ('precise', 'cloud:precise-icehouse'): self.precise_icehouse,111 ('precise', 'cloud:precise-icehouse'): self.precise_icehouse,
111 ('trusty', None): self.trusty_icehouse,112 ('trusty', None): self.trusty_icehouse,
112 ('trusty', 'cloud:trusty-juno'): self.trusty_juno,113 ('trusty', 'cloud:trusty-juno'): self.trusty_juno,
113 ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo}114 ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo,
115 ('utopic', None): self.utopic_juno,
116 ('vivid', None): self.vivid_kilo}
114 return releases[(self.series, self.openstack)]117 return releases[(self.series, self.openstack)]
115118
116 def _get_openstack_release_string(self):119 def _get_openstack_release_string(self):

Subscribers

People subscribed via source and target branches