Merge lp:~gnuoy/charms/trusty/mysql/fix-six-bug into lp:charms/trusty/mysql

[Liam Young]

The recent charm helper sync introduced a bug when the charm is deployed on precise. This is the trusty version of the charm so it wasn't picked up. However, many people (rightly or wrongly) deploy the trusty version on precise and it'd be nice to get them in sync at some point. So, I've fixed the referenced bug for precise deploys.

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

UOSCI bot says:
charm_unit_test #1133 trusty-mysql for gnuoy mp243310
    UNIT FAIL: unit-test missing

UNIT Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_unit_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['nosetest', 'unit.test']
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full unit test output: http://paste.ubuntu.com/9333101/
Build: http://10.98.191.181:8080/job/charm_unit_test/1133/

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

UOSCI bot says:
charm_lint_check #1299 trusty-mysql for gnuoy mp243310
    LINT OK: passed

LINT Results (max last 5 lines):
INFO:root:command: make -f Makefile lint
  W: metadata name (mysql) must match directory name (trusty-mysql) exactly for local deployment.
  I: Categories are being deprecated in favor of tags. Please rename the "categories" field to "tags".
  I: config.yaml: option key has no default value
  I: config.yaml: option source has no default value

Full lint test output: http://paste.ubuntu.com/9333102/
Build: http://10.98.191.181:8080/job/charm_lint_check/1299/

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

UOSCI bot says:
charm_amulet_test #565 trusty-mysql for gnuoy mp243310
    AMULET FAIL: amulet-test missing

AMULET Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_amulet_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@juju test']
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/9333103/
Build: http://10.98.191.181:8080/job/charm_amulet_test/565/

[Ryan Beisner (1chb1n)]

Deploy tests succeed for precise-icehouse with the stable ('default') and development ('next') charm sets, when substituting both of these MPs:
      branch: lp:~gnuoy/charms/trusty/mysql/fix-six-bug
      branch: lp:~gnuoy/charms/trusty/ceph/fix-six-bug

review: Approve

[Corey Bryant (corey.bryant)]

LGTM and also tested successfully on next charm with precise-icehouse deployment.

review: Approve

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-10638-results

review: Needs Fixing (automated testing)

[Jorge Niedbalski (niedbalski)]

Tested on precise, works. LGTM.

review: Approve

=== modified file 'charm-helpers.yaml'
--- charm-helpers.yaml	2014-09-23 10:21:34 +0000
+++ charm-helpers.yaml	2014-12-01 17:20:00 +0000
@@ -1,6 +1,7 @@
 branch: lp:charm-helpers
 destination: hooks/charmhelpers
 include:
+    - __init__
     - core
     - fetch
     - contrib.network.ip

=== modified file 'hooks/charmhelpers/__init__.py'
--- hooks/charmhelpers/__init__.py	2014-02-19 14:49:31 +0000
+++ hooks/charmhelpers/__init__.py	2014-12-01 17:20:00 +0000
@@ -0,0 +1,22 @@
+# Bootstrap charm-helpers, installing its dependencies if necessary using
+# only standard libraries.
+import subprocess
+import sys
+
+try:
+    import six  # flake8: noqa
+except ImportError:
+    if sys.version_info.major == 2:
+        subprocess.check_call(['apt-get', 'install', '-y', 'python-six'])
+    else:
+        subprocess.check_call(['apt-get', 'install', '-y', 'python3-six'])
+    import six  # flake8: noqa
+
+try:
+    import yaml  # flake8: noqa
+except ImportError:
+    if sys.version_info.major == 2:
+        subprocess.check_call(['apt-get', 'install', '-y', 'python-yaml'])
+    else:
+        subprocess.check_call(['apt-get', 'install', '-y', 'python3-yaml'])
+    import yaml  # flake8: noqa