Juju Charms Collection
glance package

Merge lp:~corey.bryant/charms/trusty/glance/amulet-stable into lp:~openstack-charmers-archive/charms/trusty/glance/trunk

  1. Trusty Tahr (14.04)
  2. amulet-stable
  3. Merge into trunk
Proposed by Corey Bryant
Status: Merged
Merged at revision: 97
Proposed branch: lp:~corey.bryant/charms/trusty/glance/amulet-stable
Merge into: lp:~openstack-charmers-archive/charms/trusty/glance/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
tests/basic_deployment.py (+1/-1)
To merge this branch: bzr merge lp:~corey.bryant/charms/trusty/glance/amulet-stable
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+248005@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #1360 trusty-glance for corey.bryant mp248005
    LINT OK: passed

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

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

charm_unit_test #1313 trusty-glance for corey.bryant mp248005
    UNIT OK: passed

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

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

charm_amulet_test #1547 trusty-glance for corey.bryant mp248005
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

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

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

charm_amulet_test #1559 glance for corey.bryant mp248005
    AMULET OK: passed

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

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 2014-10-08 20:18:38 +0000
3+++ tests/basic_deployment.py 2015-01-29 16:11:26 +0000
4@@ -23,7 +23,7 @@
5 # * Add tests with different storage back ends
6 # * Resolve Essex->Havana juju set charm bug
7
8- def __init__(self, series=None, openstack=None, source=None, stable=False):
9+ def __init__(self, series=None, openstack=None, source=None, stable=True):
10 '''Deploy the entire test environment.'''
11 super(GlanceBasicDeployment, self).__init__(series, openstack, source, stable)
12 self._add_services()

Subscribers

People subscribed via source and target branches