Merge ~bladernr/plainbox-provider-checkbox:improve-maas-version-check into plainbox-provider-checkbox:master

[Jeff Lane ]

Improve the MAAS version check. Now it will fail if the MAAS version is < 2.0, as well as still fail if the file is not present.

[Maciej Kisielewski (kissiel)]

The helper looks good.
I've looked for old jobs that this (stronger version requirement) could break - none found.
Overall +1. Thanks!

review: Approve

diff --git a/bin/maas-version-check b/bin/maas-version-check
new file mode 100755
index 0000000..412717d
--- /dev/null
+++ b/bin/maas-version-check
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# Copyright (C) 2012-2015 Canonical Ltd.
+
+# Authors
+#  Jeff Lane <[e-mail]>
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3,
+# as published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+MAAS_FILE="/etc/installed-by-maas"
+MIN_VERSION="2.0"
+
+# Is the file there?
+if [ -s $MAAS_FILE ]; then
+    maas_version=`cat $MAAS_FILE`
+    echo $maas_version
+else
+    echo "ERROR: This system does not appear to have been installed by MAAS"
+    exit 1
+fi
+
+#is the version appropriate
+exit `dpkg --compare-versions $maas_version "ge" $MIN_VERSION`
diff --git a/jobs/miscellanea.txt.in b/jobs/miscellanea.txt.in
index e018be5..80ccf02 100644
--- a/jobs/miscellanea.txt.in
+++ b/jobs/miscellanea.txt.in
@@ -289,15 +289,9 @@ plugin: shell
 category_id: 2013.com.canonical.plainbox::miscellanea
 estimated_duration: 0.1
 id: miscellanea/get_maas_version
-command:
- if [ -s /etc/installed-by-maas ]; then 
-   cat /etc/installed-by-maas
- else
-   echo "MAAS VERSION NOT FOUND" >&2
-   false
- fi
+command: maas-version-check
 _description: If system was installed via MAAS from a cert server, the MAAS version used should be contained in /etc/installed-by-maas
-_summary: Attach MAAS version used to deploy the SUT
+_summary: Verify MAAS version used to deploy the SUT
 
 plugin: shell
 category_id: 2013.com.canonical.plainbox::miscellanea