[PATCH 6/7] UBUNTU: SAUCE: ubuntu_quota_smoke_test: Install the linux-modules-extra package matching the running kernel

[Francis Ginther]

Install the linux-modules-extra package matching the running kernel
instead of doing a wildcard match on the kernel flavour. The wildcard
may match packages that are uninstallable.

Signed-off-by: Francis Ginther <francis.ginther at canonical.com>
---
 ubuntu_quota_smoke_test/ubuntu_quota_smoke_test.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ubuntu_quota_smoke_test/ubuntu_quota_smoke_test.py b/ubuntu_quota_smoke_test/ubuntu_quota_smoke_test.py
index a2cae55c..50fb8081 100755
--- a/ubuntu_quota_smoke_test/ubuntu_quota_smoke_test.py
+++ b/ubuntu_quota_smoke_test/ubuntu_quota_smoke_test.py
@@ -17,13 +17,10 @@ class ubuntu_quota_smoke_test(test.test):
             series = distro.codename()
 
         pkgs = [
+            'linux-modules-extra-' + platform.uname()[2],
             'quota',
         ]
 
-        flavour = re.split('-\d*-', platform.uname()[2])[-1]
-        if flavour in ['aws', 'azure', 'azure-fips', 'gcp', 'gcp-fips', 'gke', 'gkeop']:
-             pkgs.append('linux-modules-extra-' + flavour + '*')
-
         cmd = 'yes "" | DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes ' + ' '.join(pkgs)
         self.results = utils.system_output(cmd, retain_output=True)
 
-- 
2.30.2