Add 2023.2 Bobcat support

* sync charm-helpers to classic charms
* change openstack-origin/source default to quincy
* add mantic to metadata series
* align testing with bobcat
* add new bobcat bundles
* add bobcat bundles to tests.yaml
* add bobcat tests to osci.yaml
* update build-on and run-on bases
* drop kinetic
* update charmcraft_channel to 2.x/stable

Change-Id: Ibb97b427f29a061adc2d67e55ae3976387d332c7

charmcraft.yaml

@@ -33,9 +33,9 @@ bases:
       - name: ubuntu
         channel: "22.04"
         architectures: [amd64, s390x, ppc64el, arm64]
-      - name: ubuntu
-        channel: "22.10"
-        architectures: [amd64, s390x, ppc64el, arm64]
       - name: ubuntu
         channel: "23.04"
         architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [amd64, s390x, ppc64el, arm64]

osci.yaml

@@ -4,10 +4,9 @@
       - charm-unit-jobs-py39
       - charm-xena-functional-jobs
       - charm-yoga-functional-jobs
-      - charm-zed-functional-jobs
       - charm-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: ceph-fs
       build_type: charmcraft
-      charmcraft_channel: 2.0/stable
+      charmcraft_channel: 2.x/stable

requirements.txt

@@ -8,16 +8,13 @@
 # requirements.txt
 setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
-# Build requirements
-cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
-charm-tools==2.8.4
+# NOTE: newer versions of cryptography require a Rust compiler to build,
+# see
+# * https://github.com/openstack-charmers/zaza/issues/421
+# * https://mail.python.org/pipermail/cryptography-dev/2021-January/001003.html
+#
+cryptography<3.4
+
+git+https://github.com/juju/charm-tools.git
 
 simplejson
-
-# Newer versions use keywords that didn't exist in python 3.5 yet (e.g.
-# "ModuleNotFoundError")
-# NOTE(lourot): This might look like a duplication of test-requirements.txt but
-# some tox targets use only test-requirements.txt whereas charm-build uses only
-# requirements.txt
-importlib-metadata<3.0.0; python_version < '3.6'
-importlib-resources<3.0.0; python_version < '3.6'

src/config.yaml

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

src/metadata.yaml

@@ -12,8 +12,8 @@ tags:
 series:
 - focal
 - jammy
-- kinetic
 - lunar
+- mantic
 subordinate: false
 requires:
   ceph-mds:

src/tests/bundles/jammy-bobcat.yaml

@@ -1,5 +1,5 @@
 variables:
-  openstack-origin: &openstack-origin cloud:jammy-zed
+  openstack-origin: &openstack-origin cloud:jammy-bobcat
 
 local_overlay_enabled: False
 

src/tests/bundles/mantic-bobcat.yaml

@@ -3,7 +3,7 @@ variables:
 
 local_overlay_enabled: False
 
-series: &series kinetic
+series: &series mantic
 
 applications:
   ubuntu: # used to test mounts

src/tests/tests.yaml

@@ -3,6 +3,8 @@ gate_bundles:
   - focal-xena
   - focal-yoga
   - jammy-yoga
+  - jammy-bobcat
+  - mantic-bobcat
 smoke_bundles:
   - focal-xena
 # configure:
@@ -19,4 +21,4 @@ tests:
 target_deploy_status:
   ubuntu:
     workload-status: active
-    workload-status-message-prefix: ''
+    workload-status-message-prefix: ''

tox.ini

@@ -97,7 +97,6 @@ commands = stestr run --slowest {posargs}
 [testenv:pep8]
 basepython = python3
 deps = flake8==3.9.2
-       charm-tools==2.8.4
 commands = flake8 {posargs} src unit_tests
 
 [testenv:func-target]