Merge lp://qastaging/~hopem/charms/trusty/keystone/fix-ssl-disable into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 126
Proposed branch: lp://qastaging/~hopem/charms/trusty/keystone/fix-ssl-disable
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next
Diff against target: 315 lines (+84/-71)
5 files modified
hooks/keystone_hooks.py (+30/-55)
hooks/keystone_utils.py (+32/-5)
tests/basic_deployment.py (+0/-1)
unit_tests/test_keystone_hooks.py (+7/-4)
unit_tests/test_keystone_utils.py (+15/-6)
To merge this branch: bzr merge lp://qastaging/~hopem/charms/trusty/keystone/fix-ssl-disable
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+252231@code.qastaging.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 #2542 keystone-next for hopem mp252231
    LINT OK: passed

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

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

charm_unit_test #2332 keystone-next for hopem mp252231
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
  FAILED (errors=1)
  make: *** [unit_test] Error 1

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

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

charm_amulet_test #2415 keystone-next for hopem mp252231
    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/10568715/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2415/

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

charm_lint_check #2546 keystone-next for hopem mp252231
    LINT OK: passed

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

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

charm_unit_test #2336 keystone-next for hopem mp252231
    UNIT OK: passed

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

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

charm_amulet_test #2417 keystone-next for hopem mp252231
    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/10569471/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2417/

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

charm_lint_check #2547 keystone-next for hopem mp252231
    LINT OK: passed

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

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

charm_unit_test #2337 keystone-next for hopem mp252231
    UNIT OK: passed

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

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

charm_amulet_test #2418 keystone-next for hopem mp252231
    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/10569678/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2418/

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

charm_lint_check #2550 keystone-next for hopem mp252231
    LINT OK: passed

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

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

charm_unit_test #2340 keystone-next for hopem mp252231
    UNIT OK: passed

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

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

charm_amulet_test #2419 keystone-next for hopem mp252231
    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/10571109/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2419/

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

charm_lint_check #2551 keystone-next for hopem mp252231
    LINT OK: passed

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

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

charm_unit_test #2341 keystone-next for hopem mp252231
    UNIT OK: passed

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

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

charm_amulet_test #2420 keystone-next for hopem mp252231
    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/10571262/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2420/

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

charm_lint_check #2552 keystone-next for hopem mp252231
    LINT OK: passed

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

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

charm_unit_test #2342 keystone-next for hopem mp252231
    UNIT OK: passed

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

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

charm_amulet_test #2421 keystone-next for hopem mp252231
    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/10571526/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2421/

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

charm_lint_check #2553 keystone-next for hopem mp252231
    LINT OK: passed

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

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

charm_unit_test #2343 keystone-next for hopem mp252231
    UNIT OK: passed

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

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

charm_amulet_test #2422 keystone-next for hopem mp252231
    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/10573935/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2422/

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

charm_lint_check #2555 keystone-next for hopem mp252231
    LINT OK: passed

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

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

charm_unit_test #2345 keystone-next for hopem mp252231
    UNIT OK: passed

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

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

charm_amulet_test #2424 keystone-next for hopem mp252231
    AMULET OK: passed

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

Revision history for this message
Liam Young (gnuoy) wrote :

Approve

review: Approve

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