Merge ~bladernr/plainbox-provider-checkbox:fix-efi-boot-test into plainbox-provider-checkbox:master

[Jeff Lane ]

bin/boot_mode_test: test now returns 0 regardless of test run when executed on a release older than 16.04. It also provides an output message letting you know that it's not a blocker on releases older than 16.04.

[Maciej Kisielewski (kissiel)]

Once concern regarding version check, and one nitpick inline.
+0.999 (that version stuff :)

review: Approve

[Jeff Lane  (bladernr)]

Good points on both. I changed the version check behaviour. Was really hoping for something programatic like doing deb package version checks, but AFAIK, none such exists.

So the cleanest thing is to just grab the year from each release, cast that to an int and do a straight forward int compare, since ultimately, we only care that the release is newer than 2016 anyway.

[Jeff Lane  (bladernr)]

Going ahead and setting this to be merged since Maciej already approved and my changes now are just to address the concern he had. Functionality is still the same.

diff --git a/bin/boot_mode_test b/bin/boot_mode_test
index d4c2956..330bb2b 100755
--- a/bin/boot_mode_test
+++ b/bin/boot_mode_test
@@ -24,6 +24,35 @@ import os
 import sys
 import logging
 from argparse import ArgumentParser
+from platform import linux_distribution
+
+
+def version_check(check):
+    """Check the installed Ubuntu version to see if it is older than 16.04
+    (Xenial) and run the requested check
+
+    :returns:
+        0 if if the installed version is older than 16.04 regardless of return
+        code from the requested check
+
+        return code from requested check if the installed version is 16.04 or
+        newer.
+    """
+    installed_version = int(linux_distribution()[1].split()[0])
+    if installed_version < 16:
+        logging.info("This system appears to be older than 16.04 LTS so this "
+                     "will not block a certification in progress.")
+        if check == 'efi':
+            efi_boot_check()
+        else:
+            secure_boot_check()
+        
+        return 0
+    else:
+        if check == 'efi':
+            return efi_boot_check()
+        else:
+            return secure_boot_check()
 
 
 def efi_boot_check():
@@ -86,11 +115,7 @@ def main():
 
     FORMAT = '%(levelname)s: %(message)s'
     logging.basicConfig(level=logging.INFO, format=FORMAT)
-    if args.check == 'efi':
-        return efi_boot_check()
-    else:
-        return secure_boot_check()
-
+    return version_check(args.check)
 
 if __name__ == '__main__':
     sys.exit(main())