Merge lp:~sil2100/ubuntu-cdimage/uc-rebuild-requests into lp:ubuntu-cdimage

[Łukasz Zemczak]

rebuild-requests: Add support for Ubuntu Core image rebuilds

rebuild-requests: Add support for Ubuntu Core image rebuilds

Tested this in a hacky way and it seems to be doing what it should. All because ubuntu-core is a very special snowflake.

[Steve Langasek (vorlon)]

Kinda ugly but makes sense.

review: Needs Fixing

[lp:~sil2100/ubuntu-cdimage/uc-rebuild-requests]

2060. By Łukasz Zemczak on 2022-06-09

Use entry[2] as proposed by vorlon

[Łukasz Zemczak (sil2100)]

Thanks for the review! I changed the env['CHANNEL'] entry and will now merge it.

=== modified file 'bin/rebuild-requests'
--- bin/rebuild-requests	2022-05-04 12:23:22 +0000
+++ bin/rebuild-requests	2022-06-09 08:31:20 +0000
@@ -188,10 +188,19 @@
             env['ARCHES'] = arches
             env['DIST'] = entries[0][0].series_title.lower()
 
-            # The ubuntu-base image is actually hacked up in overall, so even
-            # though it's defined as "daily", it's a "daily-live" type
             image_type = entry[2]
             if project == "ubuntu-base":
+                # The ubuntu-base image is actually hacked up in overall, so
+                # even though it's defined as "daily", it's a "daily-live" type
+                image_type = "daily-live"
+            elif project in ("ubuntu-core", "ubuntu-appliance"):
+                # The ubuntu-core images however are also a bit special, as
+                # they have a different publish structure, CHANNEL arguments
+                # and more
+                env['EXTRA_PPAS'] = "snappy-dev/image"
+                # Due to the different structure, IMAGE_TYPE is the channel
+                # here
+                env['CHANNEL'] = entry[2]
                 image_type = "daily-live"
 
             cmd = ["for-project", project, "cron.%s" % image_type]