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

Proposed by Ryan Beisner
Status: Merged
Merged at revision: 51
Proposed branch: lp:~1chb1n/charms/trusty/ceph-osd/next.normalize-makefile-test-deps
Merge into: lp:~openstack-charmers-archive/charms/trusty/ceph-osd/next
Diff against target: 38 lines (+7/-2)
2 files modified
tests/00-setup (+4/-1)
tests/tests.yaml (+3/-1)
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/ceph-osd/next.normalize-makefile-test-deps
Reviewer Review Type Date Requested Status
Corey Bryant (community) Approve
Review via email: mp+273574@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 #11406 ceph-osd-next for 1chb1n mp273574
    LINT OK: passed

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

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

charm_unit_test #10608 ceph-osd-next for 1chb1n mp273574
    UNIT FAIL: unit-test missing

UNIT Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full unit test output: http://paste.ubuntu.com/12698406/
Build: http://10.245.162.77:8080/job/charm_unit_test/10608/

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

^ FYI
Charm doesn't have unit tests.

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

charm_amulet_test #7153 ceph-osd-next for 1chb1n mp273574
    AMULET OK: passed

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

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 'tests/00-setup'
2--- tests/00-setup 2015-06-29 19:25:50 +0000
3+++ tests/00-setup 2015-10-06 17:19:29 +0000
4@@ -4,11 +4,14 @@
5
6 sudo add-apt-repository --yes ppa:juju/stable
7 sudo apt-get update --yes
8-sudo apt-get install --yes python-amulet \
9+sudo apt-get install --yes amulet \
10+ distro-info-data \
11 python-cinderclient \
12 python-distro-info \
13 python-glanceclient \
14 python-heatclient \
15 python-keystoneclient \
16+ python-neutronclient \
17 python-novaclient \
18+ python-pika \
19 python-swiftclient
20
21=== modified file 'tests/tests.yaml'
22--- tests/tests.yaml 2015-06-29 18:38:42 +0000
23+++ tests/tests.yaml 2015-10-06 17:19:29 +0000
24@@ -8,11 +8,13 @@
25 - ppa:juju/stable
26 packages:
27 - amulet
28- - python-amulet
29+ - distro-info-data
30 - python-cinderclient
31 - python-distro-info
32 - python-glanceclient
33 - python-heatclient
34 - python-keystoneclient
35+ - python-neutronclient
36 - python-novaclient
37+ - python-pika
38 - python-swiftclient

Subscribers

People subscribed via source and target branches