Add Kinetic and Zed support

* sync charm-helpers to classic charms
* change openstack-origin/source default to zed
* align testing with zed
* add new zed bundles
* add zed bundles to tests.yaml
* add zed tests to osci.yaml and .zuul.yaml
* update build-on and run-on bases
* add bindep.txt for py310
* sync tox.ini and requirements.txt for ruamel
* use charmcraft_channel 2.0/stable
* drop reactive plugin overrides
* move interface/layer env vars to charmcraft.yaml

Change-Id: I9dda207bbd35f8641a6aac03e99503bc26071407
Depends-On: https://review.opendev.org/c/openstack/charm-ops-openstack/+/853306

.zuul.yaml

@@ -1,4 +1,4 @@
 - project:
     templates:
-      - openstack-python3-charm-yoga-jobs
+      - openstack-python3-charm-zed-jobs
       - openstack-cover-jobs

charmcraft.yaml

@@ -23,13 +23,10 @@ parts:
 bases:
   - build-on:
       - name: ubuntu
-        channel: "20.04"
+        channel: "22.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]
+        architectures: [amd64, s390x, ppc64el, arm64]

config.yaml

@@ -5,7 +5,7 @@ options:
     description: Mon and OSD debug level. Max is 20.
   source:
     type: string
-    default: yoga
+    default: zed
     description: |
       Optional configuration to support use of additional sources such as:
         - ppa:myteam/ppa

metadata.yaml

@@ -10,8 +10,7 @@ tags:
   - storage
   - misc
 series:
-  - focal
-  - jammy
+- jammy
 subordinate: false
 min-juju-version: 2.7.6
 extra-bindings:

osci.yaml

@@ -1,29 +1,47 @@
 - project:
     templates:
-      - charm-unit-jobs-py38
-      - charm-unit-jobs-py39
+      - charm-unit-jobs-py310
     check:
       jobs:
-      - ceph-iscsi-focal-octopus
-      - ceph-iscsi-focal-octopus-ec
+      - ceph-iscsi-jammy-quincy
+      - ceph-iscsi-jammy-quincy-ec
+      - ceph-iscsi-kinetic-quincy:
+          voting: false
+      - ceph-iscsi-kinetic-quincy-ec:
+          voting: false
     vars:
       needs_charm_build: true
       charm_build_name: ceph-iscsi
       build_type: charmcraft
+      charmcraft_channel: 2.0/stable
 - job:
-    name: ceph-iscsi-focal-octopus
+    name: ceph-iscsi-jammy-quincy
     parent: func-target
     dependencies:
       - charm-build
       - osci-lint
-      - tox-py38
-      - tox-py39
+      - name: tox-py310
+        soft: true
     vars:
-      tox_extra_args: focal
+      tox_extra_args: jammy
 - job:
-    name: ceph-iscsi-focal-octopus-ec
+    name: ceph-iscsi-jammy-quincy-ec
     parent: func-target
-    dependencies: &smoke-jobs
-      - ceph-iscsi-focal-octopus
+    dependencies:
+      - ceph-iscsi-jammy-quincy
     vars:
-      tox_extra_args: focal-ec
+      tox_extra_args: jammy-ec
+- job:
+    name: ceph-iscsi-kinetic-quincy
+    parent: func-target
+    dependencies:
+      - ceph-iscsi-jammy-quincy
+    vars:
+      tox_extra_args: kinetic
+- job:
+    name: ceph-iscsi-kinetic-quincy-ec
+    parent: func-target
+    dependencies:
+      - ceph-iscsi-jammy-quincy
+    vars:
+      tox_extra_args: kinetic-ec

tests/bundles/kinetic-ec.yaml

@@ -1,5 +1,5 @@
 local_overlay_enabled: False
-series: focal
+series: kinetic
 machines:
   '0':
   '1':
@@ -36,8 +36,6 @@ applications:
       pool-type: erasure-coded
       ec-profile-k: 4
       ec-profile-m: 2
-      # Use proposed until fix for #1883112 is backported
-      source: distro-proposed
     to:
       - '0'
       - '1'

tests/bundles/kinetic.yaml

@@ -1,5 +1,5 @@
 local_overlay_enabled: False
-series: focal
+series: kinetic
 machines:
   '0':
   '1':
@@ -35,8 +35,6 @@ applications:
     num_units: 4
     options:
       gateway-metadata-pool: iscsi-foo-metadata
-      # Use proposed until fix for #1883112 is backported
-      source: distro-proposed
     to:
       - '0'
       - '1'

tests/tests.yaml

@@ -1,12 +1,14 @@
 charm_name: ceph-iscsi
 gate_bundles:
-  - focal-ec
-  - focal
+  - jammy-ec
+  - jammy
 smoke_bundles:
-  - focal
+  - jammy
 dev_bundles:
   - jammy-ec
   - jammy
+  - kinetic-ec
+  - kinetic
 configure:
   - zaza.openstack.charm_tests.vault.setup.auto_initialize_no_validation
   - zaza.openstack.charm_tests.ceph.iscsi.setup.basic_guest_setup

tox.ini

@@ -118,7 +118,7 @@ basepython = python3
 deps = -r{toxinidir}/build-requirements.txt
 commands =
     charmcraft clean
-    charmcraft -v build
+    charmcraft -v pack
     {toxinidir}/rename.sh
 
 [testenv:func-noop]

unit_tests/test_ceph_iscsi_charm.py

@@ -173,8 +173,9 @@ class TestCephISCSIGatewayCharmBase(CharmTestCase):
                     'egress-subnets': ['10.0.0.0/24']}
                 return network_data
 
+        config_ = self.harness._get_config(charm_config=None)
         self.harness._backend = _TestingOPSModelBackend(
-            self.harness._unit_name, self.harness._meta)
+            self.harness._unit_name, self.harness._meta, config_)
         self.harness._model = model.Model(
             self.harness._meta,
             self.harness._backend)
@@ -398,7 +399,7 @@ class TestCephISCSIGatewayCharmBase(CharmTestCase):
             rel_id,
             'ceph-iscsi',
             {'admin_password': 'existing password',
-             'gateway_ready': False})
+             'gateway_ready': 'False'})
         self.harness.begin()
         self.harness.charm.ceph_client._stored.pools_available = True
         with patch.object(Path, 'mkdir') as mock_mkdir: