Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/ovl-smk-older-releases into ~canonical-kernel-team/+git/autotest-client-tests:master

[Po-Hsu Lin]

BugLink: https://bugs.launchpad.net/bugs/2032779

We have decided to run just the old ubuntu_overlayfs_smoke_test.sh test
on older release (< Focal). As the purpose of the new overlayfs/shift
tests is to have a better understanding of the custom features that we
bring as SAUCE patches and to make sure that newer kernels don't regress.

This would require changes in the overlay-shiftfs-tests repo as well.

[Francis Ginther (fginther)]

+1

review: Approve

[Sean Feole (sfeole)]

+1

review: Approve

[Francis Ginther (fginther)]

Appears to be applied, marked as merged.

diff --git a/ubuntu_overlayfs_smoke_test/control b/ubuntu_overlayfs_smoke_test/control
index baf2fbb..4471845 100644
--- a/ubuntu_overlayfs_smoke_test/control
+++ b/ubuntu_overlayfs_smoke_test/control
@@ -12,6 +12,12 @@ DOC = "Test basic and sauce patch overlay/shiftfs functionality"
 
 name = 'ubuntu_overlayfs_smoke_test'
 
+try:
+    series = platform.dist()[2]
+except AttributeError:
+    import distro
+    series = distro.codename()
+
 # For skipping specific unit tests in incompatible environments
 SKIP_LIST = [
 ]
@@ -26,6 +32,9 @@ if result == 'GOOD':
     if 'shiftfs-hung.sh' in tests_list:
         tests_list.remove('shiftfs-hung.sh')
         tests_list.append('shiftfs-hung.sh')
+    # Just run the old ubuntu_overlayfs_smoke_test.sh test on older releases LP: #2032779
+    if 'ubuntu_overlayfs_smoke_test.sh' and series in ['trusty', 'xenial', 'bionic']:
+        tests_list = ['ubuntu_overlayfs_smoke_test.sh']
     for test in tests_list:
         if test in SKIP_LIST:
             print("SKIPPED: " + test)