Merge ~pjds/snap-store-proxy-charm:main into snap-store-proxy-charm:main

[Peter Jose De Sousa]

Update the charm to run on 22.04 and 24.04

[Otto Co-Pilot (otto-copilot)]

Beginning pre-merge CI tests for revision 3a70ab9522cede02e8940a4bb1b2296ee419927c

[Otto Co-Pilot (otto-copilot)]

Pre-merge CI tests failed for revision 3a70ab9522cede02e8940a4bb1b2296ee419927c
Running landing tests failed.
https://jenkins.ols.ps5.canonical.com/job/snap-store-proxy-charm-pre-merge-tests/1/

[Alex Ramanau (drednout)]

Hi, Peter!

I've just fixed tests and pushed changes to separate MP: https://code.launchpad.net/~drednout/snap-store-proxy-charm/+git/snap-store-proxy-charm/+merge/466222

You should wait until these changes will be merged to main and then rebase your branch against latest upstream main.

[Milos (miloslu)]

Thanks for this MP! I tested this branch and the charm builds as expected. A rebase might not be necessary because Jenkins will automatically put these commits on top of the main once Alex's MP is merged. Unless there are merge conflicts, which shouldn't be the case.

review: Approve

[Alex Ramanau (drednout)]

Thanks, Peter! I'll try to merge it and release edge version of charm.

review: Approve

diff --git a/charmcraft.yaml b/charmcraft.yaml
index c8a34a0..1f2d1cf 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -9,7 +9,7 @@ type: "charm"
 bases:
   - build-on:
     - name: "ubuntu"
-      channel: "20.04"
+      channel: "22.04"
       architectures:
         - amd64
     run-on:
@@ -17,7 +17,14 @@ bases:
       channel: "20.04"
       architectures:
         - amd64
-
+    - name: "ubuntu"
+      channel: "22.04"
+      architectures:
+        - amd64
+    - name: "ubuntu"
+      channel: "24.04"
+      architectures:
+        - amd64
 parts:
   charm:
     charm-binary-python-packages:
diff --git a/metadata.yaml b/metadata.yaml
index 3854c53..b522623 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -7,7 +7,8 @@ name: snap-store-proxy
 description: |
   Install and manage a snap-store-proxy on premise.
 summary: |
-  The Snap Store Proxy provides an on-premise edge proxy to the general Snap Store for your devices. Devices are registered with the proxy, and all communication with the Store will flow through the proxy.
+  The Snap Store Proxy provides an on-premise edge proxy to the general Snap Store for your devices.
+  Devices are registered with the proxy, and all communication with the Store will flow through the proxy.
 maintainers:
   - Wouter van Bommel <wouter.bommel>@canonical.com
 tags: