feat(buildd): use buildd daily image for devel

This was blocked by https://bugs.launchpad.net/cloud-images/+bug/2007419 and https://bugs.launchpad.net/ubuntu/+source/apt/+bug/1728616. The former bug has been resolved and the latter bug is avoided by not updating apt sources to the devel alias. Signed-off-by: Callahan Kovacs <[email protected]>
canonical · Feb 8, 2024 · e8a3231 · e8a3231
1 parent d2f7a74
commit e8a3231
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/craft_providers/lxd/remotes.py b/craft_providers/lxd/remotes.py
@@ -155,12 +155,10 @@ def add_remote(self, lxc: LXC) -> None:
         remote_address=DAILY_REMOTE_ADDRESS,
         remote_protocol=ProtocolType.SIMPLESTREAMS,
     ),
-    # devel buildd daily image blocked by
-    # https://github.com/canonical/craft-providers/pull/489
     ubuntu.BuilddBaseAlias.DEVEL: RemoteImage(
         image_name="devel",
-        remote_name=DAILY_REMOTE_NAME,
-        remote_address=DAILY_REMOTE_ADDRESS,
+        remote_name=BUILDD_DAILY_REMOTE_NAME,
+        remote_address=BUILDD_DAILY_REMOTE_ADDRESS,
         remote_protocol=ProtocolType.SIMPLESTREAMS,
     ),
     centos.CentOSBaseAlias.SEVEN: RemoteImage(

diff --git a/craft_providers/multipass/multipass_provider.py b/craft_providers/multipass/multipass_provider.py
@@ -102,9 +102,10 @@ def name(self) -> str:
     ubuntu.BuilddBaseAlias.NOBLE: RemoteImage(
         remote=Remote.RELEASE, image_name="noble"
     ),
-    # XXX: snapcraft:devel image is not working (LP #2007419)
-    # daily:devel image is not available on macos
-    ubuntu.BuilddBaseAlias.DEVEL: RemoteImage(remote=Remote.DAILY, image_name="devel"),
+    # devel images are not available on macos
+    ubuntu.BuilddBaseAlias.DEVEL: RemoteImage(
+        remote=Remote.SNAPCRAFT, image_name="devel"
+    ),
 }