Juju Charms Collection
openvswitch-odl package

Merge lp://staging/~1chb1n/charms/trusty/openvswitch-odl/next-makefile-update into lp://staging/~openstack-charmers-archive/charms/trusty/openvswitch-odl/next

  1. Trusty Tahr (14.04)
  2. next-makefile-update
  3. Merge into next
Proposed by Ryan Beisner
Status: Merged
Merged at revision: 5
Proposed branch: lp://staging/~1chb1n/charms/trusty/openvswitch-odl/next-makefile-update
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/openvswitch-odl/next
Diff against target: 80 lines (+15/-15)
3 files modified
Makefile (+10/-10)
hooks/lib/PCIDev.py (+2/-2)
tests/basic_deployment.py (+3/-3)
To merge this branch: bzr merge lp://staging/~1chb1n/charms/trusty/openvswitch-odl/next-makefile-update
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+277379@code.staging.launchpad.net

Description of the change

Update Makefile target names for consistency with other os-charms and bundletester; Fix over-indent and line-too-long lint; Fix lp branch string typo in amulet test.

FYI - unit test failures are not addressed here, this is just to standardize the Makefile. Address unit test fails separately.

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

charm_lint_check #13642 openvswitch-odl-next for 1chb1n mp277379
    LINT OK: passed

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

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

charm_unit_test #12715 openvswitch-odl-next for 1chb1n mp277379
    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/13241068/
Build: http://10.245.162.77:8080/job/charm_unit_test/12715/

lp://staging/~1chb1n/charms/trusty/openvswitch-odl/next-makefile-update updated
6. By Ryan Beisner

fix typo in lp branch string for amulet test

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

charm_lint_check #13643 openvswitch-odl-next for 1chb1n mp277379
    LINT OK: passed

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

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

charm_unit_test #12717 openvswitch-odl-next for 1chb1n mp277379
    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/13241095/
Build: http://10.245.162.77:8080/job/charm_unit_test/12717/

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

charm_amulet_test #7851 openvswitch-odl-next for 1chb1n mp277379
    AMULET FAIL: amulet-test failed

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

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

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

charm_amulet_test #7852 openvswitch-odl-next for 1chb1n mp277379
    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/13241380/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7852/

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

charm_amulet_test #7853 openvswitch-odl-next for 1chb1n mp277379
    AMULET OK: passed

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

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