Merge lp:~mthaddon/mojo/charm-testing-mojo-specs into lp:mojo/mojo-specs

[Tom Haddon]

Proof of concept specs for charm testing. Will need some discussion (and some changes to Mojo) so just WIP for now.

[Tom Haddon (mthaddon)]

This is now ready for review

[Stuart Bishop (stub)]

This looks good. A few issues inline. 1) I am bash challenged 2) most of the time the upgrade test will be a noop so we should skip it in this case.

review: Approve

[lp:~mthaddon/mojo/charm-testing-mojo-specs]

44. By Tom Haddon on 2016-07-28

Only do an upgrade test if we set UPGRADE_CHARM

[Tom Haddon (mthaddon)]

This depends on https://code.launchpad.net/~mthaddon/mojo/env-variable-unset/+merge/301395 to work as expected, fwiw.

=== added directory 'charm-testing'
=== added file 'charm-testing/README'
--- charm-testing/README	1970-01-01 00:00:00 +0000
+++ charm-testing/README	2016-07-28 14:53:46 +0000
@@ -0,0 +1,32 @@
+The "charm-testing" stages found here are designed, as the name implies for
+testing charms. To run it you need to:
+
+ * export JUJU_ENV
+ * export UPGRADE_CHARM as the URL of the charm you want to test an upgrade to
+ * use the "stage" (e.g. charm-testing/haproxy) based on which charm you want
+   to test
+
+It works in the following way:
+
+ * Bootstraps a juju environment
+ * Pulls down the upstream charm in question (e.g. haproxy) along with any
+   other charms that are defined in the collect step as being needed to test
+   the charm in question. As an example, for haproxy you may want to deploy
+   an apache2 server in front of it and an application server with 3 units
+   behind it. 
+ * Deploys those charms in the configuration defined in the "deploy" file
+   within the relevant directory
+ * Tests a charm upgrade to whatever was defined in the UPGRADE_CHARM variable
+ * Tears down the environment and redeploys with the charm as defined in
+   UPGRADE_CHARM. This ensures that you can also install the new charm from
+   scratch as well as having verified a charm upgrade.
+
+If you have a new charm that you'd like to test using this approach, you can
+propose a merge to this branch with the following:
+
+ * A new directory named for the charm in question in charm-testing (e.g.
+   telegraf)
+ * A deploy and collect file defining what the upstream versions of the charms
+   you want to test, with their options and relations
+ * Optionally a pre-deploy and post-deploy script that will override the
+   current ones that do nothing.

=== added file 'charm-testing/check-upgrade-charm'
--- charm-testing/check-upgrade-charm	1970-01-01 00:00:00 +0000
+++ charm-testing/check-upgrade-charm	2016-07-28 14:53:46 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ -n "$UPGRADE_CHARM" ]; then
+    echo "Upgrade charm set to $UPGRADE_CHARM ; proceeding..."
+    exit 0
+fi
+
+echo "Upgrade charm (UPGRADE_CHARM environment variable) not set. Exiting..."
+exit 99

=== added file 'charm-testing/create-upgrade-collect'
--- charm-testing/create-upgrade-collect	1970-01-01 00:00:00 +0000
+++ charm-testing/create-upgrade-collect	2016-07-28 14:53:46 +0000
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Our expected MOJO_STAGE would be something like 'charm-testing/postgresql' so
+# this would be set to 'postgresql'
+CHARM=${MOJO_STAGE##*/}
+# If we have a charm directory already, let's remove it in case the new
+# version is a different type (bzr, git, charmstore, etc.)
+cd ${MOJO_BUILD_DIR}
+[ -d ${CHARM} ] && rm -rf ${CHARM}
+# Now create a collect file we can use in the next phase to download the new
+# charm we want to test
+cd ${MOJO_SPEC_DIR}/${MOJO_STAGE}
+echo "${CHARM} ${UPGRADE_CHARM}" > collect-upgrade

=== added directory 'charm-testing/haproxy'
=== added file 'charm-testing/haproxy/collect'
--- charm-testing/haproxy/collect	1970-01-01 00:00:00 +0000
+++ charm-testing/haproxy/collect	2016-07-28 14:53:46 +0000
@@ -0,0 +1,2 @@
+haproxy     lp:charms/trusty/haproxy
+nrpe        cs:{{ series }}/nrpe

=== added file 'charm-testing/haproxy/deploy'
--- charm-testing/haproxy/deploy	1970-01-01 00:00:00 +0000
+++ charm-testing/haproxy/deploy	2016-07-28 14:53:46 +0000
@@ -0,0 +1,12 @@
+haproxy:
+    series: {{series}}
+    services:
+        haproxy:
+            charm: haproxy
+        nrpe:
+            charm: nrpe
+            {% if series == "xenial" %}options:
+                procs: '-w 200 -c 250'
+                swap: '-w 90% -c 75% -n ok'{% endif %}
+    relations:
+       - ["haproxy", "nrpe:nrpe-external-master"]     

=== added file 'charm-testing/juju-bootstrap'
--- charm-testing/juju-bootstrap	1970-01-01 00:00:00 +0000
+++ charm-testing/juju-bootstrap	2016-07-28 14:53:46 +0000
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+juju bootstrap

=== added file 'charm-testing/juju-destroy-environment'
--- charm-testing/juju-destroy-environment	1970-01-01 00:00:00 +0000
+++ charm-testing/juju-destroy-environment	2016-07-28 14:53:46 +0000
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+juju destroy-environment -y $JUJU_ENV

=== added file 'charm-testing/manifest'
--- charm-testing/manifest	1970-01-01 00:00:00 +0000
+++ charm-testing/manifest	2016-07-28 14:53:46 +0000
@@ -0,0 +1,23 @@
+## Required environment variables: UPGRADE_CHARM, JUJU_ENV
+script config=juju-bootstrap
+# Collect, pre-deploy (lint, etc.) deploy and check the initial charm
+collect config=collect
+script config=pre-deploy
+deploy config=deploy wait=true
+nagios-check retry=3 sleep=60
+verify config=post-deploy
+# Now test an upgrade to the new charm if UPGRADE_CHARM is set
+stop-on return-code=99 config=check-upgrade-charm UPGRADE_CHARM=${UPGRADE_CHARM}
+script config=create-upgrade-collect UPGRADE_CHARM=${UPGRADE_CHARM}
+collect config=collect-upgrade
+script config=upgrade-charm
+juju-check-wait
+nagios-check
+verify config=post-deploy
+# Now tear down the env, and test a deployment from scratch (with the updated charm in place)
+script config=juju-destroy-environment JUJU_ENV=$JUJU_ENV
+script config=juju-bootstrap
+script config=pre-deploy
+deploy config=deploy wait=true
+nagios-check retry=3 sleep=60
+verify config=post-deploy

=== added file 'charm-testing/post-deploy'
--- charm-testing/post-deploy	1970-01-01 00:00:00 +0000
+++ charm-testing/post-deploy	2016-07-28 14:53:46 +0000
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+echo "No post-deploy steps currently for this service."
+echo " To create post-deploy steps (e2e service checks, etc.) create an "
+echo " executable script in the specific directory for the service in "
+echo " question which will override this one."
+
+exit 0

=== added directory 'charm-testing/postgresql'
=== added file 'charm-testing/postgresql/collect'
--- charm-testing/postgresql/collect	1970-01-01 00:00:00 +0000
+++ charm-testing/postgresql/collect	2016-07-28 14:53:46 +0000
@@ -0,0 +1,2 @@
+postgresql  cs:{{ series }}/postgresql
+nrpe        cs:{{ series }}/nrpe

=== added file 'charm-testing/postgresql/deploy'
--- charm-testing/postgresql/deploy	1970-01-01 00:00:00 +0000
+++ charm-testing/postgresql/deploy	2016-07-28 14:53:46 +0000
@@ -0,0 +1,12 @@
+postgresql:
+    series: {{series}}
+    services:
+        postgresql:
+            charm: postgresql
+        nrpe:
+            charm: nrpe
+            {% if series == "xenial" %}options:
+                procs: '-w 200 -c 250'
+                swap: '-w 90% -c 75% -n ok'{% endif %}
+    relations:
+       - ["postgresql", "nrpe:nrpe-external-master"]     

=== added file 'charm-testing/pre-deploy'
--- charm-testing/pre-deploy	1970-01-01 00:00:00 +0000
+++ charm-testing/pre-deploy	2016-07-28 14:53:46 +0000
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+echo "No pre-deploy steps currently for this service."
+echo " To create pre-deploy steps (lint checks, etc.) create an executable"
+echo " script in the specific directory for the service in question,"
+echo " which will override this one."
+
+exit 0

=== added file 'charm-testing/upgrade-charm'
--- charm-testing/upgrade-charm	1970-01-01 00:00:00 +0000
+++ charm-testing/upgrade-charm	2016-07-28 14:53:46 +0000
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+CHARM=${MOJO_STAGE##*/}
+
+export JUJU_REPOSITORY=$MOJO_REPO_DIR
+echo "About to upgrade $CHARM"
+juju upgrade-charm $CHARM