Merge lp://qastaging/~gnuoy/charms/trusty/glance/next-haproxy-always into lp://qastaging/~openstack-charmers-archive/charms/trusty/glance/next

Proposed by Liam Young
Status: Merged
Merged at revision: 90
Proposed branch: lp://qastaging/~gnuoy/charms/trusty/glance/next-haproxy-always
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/glance/next
Diff against target: 27 lines (+3/-3)
2 files modified
hooks/glance_contexts.py (+2/-2)
hooks/glance_utils.py (+1/-1)
To merge this branch: bzr merge lp://qastaging/~gnuoy/charms/trusty/glance/next-haproxy-always
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Review via email: mp+242901@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

UOSCI bot says:
charm_lint_check #1232 glance-next for gnuoy mp242901
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-public-network has no default value
  OK

Full lint test output: http://paste.ubuntu.com/9252841/
Build: http://10.98.191.181:8080/job/charm_lint_check/1232/

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

UOSCI bot says:
charm_unit_test #1066 glance-next for gnuoy mp242901
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/glance_relations 211 9 96% 289-290, 309-320
  hooks/glance_utils 91 8 91% 162, 255-267
  TOTAL 350 23 93%
  Ran 65 tests in 3.291s
  OK

Full unit test output: http://paste.ubuntu.com/9252848/
Build: http://10.98.191.181:8080/job/charm_unit_test/1066/

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

UOSCI bot says:
charm_amulet_test #535 glance-next for gnuoy mp242901
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  WARNING cannot delete security group "juju-osci-sv04-0". Used by another environment?
  WARNING cannot delete security group "juju-osci-sv04-3". Used by another environment?
  juju-test INFO : Results: 2 passed, 1 failed, 0 errored
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/9253225/
Build: http://10.98.191.181:8080/job/charm_amulet_test/535/

Revision history for this message
James Page (james-page) :
review: Approve
Revision history for this message
James Page (james-page) wrote :

  juju-test.conductor.14-basic-precise-icehouse RESULT : ✘

review: Needs Fixing
84. By Liam Young

Merged next in

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

charm_lint_check #304 glance-next for gnuoy mp242901
    LINT OK: passed

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

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

charm_unit_test #332 glance-next for gnuoy mp242901
    UNIT OK: passed

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

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

charm_amulet_test #467 glance-next for gnuoy mp242901
    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/9568243/
Build: http://10.245.162.77:8080/job/charm_amulet_test/467/

85. By Liam Young

Charmhelper sync

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

charm_lint_check #308 glance-next for gnuoy mp242901
    LINT OK: passed

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

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

charm_unit_test #336 glance-next for gnuoy mp242901
    UNIT OK: passed

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

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

charm_amulet_test #471 glance-next for gnuoy mp242901
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  juju-test INFO : Results: 1 passed, 1 failed, 0 errored
  ERROR subprocess encountered error code 1

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

86. By Liam Young

charmhelper sync

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

charm_lint_check #526 glance-next for gnuoy mp242901
    LINT OK: passed

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

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

charm_unit_test #555 glance-next for gnuoy mp242901
    UNIT OK: passed

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

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

charm_amulet_test #682 glance-next for gnuoy mp242901
    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/9675800/
Build: http://10.245.162.77:8080/job/charm_amulet_test/682/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches