Merge ~cjwatson/launchpad-buildd:remove-core-snaps-restrictions into launchpad-buildd:master

[Colin Watson]

Remove restrictions on core snap names

We now install snaps corresponding to whatever Launchpad sends. Having to do launchpad-buildd rollouts every time we wanted to add new core snap names was introducing unnecessary delays to the process, and it meant more places in which we were hardcoding the list of valid core snap names.

This shouldn't land until https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/411626 is on production.

[Ines Almeida (ines-almeida)]

LGTM, just a minor comment

review: Approve

5a90fe7... by Colin Watson on 2023-06-23

Add note about separate --classic installation

diff --git a/debian/changelog b/debian/changelog
index 905f523..4fe4e13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 launchpad-buildd (234) UNRELEASED; urgency=medium
 
   * Add basic documentation of malware scanning for CI builds.
+  * Remove restrictions on core snap names; we now install snaps
+    corresponding to whatever Launchpad sends.
 
  -- Colin Watson <[e-mail]>  Tue, 06 Jun 2023 11:42:23 +0100
 
diff --git a/lpbuildd/target/build_charm.py b/lpbuildd/target/build_charm.py
index b64bbcc..1bcbd1e 100644
--- a/lpbuildd/target/build_charm.py
+++ b/lpbuildd/target/build_charm.py
@@ -26,8 +26,6 @@ class BuildCharm(
 ):
     description = "Build a charm."
 
-    core_snap_names = ["core", "core16", "core18", "core20", "core22"]
-
     @classmethod
     def add_arguments(cls, parser):
         super().add_arguments(parser)
@@ -37,10 +35,7 @@ class BuildCharm(
             metavar="SNAP=CHANNEL",
             dest="channels",
             default={},
-            help=(
-                f"install SNAP from CHANNEL (supported snaps: "
-                f"{', '.join(cls.core_snap_names)}, charmcraft)"
-            ),
+            help="install SNAP from CHANNEL",
         )
         parser.add_argument(
             "--build-path", default=".", help="location of charm to build."
@@ -74,15 +69,11 @@ class BuildCharm(
         self.backend.run(["apt-get", "-y", "install"] + deps)
         if self.backend.supports_snapd:
             self.snap_store_set_proxy()
-        for snap_name in self.core_snap_names:
-            if snap_name in self.args.channels:
+        for snap_name, channel in sorted(self.args.channels.items()):
+            # charmcraft is handled separately, since it requires --classic.
+            if snap_name != "charmcraft":
                 self.backend.run(
-                    [
-                        "snap",
-                        "install",
-                        "--channel=%s" % self.args.channels[snap_name],
-                        snap_name,
-                    ]
+                    ["snap", "install", "--channel=%s" % channel, snap_name]
                 )
         if "charmcraft" in self.args.channels:
             self.backend.run(
diff --git a/lpbuildd/target/build_snap.py b/lpbuildd/target/build_snap.py
index 44dcc1c..68f491e 100644
--- a/lpbuildd/target/build_snap.py
+++ b/lpbuildd/target/build_snap.py
@@ -46,8 +46,6 @@ class BuildSnap(
 ):
     description = "Build a snap."
 
-    core_snap_names = ["core", "core16", "core18", "core20", "core22"]
-
     @classmethod
     def add_arguments(cls, parser):
         super().add_arguments(parser)
@@ -57,10 +55,7 @@ class BuildSnap(
             metavar="SNAP=CHANNEL",
             dest="channels",
             default={},
-            help=(
-                f"install SNAP from CHANNEL (supported snaps: "
-                f"{', '.join(cls.core_snap_names)}, snapcraft)"
-            ),
+            help="install SNAP from CHANNEL",
         )
         parser.add_argument(
             "--build-request-id",
@@ -154,15 +149,11 @@ class BuildSnap(
         self.backend.run(["apt-get", "-y", "install"] + deps)
         if self.backend.supports_snapd:
             self.snap_store_set_proxy()
-        for snap_name in self.core_snap_names:
-            if snap_name in self.args.channels:
+        for snap_name, channel in sorted(self.args.channels.items()):
+            # snapcraft is handled separately, since it requires --classic.
+            if snap_name != "snapcraft":
                 self.backend.run(
-                    [
-                        "snap",
-                        "install",
-                        "--channel=%s" % self.args.channels[snap_name],
-                        snap_name,
-                    ]
+                    ["snap", "install", "--channel=%s" % channel, snap_name]
                 )
         if "snapcraft" in self.args.channels:
             self.backend.run(