Merge ~canonical-kernel-team/+git/autotest-client-tests:WIP into ~canonical-kernel-team/+git/autotest-client-tests:master

[Po-Hsu Lin]

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

Some of the CVE tests will check the kernel taint flag to determine if
the test pass or not.

So if some other test failed before the CVE subset, like the
read_all_sys in the fs subset (bug 1973153), it will cause
false-positive failures.

It can also reduce the ubuntu_ltp execution time, avoid test being
killed by the 4hrs jenkins timeout threshold. Another benefit to pull
this out is that we can have more flexibility to select what we want
to test.

The downside is the time cost for one extra deployment for this job.

Patch tested with a KVM instance with Focal 5.4

The test will take about 30 minutes to run on it.

This change should be applied along with the change for CKCT.

[Po-Hsu Lin (cypressyew)]

It's a good timing to push this out.

diff --git a/ubuntu_ltp/control b/ubuntu_ltp/control
index 4a63f0e..25d70a2 100644
--- a/ubuntu_ltp/control
+++ b/ubuntu_ltp/control
@@ -16,7 +16,7 @@ if result == 'ERROR':
 else:
     categories = [
         'fs',         'mm',  'irq',    'sched', 'pty',
-        'cpuhotplug', 'cve', 'crypto', 'uevent'
+        'cpuhotplug', 'crypto', 'uevent'
     ]
     blacklist = ['oom01', 'oom02', 'oom03', 'oom04' ,'oom05', 'mkswap01_sh'] # oom* (lp:1847963), mkswap01_sh (lp:1830584)
     for category in categories:
diff --git a/ubuntu_ltp_cve/blacklist.precise b/ubuntu_ltp_cve/blacklist.precise
new file mode 100644
index 0000000..27ba77d
--- /dev/null
+++ b/ubuntu_ltp_cve/blacklist.precise
@@ -0,0 +1 @@
+true
diff --git a/ubuntu_ltp_cve/blacklist.trusty b/ubuntu_ltp_cve/blacklist.trusty
new file mode 100644
index 0000000..27ba77d
--- /dev/null
+++ b/ubuntu_ltp_cve/blacklist.trusty
@@ -0,0 +1 @@
+true
diff --git a/ubuntu_ltp_cve/blacklist.xenial b/ubuntu_ltp_cve/blacklist.xenial
new file mode 100644
index 0000000..27ba77d
--- /dev/null
+++ b/ubuntu_ltp_cve/blacklist.xenial
@@ -0,0 +1 @@
+true
diff --git a/ubuntu_ltp_cve/control b/ubuntu_ltp_cve/control
new file mode 100644
index 0000000..1e094cf
--- /dev/null
+++ b/ubuntu_ltp_cve/control
@@ -0,0 +1,27 @@
+AUTHOR = "Ubuntu"
+NAME = "ubuntu_ltp_cve"
+CRITERIA = """
+Use the upstream LTP repository
+"""
+SUITE = "None"
+TIME = "MEDIUM"
+TEST_CLASS = 'kernel'
+TEST_CATEGORY = 'Functional'
+TEST_TYPE = "client"
+DOC = ""
+
+result = job.run_test_detail(NAME, test_name='setup', tag='setup', timeout=40*60)
+if result == 'ERROR':
+    print("ERROR: test failed to build, skipping all the sub tests")
+else:
+    fn = '/opt/ltp/runtest/cve'
+    with open(fn , 'r') as f:
+        for line in f:
+            if line.strip() and not line.startswith('#'):
+                with open ('/tmp/target' , 'w') as t:
+                    t.write(line)
+                testcase = line.split()[0]
+                timeout_threshold = 60*30
+                job.run_test_detail(NAME, test_name=testcase, tag=testcase, timeout=timeout_threshold)
+
+# vi:set ts=4 sw=4 expandtab syntax=python:
diff --git a/ubuntu_ltp_cve/ubuntu_ltp_cve.py b/ubuntu_ltp_cve/ubuntu_ltp_cve.py
new file mode 100644
index 0000000..3647578
--- /dev/null
+++ b/ubuntu_ltp_cve/ubuntu_ltp_cve.py
@@ -0,0 +1,135 @@
+#
+#
+import multiprocessing
+import os
+import platform
+import re
+import shutil
+from autotest.client                        import test, utils
+
+class ubuntu_ltp_cve(test.test):
+    version = 1
+
+    def install_required_pkgs(self):
+        try:
+            series = platform.dist()[2]
+        except AttributeError:
+            import distro
+            series = distro.codename()
+
+        pkgs = [
+            'automake',
+            'bison',
+            'build-essential',
+            'byacc',
+            'flex',
+            'git',
+            'keyutils',
+            'libacl1-dev',
+            'libaio-dev',
+            'libcap-dev',
+            'libmm-dev',
+            'libnuma-dev',
+            'libsctp-dev',
+            'libselinux1-dev',
+            'libssl-dev',
+            'libtirpc-dev',
+            'pkg-config',
+            'quota',
+            'xfslibs-dev',
+            'xfsprogs',
+        ]
+        gcc = 'gcc' if self.arch in ['ppc64le', 'aarch64', 's390x', 'riscv64'] else 'gcc-multilib'
+        pkgs.append(gcc)
+
+        if any(x in self.flavour for x in ['aws', 'azure', 'gcp', 'gke']):
+            pkgs.append('linux-modules-extra-' + platform.uname()[2])
+
+        cmd = 'yes "" | DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes ' + ' '.join(pkgs)
+        self.results = utils.system_output(cmd, retain_output=True)
+
+    def initialize(self):
+        self.flavour = re.split('-\d*-', platform.uname()[2])[-1]
+        self.arch = platform.processor()
+
+    # setup
+    #
+    #    Automatically run when there is no autotest/client/tmp/<test-suite> directory
+    #
+    def setup(self):
+        self.install_required_pkgs()
+        self.job.require_gcc()
+        os.chdir(self.srcdir)
+        shutil.rmtree('ltp', ignore_errors=True)
+        branch = 'sru'
+        cmd = 'git clone -b {} git://git.launchpad.net/~canonical-kernel-team/+git/ltp'.format(branch)
+        utils.system_output(cmd, retain_output=True)
+
+        # Print test suite HEAD SHA1 commit id for future reference
+        os.chdir(os.path.join(self.srcdir, 'ltp'))
+        title_local = utils.system_output("git log --oneline -1 | sed 's/(.*)//'", retain_output=False, verbose=False)
+        title_upstream = utils.system_output("git log --oneline | grep -v SAUCE | head -1", retain_output=False, verbose=False)
+        print("Latest commit in '{}' branch: {}".format(branch, title_local))
+        print("Latest upstream commit: {}".format(title_upstream))
+
+        # Disable NTFS as we disable RW support
+        cmd = 'sed -i /ntfs/d lib/tst_supported_fs_types.c'
+        utils.system_output(cmd)
+
+        utils.make('autotools')
+        utils.configure()
+        try:
+            nprocs = '-j' + str(multiprocessing.cpu_count())
+        except:
+            nprocs = ''
+        utils.make(nprocs)
+        utils.make('install')
+
+
+    # run_once
+    #
+    #    Driven by the control file for each individual test.
+    #
+    def run_once(self, test_name):
+        if test_name == 'setup':
+            return
+
+        # PHLin - LTP 20220527, most of the default timeout is now just 30 seconds instead of 5 mins, mulitplier must be modified
+        LTP_TIMEOUT_MUL = '50'
+
+        if test_name == 'zram01':
+            print("Setting LTP_TIMEOUT_MUL={} for zram01 test (lp:1897556)".format(LTP_TIMEOUT_MUL))
+            os.environ["LTP_TIMEOUT_MUL"] = LTP_TIMEOUT_MUL
+        elif test_name in ['cve-2018-1000204', 'ioctl_sg01']:
+            print("Setting LTP_TIMEOUT_MUL={} for cve-2018-1000204 / ioctl_sg01 (lp:1899413, lp:1936886, lp:1949934, lp:1955629)".format(LTP_TIMEOUT_MUL))
+            os.environ["LTP_TIMEOUT_MUL"] = LTP_TIMEOUT_MUL
+        elif test_name == 'cve-2017-5754':
+            print("Setting LTP_TIMEOUT_MUL={} for cve-2017-5754 (lp:1981780)".format(LTP_TIMEOUT_MUL))
+            os.environ["LTP_TIMEOUT_MUL"] = LTP_TIMEOUT_MUL
+        elif test_name in ['cve-2017-15299', 'cve-2017-15951']:
+            print("Setting LTP_TIMEOUT_MUL={} for cve-2017-15299 / cve-2017-15951 (lp:1983299)")
+            os.environ["LTP_TIMEOUT_MUL"] = LTP_TIMEOUT_MUL
+        elif test_name == 'fs_fill':
+            print("Setting LTP_TIMEOUT_MUL={} for fs_fill".format(LTP_TIMEOUT_MUL))
+            os.environ["LTP_TIMEOUT_MUL"] = LTP_TIMEOUT_MUL
+        elif test_name == 'read_all_proc':
+            print("Setting LTP_TIMEOUT_MUL={} for read_all_proc".format(LTP_TIMEOUT_MUL))
+            os.environ["LTP_TIMEOUT_MUL"] = LTP_TIMEOUT_MUL
+        elif test_name == 'read_all_sys':
+            print("Setting LTP_TIMEOUT_MUL={} for read_all_sys".format(LTP_TIMEOUT_MUL))
+            os.environ["LTP_TIMEOUT_MUL"] = LTP_TIMEOUT_MUL
+
+        cmd = '/opt/ltp/runltp -f /tmp/target -q -C /dev/null -l /dev/null -T /dev/null'
+        print(utils.system_output(cmd, verbose=False))
+        # /dev/loop# creation will be taken care by the runltp
+
+    def cleanup(self, test_name):
+        if test_name == 'setup':
+            return
+
+        # Restore the timeout multiplier
+        if 'LTP_TIMEOUT_MUL' in os.environ:
+            print("Restore timeout multiplier LTP_TIMEOUT_MUL back to default")
+            del os.environ["LTP_TIMEOUT_MUL"]
+
+# vi:set ts=4 sw=4 expandtab syntax=python: