Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/bt-core-apt into ~canonical-kernel-team/+git/autotest-client-tests:master

[Po-Hsu Lin]

* UBUNTU: SAUCE: ubuntu_boot: print OS info with os-release file

KERNTT-464
Use /etc/os-release for printing out OS information. So that we don't
need to have extra dependency for using lsb_release command on core
systems.

* UBUNTU: SAUCE: ubuntu_boot: skip apt commands on core system

KERNTT-464
There is no apt command on Ubuntu Core system. Detect if we are running
on a core system by checking for "snapd_recovery_mode" in /proc/cmdline

Package dependency will be handled by snapcraft.

* UBUNTU: SAUCE: ubuntu_boot: rename control file

KERNTT-464
Rename control file from control.ubuntu to control. It's the only way
to allow autotest to recognize the test without specifying where the
control file is.

With this change you can run it with something like:
  autotest/client/autotest-local run ubuntu_boot

This is essential for snap testing as we will need to ship tests
along with autotest.

Breaking my ubuntu_boot test tweaks for core systems into a couple of easy-to-review small pieces.

[Sean Feole (sfeole)]

+1 from me Thanks for these

review: Approve

[Francis Ginther (fginther)]

Looks good

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed.

diff --git a/ubuntu_boot/control.ubuntu b/ubuntu_boot/control
similarity index 100%
rename from ubuntu_boot/control.ubuntu
rename to ubuntu_boot/control
diff --git a/ubuntu_boot/ubuntu_boot.py b/ubuntu_boot/ubuntu_boot.py
index 2d813e0..4690094 100644
--- a/ubuntu_boot/ubuntu_boot.py
+++ b/ubuntu_boot/ubuntu_boot.py
@@ -8,9 +8,14 @@ from autotest.client.shared import error
 class ubuntu_boot(test.test):
     version = 1
     def setup(self):
-        pkgs = [ 'python3', 'keyutils' ]
-        cmd = 'yes "" | DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes ' + ' '.join(pkgs)
-        self.results = utils.system_output(cmd, retain_output=True)
+        with open('/proc/cmdline', 'r') as fh:
+            content = fh.read()
+        if 'snapd_recovery_mode' in content:
+            print('Running Ubuntu Core system, skipping apt commands.')
+        else:
+            pkgs = [ 'python3', 'keyutils' ]
+            cmd = 'yes "" | DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes ' + ' '.join(pkgs)
+            self.results = utils.system_output(cmd, retain_output=True)
 
     def log_check(self):
         '''Test for checking error patterns in log files'''
@@ -94,5 +99,5 @@ class ubuntu_boot(test.test):
 
         cmd = "uname -a"
         utils.system(cmd)
-        cmd = "lsb_release -a"
+        cmd = "cat /etc/os-release"
         utils.system(cmd)