Merge ~mthaddon/mojo/+git/mojo-specs:remove-canonical-livepatch into ~mojo-maintainers/mojo/+git/mojo-specs:master

[Tom Haddon]

Remove canonical-livepatch charm-testing stage - duplicate of livepatch

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 645d8db20a1c482c095906d7162661b2f1e40fb8

diff --git a/charm-testing/canonical-livepatch/deploy b/charm-testing/canonical-livepatch/deploy
deleted file mode 100644
index e278477..0000000
--- a/charm-testing/canonical-livepatch/deploy
+++ /dev/null
@@ -1,21 +0,0 @@
-ubuntu:
-    series: {{series}}
-    services:
-        ubuntu:
-            charm: ubuntu
-        canonical-livepatch:
-            charm: canonical-livepatch
-            options:
-                livepatch_key: include-file://{{local_dir}}/canonical-is-livepatch.key
-        nrpe:
-            charm: nrpe
-            options:
-                nagios_master: nagios1.internal
-{%- if series != "trusty" %}
-                procs: '-w 200 -c 250 -k'
-                swap: '-w 90% -c 75% -n ok'
-{%- endif %}
-    relations:
-       - ["ubuntu", "nrpe"]
-       - ["ubuntu", "canonical-livepatch"]
-       - ["canonical-livepatch", "nrpe"]
diff --git a/charm-testing/canonical-livepatch/pre-deploy b/charm-testing/canonical-livepatch/pre-deploy
deleted file mode 100755
index 4e84792..0000000
--- a/charm-testing/canonical-livepatch/pre-deploy
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# If we don't have a secrets file, just copy the deploy file to deploy-secrets
-if [ ! -f ${MOJO_LOCAL_DIR}/deploy-secrets ]; then
-    echo "Copying ${MOJO_SPEC_DIR}/charm-testing/canonical-livepatch/deploy to ${MOJO_LOCAL_DIR}/deploy-secrets"
-    cp ${MOJO_SPEC_DIR}/charm-testing/canonical-livepatch/deploy ${MOJO_LOCAL_DIR}/deploy-secrets
-fi