Juju Charms Collection
rabbitmq-server package

Merge lp://qastaging/~billy-olsen/charms/trusty/rabbitmq-server/lp1436014-ssl-fix into lp://qastaging/~openstack-charmers-archive/charms/trusty/rabbitmq-server/next

  1. Trusty Tahr (14.04)
  2. lp1436014-ssl-fix
  3. Merge into next
Proposed by Billy Olsen
Status: Merged
Merged at revision: 90
Proposed branch: lp://qastaging/~billy-olsen/charms/trusty/rabbitmq-server/lp1436014-ssl-fix
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/rabbitmq-server/next
Prerequisite: lp://qastaging/~billy-olsen/charms/trusty/rabbitmq-server/ch-sync
Diff against target: 3770 lines (+3162/-162)
31 files modified
Makefile (+3/-1)
charm-helpers-tests.yaml (+5/-0)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+1/-1)
hooks/charmhelpers/contrib/ssl/service.py (+10/-12)
tests/10-outofthebox-testing (+2/-2)
tests/10_basic_deploy_test.py (+7/-16)
tests/20-different-repositories (+37/-6)
tests/20_deploy_relations_test.py (+49/-12)
tests/30-switch-ssl (+29/-10)
tests/30_configuration_test.py (+13/-37)
tests/40_test_mirroring_queues.py (+4/-3)
tests/charmhelpers/__init__.py (+38/-0)
tests/charmhelpers/contrib/__init__.py (+15/-0)
tests/charmhelpers/contrib/ssl/__init__.py (+94/-0)
tests/charmhelpers/contrib/ssl/service.py (+283/-0)
tests/charmhelpers/core/__init__.py (+15/-0)
tests/charmhelpers/core/decorators.py (+57/-0)
tests/charmhelpers/core/fstab.py (+134/-0)
tests/charmhelpers/core/hookenv.py (+607/-0)
tests/charmhelpers/core/host.py (+450/-0)
tests/charmhelpers/core/services/__init__.py (+18/-0)
tests/charmhelpers/core/services/base.py (+329/-0)
tests/charmhelpers/core/services/helpers.py (+267/-0)
tests/charmhelpers/core/strutils.py (+42/-0)
tests/charmhelpers/core/sysctl.py (+56/-0)
tests/charmhelpers/core/templating.py (+68/-0)
tests/charmhelpers/core/unitdata.py (+477/-0)
tests/deploy_common.py (+52/-0)
tests/rabbit-server-cacert.pem (+0/-17)
tests/rabbit-server-cert.pem (+0/-18)
tests/rabbit-server-privkey.pem (+0/-27)
To merge this branch: bzr merge lp://qastaging/~billy-olsen/charms/trusty/rabbitmq-server/lp1436014-ssl-fix
Reviewer Review Type Date Requested Status
Ryan Beisner (community) Needs Fixing
Jorge Niedbalski (community) Approve
OpenStack Charmers Pending
Review via email: mp+256046@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 #3312 rabbitmq-server-next for billy-olsen mp256046
    LINT OK: passed

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

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

charm_unit_test #3100 rabbitmq-server-next for billy-olsen mp256046
    UNIT OK: passed

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

Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

Thanks for fixing LP: #1436014 billy. Minor code suggestions.

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

charm_amulet_test #3133 rabbitmq-server-next for billy-olsen mp256046
    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/10819070/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3133/

lp://qastaging/~billy-olsen/charms/trusty/rabbitmq-server/lp1436014-ssl-fix updated
91. By Billy Olsen

Move ssl code into common file per niedbalski's feedback.

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

charm_unit_test #3118 rabbitmq-server-next for billy-olsen mp256046
    UNIT OK: passed

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

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

charm_lint_check #3330 rabbitmq-server-next for billy-olsen mp256046
    LINT OK: passed

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

Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

+1 LGTM

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

charm_amulet_test #3151 rabbitmq-server-next for billy-olsen mp256046
    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/10823088/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3151/

lp://qastaging/~billy-olsen/charms/trusty/rabbitmq-server/lp1436014-ssl-fix updated
92. By Billy Olsen

Increase the timeouts to account for slower environment since the
--timeout parameter of `juju test` does not get propagated into the
actual amulet test.

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

charm_lint_check #3332 rabbitmq-server-next for billy-olsen mp256046
    LINT OK: passed

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

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

charm_unit_test #3120 rabbitmq-server-next for billy-olsen mp256046
    UNIT OK: passed

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

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

charm_amulet_test #3154 rabbitmq-server-next for billy-olsen mp256046
    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/10823822/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3154/

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

I suspect the 20-different-repositories test is timing out due to the need for arbitrary external http access.

That test should watch for the AMULET_HTTP_PROXY environment variable, and if it exists, set http_proxy and https_proxy equal to AMULET_HTTP_PROXY.

It may also be necessary to unset http_proxy and https_proxy after those calls are made, so that other traffic isn't proxied.

FYI, this is where it sat until the timeout was hit:
2015-04-14 20:30:57 INFO unit.rabbitmq-server/0.config-changed logger.go:40 Ign http://www.rabbitmq.com testing Release

review: Needs Fixing
lp://qastaging/~billy-olsen/charms/trusty/rabbitmq-server/lp1436014-ssl-fix updated
93. By Billy Olsen

Fix tests to use local charms, some other random fixes to get the
amulet tests passing

94. By Billy Olsen

Fix remaining amulet issues, lint, and http proxy settings for the
20-different-repositories test.

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

charm_unit_test #3168 rabbitmq-server-next for billy-olsen mp256046
    UNIT OK: passed

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

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

charm_lint_check #3380 rabbitmq-server-next for billy-olsen mp256046
    LINT OK: passed

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

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

charm_amulet_test #3161 rabbitmq-server-next for billy-olsen mp256046
    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/10825619/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3161/

lp://qastaging/~billy-olsen/charms/trusty/rabbitmq-server/lp1436014-ssl-fix updated
95. By Billy Olsen

Change environment checks for setting http-proxy to tolerate missing
env variables.

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

charm_unit_test #3169 rabbitmq-server-next for billy-olsen mp256046
    UNIT OK: passed

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

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

charm_lint_check #3381 rabbitmq-server-next for billy-olsen mp256046
    LINT OK: passed

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

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

charm_amulet_test #3162 rabbitmq-server-next for billy-olsen mp256046
    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/10825748/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3162/

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

charm_amulet_test #3164 rabbitmq-server-next for billy-olsen mp256046
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
ERROR subprocess encountered error code 1
ERROR:root:Make target returned non-zero.

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

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

charm_amulet_test #3165 rabbitmq-server-next for billy-olsen mp256046
    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/10826059/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3165/

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

charm_amulet_test #3167 rabbitmq-server-next for billy-olsen mp256046
    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/10826276/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3167/

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

I believe the 20-* test is failing on this, because there is still an http_proxy and/or https_proxy set when juju tries to make an operation.

00:14:05.181 ERROR cannot add unit 1/1 to service "rabbitmq-server": cannot add unit to service "rabbitmq-server": authentication failed.

Generally speaking, this is what needs to be done:

1. set proxies
2. do the thing that requires the proxy
3. unset proxies
4. proceed to deploy and test

review: Needs Fixing
lp://qastaging/~billy-olsen/charms/trusty/rabbitmq-server/lp1436014-ssl-fix updated
96. By Billy Olsen

Disable the test 20-different-repositories for now until the proxy settings
can be worked out for use by osci.

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

charm_lint_check #3421 rabbitmq-server-next for billy-olsen mp256046
    LINT OK: passed

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

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

charm_unit_test #3209 rabbitmq-server-next for billy-olsen mp256046
    UNIT OK: passed

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

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

charm_amulet_test #3216 rabbitmq-server-next for billy-olsen mp256046
    AMULET OK: passed

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

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

\o/

lp://qastaging/~billy-olsen/charms/trusty/rabbitmq-server/lp1436014-ssl-fix updated
97. By Billy Olsen

Sync charmhelpers to pickup ssl fix

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

charm_lint_check #3425 rabbitmq-server-next for billy-olsen mp256046
    LINT OK: passed

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

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

charm_unit_test #3213 rabbitmq-server-next for billy-olsen mp256046
    UNIT OK: passed

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

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

charm_amulet_test #3223 rabbitmq-server-next for billy-olsen mp256046
    AMULET OK: passed

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

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