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

Change-Id: I8ff90e147d7768281d9065831ecb10ccf8d64ed1

charmcraft.yaml

@@ -19,20 +19,100 @@ parts:
     build-environment:
       - CHARM_INTERFACES_DIR: $CRAFT_PROJECT_DIR/interfaces/
       - CHARM_LAYERS_DIR: $CRAFT_PROJECT_DIR/layers/
-
 bases:
   - build-on:
       - name: ubuntu
         channel: "22.04"
-        architectures:
-          - amd64
+        architectures: [amd64]
     run-on:
       - name: ubuntu
         channel: "22.04"
-        architectures: [amd64, s390x, ppc64el, arm64]
+        architectures: [amd64]
+  - build-on:
       - name: ubuntu
-        channel: "22.10"
-        architectures: [amd64, s390x, ppc64el, arm64]
+        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, s390x, ppc64el, arm64]
+        architectures: [amd64]
+    run-on:
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [amd64]
+  - build-on:
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [s390x]
+    run-on:
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [s390x]
+  - build-on:
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [ppc64el]
+    run-on:
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [ppc64el]
+  - build-on:
+      - name: ubuntu
+        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: "23.10"
+        architectures: [s390x]
+  - build-on:
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [ppc64el]
+    run-on:
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [ppc64el]
+  - build-on:
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [arm64]
+    run-on:
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [arm64]

src/metadata.yaml

@@ -7,8 +7,8 @@ tags:
 - openstack
 series:
 - jammy
-- kinetic
 - lunar
+- mantic
 subordinate: true
 requires:
   dashboard:

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

@@ -0,0 +1,93 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+local_overlay_enabled: False
+
+series: mantic
+
+comment:
+- 'machines section to decide order of deployment. database sooner = faster'
+machines:
+  '0':
+    constraints: mem=3072M
+    series: bionic
+  '1':
+  '2':
+  '3':
+  '4':
+
+applications:
+
+  # TODO: This needs to be replaced with mysql-innodb-cluster + db routers,
+  # once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed.
+  percona-cluster:
+    charm: ch:percona-cluster
+    num_units: 1
+    series: bionic
+    options:
+      max-connections: 1000
+      innodb-buffer-pool-size: 256M
+    to:
+      - '0'
+    channel: latest/edge
+
+  rabbitmq-server:
+    charm: ch:rabbitmq-server
+    num_units: 1
+    to:
+      - '1'
+    channel: latest/edge
+
+  keystone:
+    charm: ch:keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '2'
+    channel: latest/edge
+
+  magnum:
+    charm: ch:magnum
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      cert-manager-type: x509keypair
+    to:
+      - '3'
+    channel: latest/edge
+
+  openstack-dashboard:
+    charm: ch:openstack-dashboard
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+    channel: latest/edge
+
+  magnum-dashboard:
+    charm: ../../../magnum-dashboard.charm
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'percona-cluster:shared-db'
+
+  - - 'magnum:shared-db'
+    - 'percona-cluster:shared-db'
+
+  - - 'magnum:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'magnum:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'openstack-dashboard:shared-db'
+    - 'percona-cluster:shared-db'
+
+  - - 'openstack-dashboard:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'openstack-dashboard:dashboard-plugin'
+    - 'magnum-dashboard:dashboard'

src/tests/tests.yaml

@@ -1,13 +1,14 @@
 charm_name: magnum-dashboard
 smoke_bundles:
-- jammy-zed
+- jammy-antelope
 
 gate_bundles:
-- jammy-zed
+- jammy-antelope
 
 dev_bundles:
-- jammy-antelope
+- jammy-bobcat
 - lunar-antelope
+- mantic-bobcat
 
 target_deploy_status: {}
 
@@ -20,3 +21,4 @@ tests:
 tests_options:
   force_deploy:
     - lunar-antelope
+    - mantic-bobcat