Merge lp:~1chb1n/charms/trusty/nova-compute/next.normalize-makefile-test-deps into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

Proposed by Ryan Beisner
Status: Merged
Merged at revision: 169
Proposed branch: lp:~1chb1n/charms/trusty/nova-compute/next.normalize-makefile-test-deps
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 86 lines (+38/-13)
3 files modified
Makefile (+10/-11)
tests/00-setup (+8/-2)
tests/tests.yaml (+20/-0)
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/nova-compute/next.normalize-makefile-test-deps
Reviewer Review Type Date Requested Status
Corey Bryant (community) Approve
Review via email: mp+273586@code.launchpad.net

Description of the change

Update test dependencies and normalize Makefiles across *oscharms.

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

charm_lint_check #11400 nova-compute-next for 1chb1n mp273586
    LINT OK: passed

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

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

charm_unit_test #10602 nova-compute-next for 1chb1n mp273586
    UNIT OK: passed

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

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

charm_amulet_test #7150 nova-compute-next for 1chb1n mp273586
    AMULET FAIL: amulet-test failed

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

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

Revision history for this message
Ryan Beisner (1chb1n) wrote :

^ More unrelated timeout funk. Re-running test anyway...

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

charm_amulet_test #7169 nova-compute-next for 1chb1n mp273586
    AMULET FAIL: amulet-test failed

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

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

Revision history for this message
Ryan Beisner (1chb1n) wrote :

Undercloud issue, pending resolution.

Since this MP doesn't touch tests or hooks, amulet failures are irrelevant.

Revision history for this message
Corey Bryant (corey.bryant) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2015-04-16 21:32:06 +0000
3+++ Makefile 2015-10-06 17:20:48 +0000
4@@ -2,12 +2,18 @@
5 PYTHON := /usr/bin/env python
6
7 lint:
8- @flake8 --exclude hooks/charmhelpers actions hooks unit_tests tests
9+ @flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
10+ actions hooks unit_tests tests
11 @charm proof
12
13-unit_test:
14+test:
15+ @# Bundletester expects unit tests here.
16 @echo Starting unit tests...
17- @$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage unit_tests
18+ @$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests
19+
20+functional_test:
21+ @echo Starting Amulet tests...
22+ @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
23
24 bin/charm_helpers_sync.py:
25 @mkdir -p bin
26@@ -18,13 +24,6 @@
27 @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
28 @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
29
30-test:
31- @echo Starting Amulet tests...
32- # coreycb note: The -v should only be temporary until Amulet sends
33- # raise_status() messages to stderr:
34- # https://bugs.launchpad.net/amulet/+bug/1320357
35- @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
36-
37-publish: lint unit_test
38+publish: lint test
39 bzr push lp:charms/nova-compute
40 bzr push lp:charms/trusty/nova-compute
41
42=== modified file 'tests/00-setup'
43--- tests/00-setup 2015-07-10 13:34:04 +0000
44+++ tests/00-setup 2015-10-06 17:20:48 +0000
45@@ -4,8 +4,14 @@
46
47 sudo add-apt-repository --yes ppa:juju/stable
48 sudo apt-get update --yes
49-sudo apt-get install --yes python-amulet \
50+sudo apt-get install --yes amulet \
51+ distro-info-data \
52+ python-cinderclient \
53 python-distro-info \
54 python-glanceclient \
55+ python-heatclient \
56 python-keystoneclient \
57- python-novaclient
58+ python-neutronclient \
59+ python-novaclient \
60+ python-pika \
61+ python-swiftclient
62
63=== added file 'tests/tests.yaml'
64--- tests/tests.yaml 1970-01-01 00:00:00 +0000
65+++ tests/tests.yaml 2015-10-06 17:20:48 +0000
66@@ -0,0 +1,20 @@
67+bootstrap: true
68+reset: true
69+virtualenv: true
70+makefile:
71+ - lint
72+ - test
73+sources:
74+ - ppa:juju/stable
75+packages:
76+ - amulet
77+ - distro-info-data
78+ - python-cinderclient
79+ - python-distro-info
80+ - python-glanceclient
81+ - python-heatclient
82+ - python-keystoneclient
83+ - python-neutronclient
84+ - python-novaclient
85+ - python-pika
86+ - python-swiftclient

Subscribers

People subscribed via source and target branches