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
=== modified file 'Makefile'
--- Makefile 2015-04-22 21:48:17 +0000
+++ Makefile 2015-10-06 17:20:40 +0000
@@ -2,28 +2,28 @@
2PYTHON := /usr/bin/env python2PYTHON := /usr/bin/env python
33
4lint:4lint:
5 @flake8 --exclude hooks/charmhelpers actions hooks unit_tests tests5 @flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
6 actions hooks unit_tests tests
6 @charm proof7 @charm proof
78
8unit_test:9test:
10 @# Bundletester expects unit tests here.
9 @echo Starting unit tests...11 @echo Starting unit tests...
10 @$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage unit_tests12 @$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests
13
14functional_test:
15 @echo Starting Amulet tests...
16 @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
1117
12bin/charm_helpers_sync.py:18bin/charm_helpers_sync.py:
13 @mkdir -p bin19 @mkdir -p bin
14 @bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \20 @bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
15 > bin/charm_helpers_sync.py21 > bin/charm_helpers_sync.py
16test:
17 @echo Starting Amulet tests...
18 # coreycb note: The -v should only be temporary until Amulet sends
19 # raise_status() messages to stderr:
20 # https://bugs.launchpad.net/amulet/+bug/1320357
21 @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
2222
23sync: bin/charm_helpers_sync.py23sync: bin/charm_helpers_sync.py
24 @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml24 @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
25 @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml25 @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
2626
27publish: lint unit_test27publish: lint test
28 bzr push lp:charms/nova-cloud-controller28 bzr push lp:charms/nova-cloud-controller
29 bzr push lp:charms/trusty/nova-cloud-controller29 bzr push lp:charms/trusty/nova-cloud-controller
3030
=== modified file 'tests/00-setup'
--- tests/00-setup 2015-07-10 13:34:04 +0000
+++ tests/00-setup 2015-10-06 17:20:40 +0000
@@ -4,8 +4,14 @@
44
5sudo add-apt-repository --yes ppa:juju/stable5sudo add-apt-repository --yes ppa:juju/stable
6sudo apt-get update --yes6sudo apt-get update --yes
7sudo apt-get install --yes python-amulet \7sudo apt-get install --yes amulet \
8 distro-info-data \
9 python-cinderclient \
8 python-distro-info \10 python-distro-info \
9 python-glanceclient \11 python-glanceclient \
12 python-heatclient \
10 python-keystoneclient \13 python-keystoneclient \
11 python-novaclient14 python-neutronclient \
15 python-novaclient \
16 python-pika \
17 python-swiftclient
1218
=== added file 'tests/tests.yaml'
--- tests/tests.yaml 1970-01-01 00:00:00 +0000
+++ tests/tests.yaml 2015-10-06 17:20:40 +0000
@@ -0,0 +1,20 @@
1bootstrap: true
2reset: true
3virtualenv: true
4makefile:
5 - lint
6 - test
7sources:
8 - ppa:juju/stable
9packages:
10 - amulet
11 - distro-info-data
12 - python-cinderclient
13 - python-distro-info
14 - python-glanceclient
15 - python-heatclient
16 - python-keystoneclient
17 - python-neutronclient
18 - python-novaclient
19 - python-pika
20 - python-swiftclient

Subscribers

People subscribed via source and target branches