Updates for jammy enablement

- charmcraft: build-on 20.04 -> run-on 20.04/22.04 [*archs]
- Refresh tox targets
- Drop impish bundles and OSCI testing
- Add jammy metadata
- Set default channel to 1.8/stable

Change-Id: Ia9f2af61428f23dcccb9ca9966c42608a4738408

charmcraft.yaml

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

osci.yaml

@@ -1,12 +1,10 @@
 - project:
     templates:
       - charm-unit-jobs-py38
-      - charm-unit-jobs-py39
+      - charm-unit-jobs-py310
     check:
       jobs:
       - focal-mysql8
-      - impish-mysql8:
-          voting: false
       - jammy-mysql8:
           voting: false
     vars:
@@ -20,21 +18,15 @@
     dependencies:
       - osci-lint
       - tox-py38
-      - tox-py39
       - charm-build
     vars:
       tox_extra_args: focal-mysql8
-- job:
-    name: impish-mysql8
-    parent: func-target
-    dependencies:
-      - focal-mysql8
-    vars:
-      tox_extra_args: impish-mysql8
 - job:
     name: jammy-mysql8
     parent: func-target
     dependencies:
       - focal-mysql8
+      - name: tox-py310
+        soft: True
     vars:
       tox_extra_args: jammy-mysql8

src/config.yaml

@@ -53,7 +53,7 @@ options:
       config option or lb-provider relation.
   channel:
     type: string
-    default: stable
+    default: 1.8/stable
     description: >-
       The snap channel to install from.
   dns-ha-access-record:

src/metadata.yaml

@@ -13,7 +13,7 @@ description: |
   SSH credentials, and more.
 series:
 - focal
-- impish
+- jammy
 tags:
 - security
 extra-bindings:

src/tests/bundles/impish-mysql8.yaml

@@ -1,107 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-local_overlay_enabled: False
-
-series: impish
-
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  vault-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-    channel: latest/edge
-
-  vault:
-    num_units: 1
-    charm: ../../../vault.charm
-    to:
-      - '3'
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: *openstack-origin
-    to:
-      - '4'
-    channel: latest/edge
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '5'
-      - '6'
-      - '7'
-    channel: latest/edge
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    options:
-      osd-encrypt: true
-      osd-encrypt-keymanager: vault
-      source: *openstack-origin
-    storage:
-      osd-devices: 10G,2
-    to:
-      - '8'
-      - '9'
-      - '10'
-    channel: latest/edge
-
-relations:
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'vault:certificates'
-    - 'keystone:certificates'
-
-  - - 'vault:secrets'
-    - 'ceph-osd:secrets-storage'
-
-  - - 'ceph-mon:osd'
-    - 'ceph-osd:mon'

src/tests/tests.yaml

@@ -5,7 +5,6 @@ configure:
 
 gate_bundles:
 - focal-mysql8
-- impish-mysql8
 
 dev_bundles:
 - jammy-mysql8
@@ -39,5 +38,4 @@ tests:
 
 tests_options:
   force_deploy:
-    - impish-mysql8
     - jammy-mysql8

tox.ini

@@ -93,6 +93,11 @@ basepython = python3.9
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
+[testenv:py310]
+basepython = python3.10
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
+
 [testenv:pep8]
 basepython = python3
 deps = flake8==3.9.2