Juju Charms Collection
nova-cloud-controller package

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

  1. Trusty Tahr (14.04)
  2. next.normalize-makefile-test-deps
  3. Merge into next
Proposed by Ryan Beisner
Status: Merged
Merged at revision: 199
Proposed branch: lp:~1chb1n/charms/trusty/nova-cloud-controller/next.normalize-makefile-test-deps
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 88 lines (+38/-12)
3 files modified
Makefile (+10/-10)
tests/00-setup (+8/-2)
tests/tests.yaml (+20/-0)
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/nova-cloud-controller/next.normalize-makefile-test-deps
Reviewer Review Type Date Requested Status
Corey Bryant (community) Approve
Review via email: mp+273585@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_unit_test #10593 nova-cloud-controller-next for 1chb1n mp273585
    UNIT OK: passed

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

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

charm_lint_check #11420 nova-cloud-controller-next for 1chb1n mp273585
    LINT OK: passed

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

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

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

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

^ Totally unrelated amulet test fail. Re-running anyway...

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

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

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-22 21:48:17 +0000
3+++ Makefile 2015-10-06 17:20:40 +0000
4@@ -2,28 +2,28 @@
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 @bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
27 > bin/charm_helpers_sync.py
28-test:
29- @echo Starting Amulet tests...
30- # coreycb note: The -v should only be temporary until Amulet sends
31- # raise_status() messages to stderr:
32- # https://bugs.launchpad.net/amulet/+bug/1320357
33- @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
34
35 sync: bin/charm_helpers_sync.py
36 @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
37 @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
38
39-publish: lint unit_test
40+publish: lint test
41 bzr push lp:charms/nova-cloud-controller
42 bzr push lp:charms/trusty/nova-cloud-controller
43
44=== modified file 'tests/00-setup'
45--- tests/00-setup 2015-07-10 13:34:04 +0000
46+++ tests/00-setup 2015-10-06 17:20:40 +0000
47@@ -4,8 +4,14 @@
48
49 sudo add-apt-repository --yes ppa:juju/stable
50 sudo apt-get update --yes
51-sudo apt-get install --yes python-amulet \
52+sudo apt-get install --yes amulet \
53+ distro-info-data \
54+ python-cinderclient \
55 python-distro-info \
56 python-glanceclient \
57+ python-heatclient \
58 python-keystoneclient \
59- python-novaclient
60+ python-neutronclient \
61+ python-novaclient \
62+ python-pika \
63+ python-swiftclient
64
65=== added file 'tests/tests.yaml'
66--- tests/tests.yaml 1970-01-01 00:00:00 +0000
67+++ tests/tests.yaml 2015-10-06 17:20:40 +0000
68@@ -0,0 +1,20 @@
69+bootstrap: true
70+reset: true
71+virtualenv: true
72+makefile:
73+ - lint
74+ - test
75+sources:
76+ - ppa:juju/stable
77+packages:
78+ - amulet
79+ - distro-info-data
80+ - python-cinderclient
81+ - python-distro-info
82+ - python-glanceclient
83+ - python-heatclient
84+ - python-keystoneclient
85+ - python-neutronclient
86+ - python-novaclient
87+ - python-pika
88+ - python-swiftclient

Subscribers

People subscribed via source and target branches