Merge lp:~james-page/charms/trusty/mysql/forward-compat-xenial into lp:charms/trusty/mysql

[James Page]

[lp:~james-page/charms/trusty/mysql/forward-compat-xenial]

158. By James Page on 2016-02-26

Fix perms

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

charm_lint_check #1545 mysql for james-page mp287311
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1545/

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

charm_unit_test #1296 mysql for james-page mp287311
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1296/

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

charm_amulet_test #544 mysql for james-page mp287311
    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/15206495/
Build: http://10.245.162.36:8080/job/charm_amulet_test/544/

[lp:~james-page/charms/trusty/mysql/forward-compat-xenial]

159. By James Page on 2016-02-26

Disable xenial tests for now as the keystone charm is not currently compat

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

charm_lint_check #1549 mysql for james-page mp287311
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1549/

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

charm_unit_test #1298 mysql for james-page mp287311
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1298/

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

charm_amulet_test #546 mysql for james-page mp287311
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/546/

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

charm_lint_check #1733 mysql for james-page mp287311
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1733/

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

charm_unit_test #1471 mysql for james-page mp287311
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1471/

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

charm_amulet_test #617 mysql for james-page mp287311
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/617/

[Ryan Beisner (1chb1n)]

review: Approve

[Ryan Beisner (1chb1n)]

+1 on this work-around and the mongodb change to un-wedge xenial. It's not deployable at all after the python27 removal in xenial-dev, and that blocks a lot of other things that are inter-related on mysql and mongodb.

=== added file 'hooks/install'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2016-02-26 15:45:59 +0000
@@ -0,0 +1,20 @@
+#!/bin/bash
+# Wrapper to deal with newer Ubuntu versions that don't have py2 installed
+# by default.
+
+declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml')
+
+check_and_install() {
+    pkg="${1}-${2}"
+    if ! dpkg -s ${pkg} 2>&1 > /dev/null; then
+        apt-get -y install ${pkg}
+    fi
+}
+
+PYTHON="python"
+
+for dep in ${DEPS[@]}; do
+    check_and_install ${PYTHON} ${dep}
+done
+
+exec ./hooks/install.real

=== renamed file 'hooks/install' => 'hooks/install.real'