Merge lp://qastaging/~james-page/charms/trusty/openstack-dashboard/xenial-support into lp://qastaging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next

Proposed by James Page
Status: Merged
Merged at revision: 106
Proposed branch: lp://qastaging/~james-page/charms/trusty/openstack-dashboard/xenial-support
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next
Diff against target: 86 lines (+28/-9)
3 files modified
config.yaml (+0/-1)
hooks/horizon_utils.py (+4/-1)
templates/haproxy.cfg (+24/-7)
To merge this branch: bzr merge lp://qastaging/~james-page/charms/trusty/openstack-dashboard/xenial-support
Reviewer Review Type Date Requested Status
David Ames (community) Approve
Review via email: mp+286508@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_unit_test #742 openstack-dashboard-next for james-page mp286508
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/742/

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

charm_lint_check #839 openstack-dashboard-next for james-page mp286508
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/839/

108. By James Page

Fixups

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

charm_lint_check #840 openstack-dashboard-next for james-page mp286508
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/15110975/
Build: http://10.245.162.36:8080/job/charm_lint_check/840/

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

charm_unit_test #744 openstack-dashboard-next for james-page mp286508
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full unit test output: http://paste.ubuntu.com/15110980/
Build: http://10.245.162.36:8080/job/charm_unit_test/744/

109. By James Page

Rework to make testing easier

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

charm_lint_check #844 openstack-dashboard-next for james-page mp286508
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/844/

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

charm_unit_test #747 openstack-dashboard-next for james-page mp286508
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/747/

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

charm_amulet_test #340 openstack-dashboard-next for james-page mp286508
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15112258/
Build: http://10.245.162.36:8080/job/charm_amulet_test/340/

110. By James Page

Disable wily-liberty for now

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

charm_lint_check #851 openstack-dashboard-next for james-page mp286508
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/851/

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

charm_unit_test #754 openstack-dashboard-next for james-page mp286508
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/754/

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

charm_amulet_test #349 openstack-dashboard-next for james-page mp286508
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15117832/
Build: http://10.245.162.36:8080/job/charm_amulet_test/349/

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

charm_amulet_test #353 openstack-dashboard-next for james-page mp286508
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15125511/
Build: http://10.245.162.36:8080/job/charm_amulet_test/353/

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

charm_amulet_test #354 openstack-dashboard-next for james-page mp286508
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/354/

Revision history for this message
David Ames (thedac) wrote :

Looks good. Merging.

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