Merge lp:~paride/ubuntu-cdimage/ubuntu-cdimage into lp:ubuntu-cdimage

[Paride Legovini]

live-server: bump the OVERSIZED limit for >= Focal

Image size bump due to the HWE kernel inclusion in the images.

[Paride Legovini (paride)]

I mounted the ISOs and verified that the issue is actually with the now included HWE kernel files in /casper and /pool.

The image size is still DVD-safe.

[Łukasz Zemczak (sil2100)]

11:53 < sil2100> paride: hm, ok, I think it makes sense - of course we only have the HWE kernels for focal, not in groovy or hirsute, so it's not really >= focal - but that being said, I think a size bump of this magnitude is okay anyway

So +1.

review: Approve

[lp:~paride/ubuntu-cdimage/ubuntu-cdimage]

1926. By Łukasz Zemczak on 2021-02-03

live-server: bump the OVERSIZED limit for >= Focal

Image size bump due to the HWE kernel inclusion in the images.

=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py	2020-12-10 17:32:42 +0000
+++ lib/cdimage/tree.py	2021-02-03 10:35:39 +0000
@@ -1874,8 +1874,11 @@
             # https://irclogs.ubuntu.com/2016/10/01/%23ubuntu-release.html#t19:06
             return 1024 * 1024 * 1024
         elif self.project == "ubuntu-server":
-            # email with powersj, 20200108
-            if self.config["DIST"] >= "bionic":
+            if self.config["DIST"] >= "focal":
+                # Size bump due to HWE kernel inclusion in the images
+                return 1.3 * 1000 * 1000 * 1000
+            elif self.config["DIST"] >= "bionic":
+                # email with powersj, 20200108
                 return 1.2 * 1000 * 1000 * 1000
             elif self.config["DIST"] >= "xenial":
                 return 1024 * 1024 * 1024