Merge ~suligap/snapstore-client:core22-as-base-in-offline-install-bundle into snapstore-client:main

[Przemysław Suliga]

Bundle core22 as base in offline install bundle

snap-store-proxy is moving to core22 as a base. core20 is installed by
default on Focal and newer images and Focal is minimum required for
snap-store-proxy now.

[Bowen Fan (bowenfan)]

LGTM with a small question, thank you!

review: Approve

[Przemysław Suliga (suligap)]

Thanks Bowen!

diff --git a/store_admin/__init__.py b/store_admin/__init__.py
index 35ec9a3..2238c8f 100644
--- a/store_admin/__init__.py
+++ b/store_admin/__init__.py
@@ -1 +1 @@
-version = "1.3.1"
+version = "1.3.2"
diff --git a/store_admin/logic/registration.py b/store_admin/logic/registration.py
index 79f907c..c0ec62d 100644
--- a/store_admin/logic/registration.py
+++ b/store_admin/logic/registration.py
@@ -21,8 +21,8 @@ logger = logging.getLogger(__name__)
 INSTALL = """#!/bin/bash
 set -eu
 [ $(id -u) = "0" ] || (echo "Please run this script as root or with sudo." && exit 1)
-snap ack core20_*.assert
-snap install core20_*.snap
+snap ack core22_*.assert
+snap install core22_*.snap
 snap ack snapd_*.assert
 snap install snapd_*.snap
 snap ack snap-store-proxy_*.assert
@@ -190,7 +190,7 @@ def make_bundle(session, data, output, channel, arch):
         bundle_dir.mkdir()
 
         # Add snap binaries and assertions to the offline bundle.
-        for snap_name in ["core20", "snapd", "snap-store-proxy"]:
+        for snap_name in ["core22", "snapd", "snap-store-proxy"]:
             download_snap_files(
                 defaults.get_devicegw_url(),
                 session,
diff --git a/store_admin/logic/tests/test_registration.py b/store_admin/logic/tests/test_registration.py
index 5f85b85..2321789 100644
--- a/store_admin/logic/tests/test_registration.py
+++ b/store_admin/logic/tests/test_registration.py
@@ -316,13 +316,13 @@ def test_make_bundle(
             include_metadata=False,
             file_read_cb=snaps.progress_copy_to_file,
         )
-        for snap_name in ["core20", "snapd", "snap-store-proxy"]
+        for snap_name in ["core22", "snapd", "snap-store-proxy"]
     ]
     assert mock_download_snap_files.call_args_list == expected_calls
     assert tar_members_by_name.keys() == {
         "offline-snap-store",
-        "offline-snap-store/core20.assert",
-        "offline-snap-store/core20.snap",
+        "offline-snap-store/core22.assert",
+        "offline-snap-store/core22.snap",
         "offline-snap-store/install.sh",
         "offline-snap-store/proxy.assert",
         "offline-snap-store/snap-store-proxy.assert",
@@ -337,8 +337,8 @@ def test_make_bundle(
         == b"""#!/bin/bash
 set -eu
 [ $(id -u) = "0" ] || (echo "Please run this script as root or with sudo." && exit 1)
-snap ack core20_*.assert
-snap install core20_*.snap
+snap ack core22_*.assert
+snap install core22_*.snap
 snap ack snapd_*.assert
 snap install snapd_*.snap
 snap ack snap-store-proxy_*.assert