Juju Charms Collection
neutron-api package

Merge lp:~bjornt/charms/trusty/neutron-api/r177-amulet-fixes into lp:~openstack-charmers-archive/charms/trusty/neutron-api/trunk

  1. Trusty Tahr (14.04)
  2. r177-amulet-fixes
  3. Merge into trunk
Proposed by Björn Tillenius
Status: Needs review
Proposed branch: lp:~bjornt/charms/trusty/neutron-api/r177-amulet-fixes
Merge into: lp:~openstack-charmers-archive/charms/trusty/neutron-api/trunk
Diff against target: 14 lines (+2/-2)
1 file modified
tests/basic_deployment.py (+2/-2)
To merge this branch: bzr merge lp:~bjornt/charms/trusty/neutron-api/r177-amulet-fixes
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+270631@code.launchpad.net

Description of the change

Fix amulet failures introduced by r117.

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

charm_unit_test #8931 neutron-api for bjornt mp270631
    UNIT OK: passed

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

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

charm_lint_check #9706 neutron-api for bjornt mp270631
    LINT OK: passed

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

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

charm_amulet_test #6338 neutron-api for bjornt mp270631
    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/12329077/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6338/

Reply
lp:~bjornt/charms/trusty/neutron-api/r177-amulet-fixes updated
119. By Björn Tillenius

Empty commit.

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

charm_lint_check #9774 neutron-api for bjornt mp270631
    LINT OK: passed

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

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

charm_unit_test #9002 neutron-api for bjornt mp270631
    UNIT OK: passed

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

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

charm_amulet_test #6356 neutron-api for bjornt mp270631
    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/12339586/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6356/

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

charm_lint_check #12342 neutron-api for bjornt mp270631
    LINT OK: passed

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

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

charm_unit_test #11450 neutron-api for bjornt mp270631
    UNIT OK: passed

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

Reply

Unmerged revisions

119. By Björn Tillenius

Empty commit.

118. By Björn Tillenius

Fix amulet failures.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/basic_deployment.py'
2--- tests/basic_deployment.py 2015-08-10 17:28:39 +0000
3+++ tests/basic_deployment.py 2015-09-11 13:14:37 +0000
4@@ -504,8 +504,8 @@
5
6 expected = {
7 'ml2': {
8- 'type_drivers': 'gre,vlan,flat',
9- 'tenant_network_types': 'gre,vlan,flat',
10+ 'type_drivers': 'gre,vlan,flat,local',
11+ 'tenant_network_types': 'gre,vlan,flat,local',
12 },
13 'ml2_type_gre': {
14 'tunnel_id_ranges': '1:1000'

Subscribers

People subscribed via source and target branches