Juju Charms Collection
neutron-api package

Merge lp://qastaging/~openstack-charmers/charms/trusty/neutron-api/0mq into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

  1. Trusty Tahr (14.04)
  2. 0mq
  3. Merge into next
Proposed by Liam Young
Status: Merged
Merged at revision: 95
Proposed branch: lp://qastaging/~openstack-charmers/charms/trusty/neutron-api/0mq
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 747 lines (+390/-90)
14 files modified
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+25/-2)
hooks/charmhelpers/contrib/openstack/context.py (+144/-1)
hooks/charmhelpers/contrib/openstack/templates/git.upstart (+13/-0)
hooks/charmhelpers/contrib/openstack/templates/section-zeromq (+14/-0)
hooks/charmhelpers/contrib/openstack/templates/zeromq (+0/-14)
hooks/charmhelpers/contrib/openstack/utils.py (+124/-69)
hooks/charmhelpers/core/unitdata.py (+1/-1)
hooks/neutron_api_hooks.py (+19/-1)
hooks/neutron_api_utils.py (+12/-0)
metadata.yaml (+3/-0)
templates/icehouse/neutron.conf (+4/-0)
templates/kilo/neutron.conf (+3/-0)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+25/-2)
unit_tests/test_neutron_api_hooks.py (+3/-0)
To merge this branch: bzr merge lp://qastaging/~openstack-charmers/charms/trusty/neutron-api/0mq
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
James Page Needs Fixing
Review via email: mp+238881@code.qastaging.launchpad.net
To post a comment you must log in.
lp://qastaging/~openstack-charmers/charms/trusty/neutron-api/0mq updated
54. By Liam Young

Fix unit tests

Revision history for this message
Ryan Beisner (1chb1n) wrote :

UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.

#698 neutron-api-next for gnuoy mp238881
charm_lint_check

This build:
http://10.98.191.181:8080/job/charm_lint_check/698/

MP URL:
https://code.launchpad.net/~openstack-charmers/charms/trusty/neutron-api/0mq/+merge/238881

Proposed branch:
lp:~openstack-charmers/charms/trusty/neutron-api/0mq

Results summary:
    LINT OK: believed to pass, but you should confirm results

LINT Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_lint_check/make-lint.698:
I: config.yaml: option ssl_key has no default value
I: config.yaml: option os-admin-network has no default value
I: config.yaml: option nsx-controllers has no default value
I: config.yaml: option vip has no default value
I: config.yaml: option nsx-l3-uuid has no default value
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
I: config.yaml: option nsx-tz-uuid has no default value

Ubuntu OSCI Jenkins is currently in development on a Canonical private network, but we plan to publish results to a public instance soon. Tests are triggered if the proposed branch rev changes, or if the MP is placed into "Needs review" status after being otherwise for >= 1hr. Human review of results is still recommended.
http://10.98.191.181:8080/

Revision history for this message
Ryan Beisner (1chb1n) wrote :

UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.

#504 neutron-api-next for gnuoy mp238881
charm_unit_test

This build:
http://10.98.191.181:8080/job/charm_unit_test/504/

MP URL:
https://code.launchpad.net/~openstack-charmers/charms/trusty/neutron-api/0mq/+merge/238881

Proposed branch:
lp:~openstack-charmers/charms/trusty/neutron-api/0mq

Results summary:
    UNIT OK: believed to pass, but you should confirm results

UNIT Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_unit_test/unit-test.504:
Starting tests...
.......................................................
Name Stmts Miss Cover Missing
---------------------------------------------------------
hooks/neutron_api_context 80 6 93% 22, 34-36, 78, 110
hooks/neutron_api_hooks 200 18 91% 122-123, 183-184, 197, 262, 308, 327-338, 415, 423, 427-428
hooks/neutron_api_utils 99 8 92% 219, 243-255
---------------------------------------------------------
TOTAL 379 32 92%
----------------------------------------------------------------------
Ran 55 tests in 3.385s

OK

Ubuntu OSCI Jenkins is currently in development on a Canonical private network, but we plan to publish results to a public instance soon. Tests are triggered if the proposed branch rev changes, or if the MP is placed into "Needs review" status after being otherwise for >= 1hr. Human review of results is still recommended.
http://10.98.191.181:8080/

Revision history for this message
Ryan Beisner (1chb1n) wrote :

UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.

#255 neutron-api-next for gnuoy mp238881
charm_amulet_test

This build:
http://10.98.191.181:8080/job/charm_amulet_test/255/

MP URL:
https://code.launchpad.net/~openstack-charmers/charms/trusty/neutron-api/0mq/+merge/238881

Proposed branch:
lp:~openstack-charmers/charms/trusty/neutron-api/0mq

Results summary:
    AMULET FAIL: amulet-test missing

AMULET Results not found.

Ubuntu OSCI Jenkins is currently in development on a Canonical private network, but we plan to publish results to a public instance soon. Tests are triggered if the proposed branch rev changes, or if the MP is placed into "Needs review" status after being otherwise for >= 1hr. Human review of results is still recommended.
http://10.98.191.181:8080/

Revision history for this message
James Page (james-page) :
review: Needs Fixing
lp://qastaging/~openstack-charmers/charms/trusty/neutron-api/0mq updated
55. By James Page

Rebase on next

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

charm_lint_check #167 neutron-api-next for gnuoy mp238881
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/neutron_api_hooks.py:31:1: F401 'os_release' imported but unused
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9527363/
Build: http://10.245.162.77:8080/job/charm_lint_check/167/

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

charm_unit_test #201 neutron-api-next for gnuoy mp238881
    UNIT OK: passed

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

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

charm_amulet_test #181 neutron-api-next for gnuoy mp238881
    AMULET FAIL: no-tear-down-replace failed
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

lp://qastaging/~openstack-charmers/charms/trusty/neutron-api/0mq updated
56. By James Page

Rebase on next

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

charm_lint_check #710 neutron-api-next for gnuoy mp238881
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/neutron_api_hooks.py:31:1: F401 'os_release' imported but unused
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9727332/
Build: http://10.245.162.77:8080/job/charm_lint_check/710/

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

charm_amulet_test #895 neutron-api-next for gnuoy mp238881
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

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

charm_unit_test #739 neutron-api-next for gnuoy mp238881
    UNIT OK: passed

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

lp://qastaging/~openstack-charmers/charms/trusty/neutron-api/0mq updated
57. By James Page

Use centralized zeromq template

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

charm_lint_check #843 neutron-api-next for gnuoy mp238881
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/neutron_api_hooks.py:31:1: F401 'os_release' imported but unused
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9783631/
Build: http://10.245.162.77:8080/job/charm_lint_check/843/

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

charm_unit_test #872 neutron-api-next for gnuoy mp238881
    UNIT FAIL: unit-test failed

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

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

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

charm_amulet_test #1067 neutron-api-next for gnuoy mp238881
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

lp://qastaging/~openstack-charmers/charms/trusty/neutron-api/0mq updated
58. By James Page

Sortout zeromq section

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

charm_lint_check #847 neutron-api-next for gnuoy mp238881
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/neutron_api_hooks.py:31:1: F401 'os_release' imported but unused
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9783952/
Build: http://10.245.162.77:8080/job/charm_lint_check/847/

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

charm_unit_test #876 neutron-api-next for gnuoy mp238881
    UNIT FAIL: unit-test failed

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

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

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

charm_amulet_test #1071 neutron-api-next for gnuoy mp238881
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

lp://qastaging/~openstack-charmers/charms/trusty/neutron-api/0mq updated
59. By James Page

Resync helper

60. By James Page

Resync helper

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

charm_lint_check #871 neutron-api-next for gnuoy mp238881
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/neutron_api_hooks.py:31:1: F401 'os_release' imported but unused
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9793805/
Build: http://10.245.162.77:8080/job/charm_lint_check/871/

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

charm_unit_test #900 neutron-api-next for gnuoy mp238881
    UNIT FAIL: unit-test failed

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

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

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

charm_amulet_test #1095 neutron-api-next for gnuoy mp238881
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

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

charm_lint_check #877 neutron-api-next for gnuoy mp238881
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/neutron_api_hooks.py:31:1: F401 'os_release' imported but unused
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9793987/
Build: http://10.245.162.77:8080/job/charm_lint_check/877/

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

charm_unit_test #906 neutron-api-next for gnuoy mp238881
    UNIT FAIL: unit-test failed

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

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

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

charm_amulet_test #1101 neutron-api-next for gnuoy mp238881
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

lp://qastaging/~openstack-charmers/charms/trusty/neutron-api/0mq updated
61. By James Page

Rebase

62. By James Page

Rebase

63. By James Page

Add juno specific config files, drop icehouse zeromq support, add to kilo

64. By James Page

Drop files we don't need to specialize for juno

65. By James Page

Ensure check uses a neutron package for zeromq support

66. By James Page

Update headers for templates

67. By James Page

Reorder zeromq inclusion

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

charm_lint_check #2229 neutron-api-next for gnuoy mp238881
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/neutron_api_hooks.py:31:1: F401 'os_release' imported but unused
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/10396131/
Build: http://10.245.162.77:8080/job/charm_lint_check/2229/

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

charm_unit_test #2018 neutron-api-next for gnuoy mp238881
    UNIT OK: passed

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

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

charm_amulet_test #2175 neutron-api-next for gnuoy mp238881
    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/10397170/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2175/

lp://qastaging/~openstack-charmers/charms/trusty/neutron-api/0mq updated
68. By James Page

Rebase

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

charm_lint_check #2685 neutron-api-next for gnuoy mp238881
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/neutron_api_hooks.py:31:1: F401 'os_release' imported but unused
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/10610022/
Build: http://10.245.162.77:8080/job/charm_lint_check/2685/

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

charm_unit_test #2476 neutron-api-next for gnuoy mp238881
    UNIT OK: passed

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

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

charm_amulet_test #2514 neutron-api-next for gnuoy mp238881
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 124
  make: *** [test] Error 124

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

lp://qastaging/~openstack-charmers/charms/trusty/neutron-api/0mq updated
69. By James Page

Make 0mq support >= kilo

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

charm_lint_check #2695 neutron-api-next for gnuoy mp238881
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/neutron_api_hooks.py:31:1: F401 'os_release' imported but unused
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/10610580/
Build: http://10.245.162.77:8080/job/charm_lint_check/2695/

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

charm_unit_test #2486 neutron-api-next for gnuoy mp238881
    UNIT OK: passed

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

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

charm_amulet_test #2524 neutron-api-next for gnuoy mp238881
    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/10610801/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2524/

lp://qastaging/~openstack-charmers/charms/trusty/neutron-api/0mq updated
70. By James Page

Tidy lint

71. By James Page

Rebase resync

72. By James Page

Rebase

73. By James Page

Rebase

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