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

Change-Id: I2cb698f719106e54b06009f24ea47259419e9cad

.zuul.yaml

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

charmcraft.yaml

@@ -2,33 +2,18 @@ type: charm
 
 parts:
   charm:
-    after:
-      - update-certificates
-    charm-python-packages:
-      # NOTE(lourot): see
-      # * https://github.com/canonical/charmcraft/issues/551
-      - setuptools
-    build-packages:
-      - git
-
-  update-certificates:
-    plugin: nil
-    # See https://github.com/canonical/charmcraft/issues/658
-    override-build: |
-      apt update
-      apt install -y ca-certificates
-      update-ca-certificates
+    source: src/
+    plugin: reactive
+    build-snaps:
+      - charm
 
 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]

metadata.yaml

@@ -8,13 +8,12 @@ description: |
   Loadbalance the things
 tags:
 - openstack
+series:
+- jammy
 extra-bindings:
   public:
   admin:
   internal:
-series:
-- focal
-- jammy
 provides:
   loadbalancer:
     interface: openstack-loadbalancer

osci.yaml

@@ -1,25 +1,17 @@
 - project:
     templates:
-      - charm-unit-jobs-py38
       - charm-unit-jobs-py310
     check:
       jobs:
-      - openstack-loadbalancer-focal
       - openstack-loadbalancer-jammy:
             voting: false
+      - openstack-loadbalancer-kinetic:
+            voting: false
     vars:
       needs_charm_build: true
       charm_build_name: openstack-loadbalancer
       build_type: charmcraft
-- job:
-    name: openstack-loadbalancer-focal
-    parent: func-target
-    dependencies:
-      - charm-build
-      - osci-lint
-      - tox-py38
-    vars:
-      tox_extra_args: focal
+      charmcraft_channel: 2.0/stable
 - job:
     name: openstack-loadbalancer-jammy
     parent: func-target
@@ -30,3 +22,12 @@
         soft: true
     vars:
       tox_extra_args: jammy
+    name: openstack-loadbalancer-kinetic
+    parent: func-target
+    dependencies:
+      - charm-build
+      - osci-lint
+      - name: tox-py310
+        soft: true
+    vars:
+      tox_extra_args: kinetic

tests/bundles/kinetic.yaml

@@ -1,5 +1,5 @@
 local_overlay_enabled: False
-series: focal
+series: kinetic
 applications:
   ceph-osd:
     charm: ch:ceph-osd

tests/bundles/overlays/kinetic.yaml.j2

@@ -0,0 +1,4 @@
+applications:
+  openstack-loadbalancer:
+    options:
+        vip: '{{ TEST_VIP00 }}'

tests/tests.yaml

@@ -1,10 +1,11 @@
 charm_name: openstack-loadbalancer
 gate_bundles:
-  - focal
+  - jammy
 smoke_bundles:
-  - focal
+  - jammy
 dev_bundles:
   - jammy
+  - kinetic
 configure:
   - zaza.openstack.charm_tests.vault.setup.auto_initialize_no_validation
   - zaza.openstack.charm_tests.ceph.dashboard.setup.check_dashboard_cert
@@ -17,4 +18,4 @@ target_deploy_status:
     workload-status-message-prefix: Vault needs to be initialized
 tests_options:
   force_deploy:
-    - jammy
+    - kinetic

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]