Merge lp://qastaging/~corey.bryant/charms/trusty/nova-compute/git into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next

Proposed by Corey Bryant
Status: Merged
Merged at revision: 123
Proposed branch: lp://qastaging/~corey.bryant/charms/trusty/nova-compute/git
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 1288 lines (+811/-65)
29 files modified
.bzrignore (+1/-0)
Makefile (+4/-2)
README.md (+88/-3)
actions.yaml (+2/-0)
actions/git_reinstall.py (+45/-0)
config.yaml (+16/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+4/-1)
hooks/nova_compute_hooks.py (+12/-2)
hooks/nova_compute_utils.py (+191/-2)
templates/git/nova-compute-kvm.conf (+4/-0)
templates/git/nova-compute-lxc.conf (+4/-0)
templates/git/nova-compute-qemu.conf (+4/-0)
templates/git/nova-compute-vmware.conf (+2/-0)
templates/git/nova-compute-xen.conf (+4/-0)
templates/git/nova_sudoers (+4/-0)
templates/git/nova_tgt.conf (+1/-0)
templates/git/upstart/nova-compute.upstart (+27/-0)
tests/10-basic-precise-essex (+0/-9)
tests/11-basic-precise-folsom (+0/-17)
tests/12-basic-precise-grizzly (+0/-11)
tests/13-basic-precise-havana (+0/-11)
tests/16-basic-trusty-icehouse-git (+9/-0)
tests/17-basic-trusty-juno (+11/-0)
tests/18-basic-trusty-juno-git (+12/-0)
tests/basic_deployment.py (+23/-1)
unit_tests/__init__.py (+1/-0)
unit_tests/test_actions_git_reinstall.py (+96/-0)
unit_tests/test_nova_compute_hooks.py (+57/-0)
unit_tests/test_nova_compute_utils.py (+189/-6)
To merge this branch: bzr merge lp://qastaging/~corey.bryant/charms/trusty/nova-compute/git
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+255945@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 #3331 nova-compute-next for corey.bryant mp255945
    LINT OK: passed

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

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

charm_unit_test #3119 nova-compute-next for corey.bryant mp255945
    UNIT FAIL: unit-test failed

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

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

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

charm_lint_check #3334 nova-compute-next for corey.bryant mp255945
    LINT OK: passed

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

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

charm_unit_test #3122 nova-compute-next for corey.bryant mp255945
    UNIT OK: passed

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

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

charm_amulet_test #3153 nova-compute-next for corey.bryant mp255945
    AMULET OK: passed

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

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

charm_amulet_test #3157 nova-compute-next for corey.bryant mp255945
    AMULET OK: passed

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

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

charm_lint_check #3383 nova-compute-next for corey.bryant mp255945
    LINT OK: passed

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

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

charm_unit_test #3171 nova-compute-next for corey.bryant mp255945
    UNIT OK: passed

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

118. By Corey Bryant

Deploy from source

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

charm_lint_check #3387 nova-compute-next for corey.bryant mp255945
    LINT OK: passed

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

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

charm_unit_test #3175 nova-compute-next for corey.bryant mp255945
    UNIT OK: passed

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

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

charm_amulet_test #3171 nova-compute-next for corey.bryant mp255945
    AMULET FAIL: amulet-test failed

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

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

119. By Corey Bryant

Fixup test_git_reinstall_exception()

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

charm_amulet_test #3177 nova-compute-next for corey.bryant mp255945
    AMULET FAIL: amulet-test failed

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

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

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

charm_lint_check #3399 nova-compute-next for corey.bryant mp255945
    LINT OK: passed

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

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

charm_unit_test #3187 nova-compute-next for corey.bryant mp255945
    UNIT OK: passed

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

120. By Corey Bryant

Sync charm-helpers

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

charm_lint_check #3406 nova-compute-next for corey.bryant mp255945
    LINT OK: passed

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

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

charm_unit_test #3194 nova-compute-next for corey.bryant mp255945
    UNIT OK: passed

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

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

charm_amulet_test #3189 nova-compute-next for corey.bryant mp255945
    AMULET FAIL: amulet-test failed

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

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

121. By Corey Bryant

Move config_changed into try block

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

charm_lint_check #3415 nova-compute-next for corey.bryant mp255945
    LINT OK: passed

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

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

charm_unit_test #3203 nova-compute-next for corey.bryant mp255945
    UNIT OK: passed

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

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

charm_amulet_test #3199 nova-compute-next for corey.bryant mp255945
    AMULET FAIL: amulet-test failed

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

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

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

charm_amulet_test #3208 nova-compute-next for corey.bryant mp255945
    AMULET FAIL: amulet-test failed

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

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

122. By Corey Bryant

Fix nova_conf path

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

charm_lint_check #3418 nova-compute-next for corey.bryant mp255945
    LINT OK: passed

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

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

charm_unit_test #3206 nova-compute-next for corey.bryant mp255945
    UNIT OK: passed

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

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

charm_amulet_test #3212 nova-compute-next for corey.bryant mp255945
    AMULET OK: passed

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

123. By Corey Bryant

Sync charm-helpers

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

charm_lint_check #3456 nova-compute-next for corey.bryant mp255945
    LINT OK: passed

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

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

charm_unit_test #3244 nova-compute-next for corey.bryant mp255945
    UNIT OK: passed

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

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

charm_amulet_test #3254 nova-compute-next for corey.bryant mp255945
    AMULET OK: passed

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

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