[PATCH 7/7] UBUNTU: SAUCE: ubuntu_zram_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_zram_smoke_test/ubuntu_zram_smoke_test.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/ubuntu_zram_smoke_test/ubuntu_zram_smoke_test.py b/ubuntu_zram_smoke_test/ubuntu_zram_smoke_test.py
index 49968526..08783043 100644
--- a/ubuntu_zram_smoke_test/ubuntu_zram_smoke_test.py
+++ b/ubuntu_zram_smoke_test/ubuntu_zram_smoke_test.py
@@ -17,15 +17,11 @@ class ubuntu_zram_smoke_test(test.test):
             series = distro.codename()
 
         pkgs = [
+            'linux-modules-extra-' + platform.uname()[2],
         ]
 
-        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 + '*')
-
-        if pkgs:
-            cmd = 'yes "" | DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes ' + ' '.join(pkgs)
-            self.results = utils.system_output(cmd, retain_output=True)
+        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):
         pass
-- 
2.30.2