Expand the set of series magpie can run on

The magpie charm is used as principle charm for validation of
subordinate charms.  As such it is required to run on all series
we perform tests on.

Func-Test-Pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/744
Change-Id: I92f08894a2551e9d54c51a97cdf8f0609ddb55d0

.gitignore

@@ -6,3 +6,4 @@ trusty
 .testrepository
 __pycache__
 .stestr
+*.charm

charmcraft.yaml

@@ -19,7 +19,21 @@ parts:
       cp -r $CHARMCRAFT_STAGE/* .
 
 bases:
-  - name: ubuntu
-    channel: "20.04"
-    architectures:
-      - amd64
+  - build-on:
+      - name: ubuntu
+        channel: "18.04"
+        architectures:
+          - amd64
+    run-on:
+      - name: ubuntu
+        channel: "18.04"
+        architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "20.04"
+        architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "21.10"
+        architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "22.04"
+        architectures: [amd64, s390x, ppc64el, arm64]

osci.yaml

@@ -1,14 +1,15 @@
 - project:
     templates:
+      - charm-unit-jobs-py36
       - charm-unit-jobs-py38
       - charm-unit-jobs-py39
+      - charm-unit-jobs-py310
     check:
       jobs:
+      - bionic
       - focal
-      - impish:
-          voting: false
-      - jammy:
-          voting: false
+      - impish
+      - jammy
     vars:
       needs_charm_build: true
       charm_build_name: magpie

src/metadata.yaml

@@ -12,5 +12,7 @@ peers:
   magpie:
     interface: magpie
 series:
+- bionic
 - focal
 - impish
+- jammy

src/tests/bundles/bionic.yaml

@@ -0,0 +1,7 @@
+local_overlay_enabled: False
+
+series: bionic
+applications:
+  magpie:
+    num_units: 3
+    charm: ../../../magpie.charm

src/tests/tests.yaml

@@ -1,10 +1,9 @@
 charm_name: magpie
 
 gate_bundles:
+- bionic
 - focal
 - impish
-
-dev_bundles:
 - jammy
 
 smoke_bundles:
@@ -16,8 +15,3 @@ target_deploy_status:
 
 tests:
 - zaza.openstack.charm_tests.magpie.tests.MagpieTest
-
-tests_options:
-  force_deploy:
-    - impish
-    - jammy

tox.ini

@@ -24,9 +24,6 @@ requires =
   virtualenv < 20.0
   setuptools<50.0.0
 
-# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
-minversion = 3.18.0
-
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0