Add 2023.2 Bobcat support

* sync charm-helpers to classic charms
* change openstack-origin/source default to bobcat
* 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/edge

Change-Id: If616bddf1c96e1660a0e185c17ad807892fd8464

charmcraft.yaml

@@ -30,51 +30,91 @@ bases:
       - name: ubuntu
         channel: "22.04"
         architectures: [amd64]
+  - build-on:
       - name: ubuntu
-        channel: "22.10"
+        channel: "22.04"
+        architectures: [s390x]
+    run-on:
+      - name: ubuntu
+        channel: "22.04"
+        architectures: [s390x]
+  - build-on:
+      - name: ubuntu
+        channel: "22.04"
+        architectures: [ppc64el]
+    run-on:
+      - name: ubuntu
+        channel: "22.04"
+        architectures: [ppc64el]
+  - build-on:
+      - name: ubuntu
+        channel: "22.04"
+        architectures: [arm64]
+    run-on:
+      - name: ubuntu
+        channel: "22.04"
+        architectures: [arm64]
+  - build-on:
+      - name: ubuntu
+        channel: "23.04"
         architectures: [amd64]
+    run-on:
       - name: ubuntu
         channel: "23.04"
         architectures: [amd64]
   - build-on:
       - name: ubuntu
-        channel: "22.04"
-        architectures: [arm64]
+        channel: "23.04"
+        architectures: [s390x]
     run-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [arm64]
-      - name: ubuntu
-        channel: "22.10"
-        architectures: [arm64]
       - name: ubuntu
         channel: "23.04"
-        architectures: [arm64]
+        architectures: [s390x]
   - build-on:
       - name: ubuntu
-        channel: "22.04"
+        channel: "23.04"
         architectures: [ppc64el]
     run-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [ppc64el]
-      - name: ubuntu
-        channel: "22.10"
-        architectures: [ppc64el]
       - name: ubuntu
         channel: "23.04"
         architectures: [ppc64el]
   - build-on:
       - name: ubuntu
-        channel: "22.04"
+        channel: "23.04"
+        architectures: [arm64]
+    run-on:
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [arm64]
+  - build-on:
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [amd64]
+    run-on:
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [amd64]
+  - build-on:
+      - name: ubuntu
+        channel: "23.10"
         architectures: [s390x]
     run-on:
       - name: ubuntu
-        channel: "22.04"
+        channel: "23.10"
         architectures: [s390x]
+  - build-on:
       - name: ubuntu
-        channel: "22.10"
-        architectures: [s390x]
+        channel: "23.10"
+        architectures: [ppc64el]
+    run-on:
       - name: ubuntu
-        channel: "23.04"
-        architectures: [s390x]
+        channel: "23.10"
+        architectures: [ppc64el]
+  - build-on:
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [arm64]
+    run-on:
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [arm64]

osci.yaml

@@ -6,4 +6,4 @@
       needs_charm_build: true
       charm_build_name: cinder-lvm
       build_type: charmcraft
-      charmcraft_channel: 2.1/stable
+      charmcraft_channel: 2.x/edge

src/metadata.yaml

@@ -12,8 +12,8 @@ tags:
   - misc
 series:
   - jammy
-  - kinetic
   - lunar
+  - mantic
 subordinate: true
 provides:
   storage-backend:

src/tests/bundles/jammy-antelope.yaml

@@ -71,7 +71,7 @@ applications:
       - '5'
     channel: latest/edge
   cinder-lvm:
-    charm: ../../../cinder-lvm.charm
+    charm: ../../../cinder-lvm_ubuntu-22.04-amd64.charm
     options:
       block-device: '/tmp/vol1|4G'
       alias: zaza-lvm

src/tests/bundles/jammy-bobcat.yaml

@@ -2,7 +2,7 @@ series: jammy
 local_overlay_enabled: False
 
 variables:
-  openstack-origin: &openstack-origin cloud:jammy-zed
+  openstack-origin: &openstack-origin cloud:jammy-bobcat
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
 machines:
@@ -71,7 +71,7 @@ applications:
       - '5'
     channel: latest/edge
   cinder-lvm:
-    charm: ../../../cinder-lvm.charm
+    charm: ../../../cinder-lvm_ubuntu-22.04-amd64.charm
     options:
       block-device: '/tmp/vol1|4G'
       alias: zaza-lvm

src/tests/bundles/lunar-antelope.yaml

@@ -70,7 +70,7 @@ applications:
       - '5'
     channel: latest/edge
   cinder-lvm:
-    charm: ../../../cinder-lvm.charm
+    charm: ../../../cinder-lvm_ubuntu-23.04-amd64.charm
     options:
       block-device: '/tmp/vol1|4G'
       alias: zaza-lvm

src/tests/bundles/mantic-bobcat.yaml

@@ -0,0 +1,79 @@
+series: mantic
+local_overlay_enabled: False
+
+variables:
+  openstack-origin: &openstack-origin distro
+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':
+    constraints: mem=4G root-disk=16G
+relations:
+  - - keystone:shared-db
+    - keystone-mysql-router:shared-db
+  - - keystone-mysql-router:db-router
+    - mysql-innodb-cluster:db-router
+  - - cinder:shared-db
+    - cinder-mysql-router:shared-db
+  - - cinder-mysql-router:db-router
+    - mysql-innodb-cluster:db-router
+  - - cinder:identity-service
+    - keystone:identity-service
+  - - cinder:amqp
+    - rabbitmq-server:amqp
+  - - cinder:storage-backend
+    - cinder-lvm:storage-backend
+applications:
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    num_units: 3
+    to:
+      - '0'
+      - '1'
+      - '2'
+    channel: latest/edge
+  rabbitmq-server:
+    charm: ch:rabbitmq-server
+    num_units: 1
+    to:
+      - '3'
+    channel: latest/edge
+  keystone:
+    charm: ch:keystone
+    options:
+      openstack-origin: *openstack-origin
+    num_units: 1
+    to:
+      - '4'
+    channel: latest/edge
+  keystone-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  cinder:
+    charm: ch:cinder
+    storage:
+      block-devices: '40G'
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      block-device: None
+      overwrite: "true"
+    to:
+      - '5'
+    channel: latest/edge
+  cinder-lvm:
+    charm: ../../../cinder-lvm_ubuntu-23.10-amd64.charm
+    options:
+      block-device: '/tmp/vol1|4G'
+      alias: zaza-lvm
+  cinder-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge

src/tests/tests.yaml

@@ -4,12 +4,14 @@ tests:
 configure:
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
 gate_bundles:
-  - jammy-zed
-smoke_bundles:
-  - jammy-zed
-dev_bundles:
   - jammy-antelope
+smoke_bundles:
+  - jammy-antelope
+dev_bundles:
+  - jammy-bobcat
   - lunar-antelope
+  - mantic-bobcat
 tests_options:
   force_deploy:
     - lunar-antelope
+    - mantic-bobcat

tox.ini

@@ -46,7 +46,6 @@ basepython = python3
 commands =
     charmcraft clean
     charmcraft -v pack
-    {toxinidir}/rename.sh
     charmcraft clean
 
 [testenv:build-reactive]