Merge ~cjwatson/launchpad-buildd:snap-core22 into launchpad-buildd:master

[Colin Watson]

Add core22 to the list of supported core snap names

[Ioana Lasc (ilasc)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 68db024..5668969 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+launchpad-buildd (200) UNRELEASED; urgency=medium
+
+  * Add core22 to the list of supported core snap names.
+
+ -- Colin Watson <[e-mail]>  Fri, 13 Aug 2021 14:05:55 +0100
+
 launchpad-buildd (199) bionic; urgency=medium
 
   * Upload oci layers to librarian as tar.gz
diff --git a/lpbuildd/target/build_charm.py b/lpbuildd/target/build_charm.py
index b2cb740..28f9d0b 100644
--- a/lpbuildd/target/build_charm.py
+++ b/lpbuildd/target/build_charm.py
@@ -30,7 +30,7 @@ class BuildCharm(SnapBuildProxyOperationMixin, VCSOperationMixin,
 
     description = "Build a charm."
 
-    core_snap_names = ["core", "core16", "core18", "core20"]
+    core_snap_names = ["core", "core16", "core18", "core20", "core22"]
 
     @classmethod
     def add_arguments(cls, parser):
diff --git a/lpbuildd/target/build_snap.py b/lpbuildd/target/build_snap.py
index 8b08cfa..be9d655 100644
--- a/lpbuildd/target/build_snap.py
+++ b/lpbuildd/target/build_snap.py
@@ -52,7 +52,7 @@ class BuildSnap(SnapBuildProxyOperationMixin, VCSOperationMixin,
 
     description = "Build a snap."
 
-    core_snap_names = ["core", "core16", "core18", "core20"]
+    core_snap_names = ["core", "core16", "core18", "core20", "core22"]
 
     @classmethod
     def add_arguments(cls, parser):