@@ -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
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@canonical.com> --- ubuntu_zram_smoke_test/ubuntu_zram_smoke_test.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)