From 434c836badcdc5a1e0657a4d2928e5433f0a406d Mon Sep 17 00:00:00 2001
From: Aurelien Lourot <aurelien.lourot@canonical.com>
Date: Fri, 25 Feb 2022 12:20:46 +0100
Subject: [PATCH] Remove charmcraft workaround and build on all archs

Change-Id: I2203507dc4ae6fad1168e0f65f10d5e31b2a7365
---
 charmcraft.yaml | 23 ++++++++++++++---------
 tests/README.md |  1 -
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/charmcraft.yaml b/charmcraft.yaml
index 612f353..ff59b02 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -7,8 +7,7 @@ parts:
     charm-python-packages:
       # NOTE(lourot): see
       # * https://github.com/canonical/charmcraft/issues/551
-      # * https://github.com/canonical/charmcraft/issues/632
-      - setuptools < 58
+      - setuptools
     build-packages:
       - git
 
@@ -21,10 +20,16 @@ parts:
       update-ca-certificates
 
 bases:
-  - name: ubuntu
-    channel: "20.04"
-    architectures:
-      - amd64
-      - arm64
-      - ppc64le
-      - s390x
+  - build-on:
+      - name: ubuntu
+        channel: "20.04"
+        architectures:
+          - amd64
+          - s390x
+          - ppc64el
+          - arm64
+    run-on:
+      - name: ubuntu
+        channel: "20.04"
+      - name: ubuntu
+        channel: "21.10"
diff --git a/tests/README.md b/tests/README.md
index 31363ee..d002a1e 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -10,7 +10,6 @@ Run the smoke tests with:
 ```bash
 cd ../
 tox -e build
-cd tests/
 tox -e func-smoke
 ```