Merge lp:~1chb1n/charms/trusty/ubuntu/amulet-sentry-unit-array into lp:charms/trusty/ubuntu

[Ryan Beisner]

Update amulet test: address sentry unit by array, as unit numbers increase with each bundletester reset.

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7717 ubuntu RB
    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/13107481/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7717/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #13106 ubuntu for 1chb1n mp276712
    LINT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7719 ubuntu for 1chb1n mp276712
    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/13107931/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7719/

[Ryan Beisner (1chb1n)]

FYI: bundletester, when run on the openstack provider with juju 1.25.0, gives false fails due to juju destroy-environment exiting non-zero after hitting this:

https://bugs.launchpad.net/juju-core/+bug/1512399

Observed in the test log, L222@ http://paste.ubuntu.com/13107931/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #13218 ubuntu for 1chb1n mp276712
    LINT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7773 ubuntu for 1chb1n mp276712
    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/13131250/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7773/

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1443/

review: Needs Fixing (automated testing)

[Antonio Rosales (arosales)]

In OSCI as well as in Charm CI the charm tests are passing.

The latest error I am seeing from OSCI above may be related to infrastructure as I see the following stack trace not around the charm but storage and bundle tester:

ERROR destroying storage: listing volumes: Get https://10.245.161.160:8776/v2/d2be765ac7a7490a899995bdad501cc6/volumes/detail: local error: record overflow
DEBUG:bundletester.utils:Updating JUJU_ENV: "osci-sv05" -> ""
Traceback (most recent call last):
  File ".venv/bin/bundletester", line 9, in <module>
    load_entry_point('bundletester==0.5.7', 'console_scripts', 'bundletester')()
  File "/var/lib/jenkins/checkout/ubuntu/.venv/local/lib/python2.7/site-packages/bundletester/tester.py", line 105, in main
    [report.emit(result) for result in run()]
  File "/var/lib/jenkins/checkout/ubuntu/.venv/local/lib/python2.7/site-packages/bundletester/runner.py", line 150, in __call__
    self.builder.destroy()
  File "/var/lib/jenkins/checkout/ubuntu/.venv/local/lib/python2.7/site-packages/bundletester/builder.py", line 81, in destroy
    '-y', self.env_name, '--force'])
  File "/usr/lib/python2.7/subprocess.py", line 540, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['juju', 'destroy-environment', '-y', 'osci-sv05', '--force']' returned non-zero exit status 1
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Given the small change set, and the passing tests on LXC I am giving this a +1. An ~openStack charmer or ~charmer will still need to give their +1 and officially merge the request.

-thanks,
Antonio

review: Approve (community)

[Charles Butler (lazypower)]

+1 LGTM. Automated environment schenanigans aside, this cleans up the amulet test suite and we have a green result on the public CI system.

Merged and pushed, thanks for the contribution Beisner.

review: Approve

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-07-27 14:15:40 +0000
+++ tests/basic_deployment.py	2015-11-04 22:15:16 +0000
@@ -22,7 +22,7 @@
     # Deploy services, wait for started state.  Fail or skip on timeout.
     try:
         d.setup(timeout=seconds)
-        sentry_unit = d.sentry.unit['ubuntu/0']
+        sentry_unit = d.sentry['ubuntu'][0]
     except amulet.helpers.TimeoutError:
         message = 'Deployment timed out ({}s)'.format(seconds)
         amulet.raise_status(amulet.FAIL, msg=message)