Merge lp:~xnox/ubuntu-cdimage/focal-oem-20.04 into lp:ubuntu-cdimage

[Dimitri John Ledkov]

Ubuntu Desktop flavours: rename oem-xx.yy back to oem

Turns out whilst metapackage is called oem-20.04, the actual kernel
flavour it points to is just -oem, hence livecd-rootfs will produce
artefacts with 'oem' suffix, and thus no oem-xx.yy logic is needed in
cdimage.

This partially reverts previously merged focal-oem-20.04 branch.

Ubuntu Desktop flavours: rename oem-xx.yy back to oem

Turns out whilst metapackage is called oem-20.04, the actual kernel
flavour it points to is just -oem, hence livecd-rootfs will produce
artefacts with 'oem' suffix, and thus no oem-xx.yy logic is needed in
cdimage.

This partially reverts previously merged focal-oem-20.04 branch.

[Iain Lane (laney)]

Irritating

review: Approve

=== modified file 'lib/cdimage/livefs.py'
--- lib/cdimage/livefs.py	2020-01-30 10:57:36 +0000
+++ lib/cdimage/livefs.py	2020-01-30 13:47:20 +0000
@@ -471,22 +471,9 @@
     project = config.project
     series = config["DIST"]
 
-    def get_lts_upto(series):
-        from distro_info import UbuntuDistroInfo
-        import itertools
-
-        udi = UbuntuDistroInfo()
-        it = itertools.dropwhile(lambda x: x != series, reversed(udi.all))
-
-        for r in it:
-            if udi.is_lts(r):
-                yield r, udi.version(r).rstrip(' LTS')
-
     if cpuarch == "amd64":
         if series >= "focal" and project == "ubuntu":
-            s = get_lts_upto(series)
-            _, v = next(s, (None, None))
-            return ["generic", "oem-{}".format(v)]
+            return ["generic", "oem"]
         if project == "ubuntustudio":
             return ["lowlatency"]
         else:

=== modified file 'lib/cdimage/tests/test_livefs.py'
--- lib/cdimage/tests/test_livefs.py	2020-01-30 10:58:19 +0000
+++ lib/cdimage/tests/test_livefs.py	2020-01-30 13:47:20 +0000
@@ -846,27 +846,13 @@
         config["DIST"] = series
         self.assertEqual(expected.split(), flavours(config, arch))
 
-    def assertFlavoursEqualGlob(self, expected, arch, project, series):
-        import fnmatch
-
-        config = Config(read=False)
-        config["PROJECT"] = project
-        config["DIST"] = series
-        matches = all(
-            [
-                fnmatch.filter(flavours(config, arch), flavour)
-                for flavour in expected.split()
-            ]
-        )
-        self.assertTrue(matches)
-
     def test_amd64(self):
         for series in all_series[4:31]:
             self.assertFlavoursEqual(
                 "generic", "amd64", "ubuntu", series)
         for series in all_series[31:-2]:
-            self.assertFlavoursEqualGlob(
-                "generic oem-*", "amd64", "ubuntu", series)
+            self.assertFlavoursEqual(
+                "generic oem", "amd64", "ubuntu", series)
         for series in all_series[-2:0]:
             self.assertFlavoursEqual(
                 "generic", "amd64", "ubuntu", series)