Merge lp:~powersj/ubuntu-cdimage/server-zesty-ppc64el into lp:ubuntu-cdimage

[Joshua Powers]

Update ubuntu-server ISO size limit for zesty ppc64el

The ubuntu-server iso for zesty ppc64el grew too large for a standard
sized ISO due to the addition of netboot. This ups the limit again on
that specific ISO. This makes no change to the existing xenial change.

[Colin Watson (cjwatson)]

review: Needs Fixing

[lp:~powersj/ubuntu-cdimage/server-zesty-ppc64el]

1647. By Joshua Powers on 2017-03-28

Add tests for ubuntu-server, fix logic

This adds tests for the various ubuntu-server ISO size changes. Also
makes sure that future versions of ppc64el can be larger given the
recent changes, not only zesty.

[Joshua Powers (powersj)]

Thanks for the review and comments Colin

Added some tests and fixed not falling through as well as ppc64el + zesty and future release changes.

Unmerged revisions

=== modified file 'lib/cdimage/tests/test_tree.py'
--- lib/cdimage/tests/test_tree.py	2017-01-18 15:02:04 +0000
+++ lib/cdimage/tests/test_tree.py	2017-03-28 16:39:38 +0000
@@ -739,6 +739,9 @@
             ("ubuntu-budgie", "zesty", "daily-live", "i386", 2000000000),
             ("ubuntu-mate", "trusty", "daily-live", "amd64", 1073741824),
             ("ubuntu-mate", "xenial", "daily-live", "amd64", 2000000000),
+            ("ubuntu-server", "xenial", "daily", "amd64", 1073741824),
+            ("ubuntu-server", "zesty", "daily", "amd64", 736665600),
+            ("ubuntu-server", "zesty", "daily", "ppc64el", 1073741824),
         ):
             if dist is not None:
                 self.config["DIST"] = dist

=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py	2017-02-28 17:19:05 +0000
+++ lib/cdimage/tree.py	2017-03-28 16:39:38 +0000
@@ -1773,9 +1773,13 @@
             # provisional;
             # https://irclogs.ubuntu.com/2016/10/01/%23ubuntu-release.html#t19:06
             return 1024 * 1024 * 1024
-        elif self.project == "ubuntu-server" and \
-                self.config["DIST"] == "xenial":
-            return 1024 * 1024 * 1024
+        elif self.project == "ubuntu-server":
+            if self.config["DIST"] == "xenial":
+                return 1024 * 1024 * 1024
+            elif self.config["DIST"] >= "zesty" and arch == "ppc64el":
+                return 1024 * 1024 * 1024
+            else:
+                return 736665600
         else:
             if self.publish_type == "dvd":
                 # http://en.wikipedia.org/wiki/DVD_plus_RW