Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/performance-lowlatency-fix into ~canonical-kernel-team/+git/autotest-client-tests:master

[Po-Hsu Lin]

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

Installing linux-tools-generic and the linux-tools-VERSION-lowlatency
package altogether on a system running with lowlatency kernel will
cause dpkg error.

Remove the requirement for linux-tools-generic, as it's just a meta
package that pulls in linux-tools-VERSION-generic. Which will be done
with the following python code:
  'linux-tools-' + release

[Po-Hsu Lin (cypressyew)]

Patch running as uncommitted changes on maas@obruchev.

Tested with J-lowlatency and it's looking good.

[Po-Hsu Lin (cypressyew)]

Also tested with J-generic, this patch did not cause regression.

[Francis Ginther (fginther)]

+1

review: Approve

diff --git a/ubuntu_performance_pts/ubuntu_performance_pts.py b/ubuntu_performance_pts/ubuntu_performance_pts.py
index 5f23b5d..10ec868 100644
--- a/ubuntu_performance_pts/ubuntu_performance_pts.py
+++ b/ubuntu_performance_pts/ubuntu_performance_pts.py
@@ -108,7 +108,6 @@ class ubuntu_performance_pts(test.test):
             'libssl-dev',
             'libpng-dev',
             'autoconf',
-            'linux-tools-generic',
             'linux-tools-' + release,
             'numactl'
         ]
diff --git a/ubuntu_performance_stream/ubuntu_performance_stream.py b/ubuntu_performance_stream/ubuntu_performance_stream.py
index bbf805a..7f5c4a6 100644
--- a/ubuntu_performance_stream/ubuntu_performance_stream.py
+++ b/ubuntu_performance_stream/ubuntu_performance_stream.py
@@ -107,7 +107,6 @@ class ubuntu_performance_stream(test.test):
         pkgs = [
             'gfortran',
             'libgomp1',
-            'linux-tools-generic',
             'linux-tools-' + release
 
         ]