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

Change-Id: I2be9b758a038aad799c834f9a868f89751979413

charmcraft.yaml

@@ -34,3 +34,6 @@ bases:
       - name: ubuntu
         channel: "23.04"
         architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [amd64, s390x, ppc64el, arm64]

metadata.yaml

@@ -18,6 +18,7 @@ tags:
 series:
   - focal
   - jammy
+  - mantic
 provides:
   keystone-fid-service-provider:
     interface: keystone-fid-service-provider

tests/bundles/jammy-antelope.yaml

@@ -1,7 +1,7 @@
 variables:
   openstack-origin: &openstack-origin cloud:jammy-antelope
 
-local_overlay_enabled: False
+local_overlay_enabled: True
 
 series: jammy
 

tests/bundles/jammy-bobcat.yaml

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

tests/bundles/lunar-antelope.yaml

@@ -1,7 +1,7 @@
 variables:
   openstack-origin: &openstack-origin distro
 
-local_overlay_enabled: False
+local_overlay_enabled: True
 
 series: lunar
 

tests/bundles/mantic-bobcat.yaml

@@ -0,0 +1,373 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+local_overlay_enabled: True
+
+series: mantic
+
+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':
+  '6':
+  '7':
+  '8':
+  '9':
+  # machines 10 and 11 are for nova-compute which needs more memory for the
+  # instances.
+  '10':
+    constraints: mem=4096M cores=4
+  '11':
+    constraints: mem=4096M cores=4
+  '12':
+  '13':
+  '14':
+  '15':
+  '16':
+  '17':
+  '18':
+  '19':
+     series: jammy
+
+applications:
+
+  keystone-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  neutron-api-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  glance-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  openstack-dashboard-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  nova-cloud-controller-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  cinder-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  vault-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  placement-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+    channel: latest/edge
+
+  cinder:
+    num_units: 1
+    charm: ch:cinder
+    options:
+      openstack-origin: *openstack-origin
+      glance-api-version: 2
+      block-device: None
+    to:
+      - '3'
+    channel: latest/edge
+
+  glance:
+    charm: ch:glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+    channel: latest/edge
+
+  keystone:
+    charm: ch:keystone
+    num_units: 3
+    options:
+      openstack-origin: *openstack-origin
+      token-provider: 'fernet'
+    to:
+      - '5'
+      - '6'
+      - '7'
+    channel: latest/edge
+
+  neutron-api:
+    charm: ch:neutron-api
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      manage-neutron-plugin-legacy-mode: true
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+    to:
+      - '8'
+    channel: latest/edge
+
+  nova-cloud-controller:
+    charm: ch:nova-cloud-controller
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      network-manager: Neutron
+    to:
+      - '9'
+    channel: latest/edge
+
+  nova-compute:
+    charm: ch:nova-compute
+    num_units: 2
+    options:
+      openstack-origin: *openstack-origin
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+    to:
+      - '10'
+      - '11'
+    channel: latest/edge
+
+  ntp:
+    charm: ch:ntp
+    num_units: 0
+
+  openstack-dashboard:
+    charm: ch:openstack-dashboard
+    num_units: 3
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '12'
+      - '13'
+      - '14'
+    channel: latest/edge
+
+  rabbitmq-server:
+    charm: ch:rabbitmq-server
+    num_units: 1
+    to:
+      - '15'
+    channel: latest/edge
+
+  vault:
+    num_units: 1
+    charm: ch:vault
+    to:
+      - '16'
+    channel: latest/edge
+
+  placement:
+    charm: ch:placement
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '17'
+    channel: latest/edge
+
+  keystone-openidc:
+    charm: ../../keystone-openidc.charm
+    num_units: 0
+
+  keystone-hacluster:
+    charm: ch:hacluster
+    num_units: 0
+    options:
+      corosync_transport: unicast
+      cluster_count: 3
+    channel: latest/edge
+
+  openstack-dashboard-hacluster:
+    charm: ch:hacluster
+    num_units: 0
+    options:
+      corosync_transport: unicast
+      cluster_count: 3
+    channel: latest/edge
+
+  neutron-gateway:
+    charm: ch:neutron-gateway
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      bridge-mappings: physnet1:br-ex
+    to:
+      - '18'
+    channel: latest/edge
+
+  neutron-openvswitch:
+    charm: ch:neutron-openvswitch
+    channel: latest/edge
+
+  openidc-test-fixture:
+    charm: ch:openidc-test-fixture
+    num_units: 1
+    series: jammy
+    channel: latest/edge
+    to:
+      - '19'
+
+relations:
+
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-api:shared-db'
+    - 'neutron-api-mysql-router:shared-db'
+  - - 'neutron-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'glance:shared-db'
+    - 'glance-mysql-router:shared-db'
+  - - 'glance-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
+
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'openstack-dashboard:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'openstack-dashboard:shared-db'
+    - 'openstack-dashboard-mysql-router:shared-db'
+  - - 'openstack-dashboard-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'nova-cloud-controller:shared-db'
+    - 'nova-cloud-controller-mysql-router:shared-db'
+  - - 'nova-cloud-controller-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'nova-cloud-controller:neutron-api'
+    - 'neutron-api:neutron-api'
+
+  - - 'cinder:image-service'
+    - 'glance:image-service'
+
+  - - 'cinder:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'cinder:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'cinder:cinder-volume-service'
+    - 'nova-cloud-controller:cinder-volume-service'
+
+  - - 'cinder:shared-db'
+    - 'cinder-mysql-router:shared-db'
+  - - 'cinder-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'ntp:juju-info'
+    - 'nova-compute:juju-info'
+
+  - - 'vault:shared-db'
+    - 'vault-mysql-router:shared-db'
+  - - 'vault-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'vault:certificates'
+    - 'keystone:certificates'
+
+  - - 'vault:certificates'
+    - 'glance:certificates'
+
+  - - 'vault:certificates'
+    - 'openstack-dashboard:certificates'
+
+  - - 'keystone:websso-trusted-dashboard'
+    - 'openstack-dashboard:websso-trusted-dashboard'
+
+  - - 'vault:certificates'
+    - 'cinder:certificates'
+
+  - - 'vault:certificates'
+    - 'neutron-api:certificates'
+
+  - - 'vault:certificates'
+    - 'nova-cloud-controller:certificates'
+
+  - - 'placement:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'placement:placement'
+    - 'nova-cloud-controller:placement'
+
+  - - 'vault:certificates'
+    - 'placement:certificates'
+
+  - - "placement:shared-db"
+    - "placement-mysql-router:shared-db"
+  - - "placement-mysql-router:db-router"
+    - "mysql-innodb-cluster:db-router"
+
+  - - "keystone:ha"
+    - "keystone-hacluster:ha"
+  - - "openstack-dashboard:ha"
+    - "openstack-dashboard-hacluster:ha"
+
+  - - 'keystone-openidc:keystone-fid-service-provider'
+    - 'keystone:keystone-fid-service-provider'
+
+  - - 'keystone-openidc:websso-fid-service-provider'
+    - 'openstack-dashboard:websso-fid-service-provider'
+
+  - - 'vault:certificates'
+    - 'openidc-test-fixture:certificates'
+
+  - - 'neutron-gateway:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:quantum-network-service'
+    - 'neutron-gateway:quantum-network-service'
+
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+
+  - - 'rabbitmq-server:amqp'
+    - 'neutron-openvswitch:amqp'

tests/bundles/overlays/jammy-antelope.yaml.j2

@@ -1 +0,0 @@
-ha.yaml.j2

tests/bundles/overlays/jammy-zed.yaml.j2

@@ -1 +0,0 @@
-ha.yaml.j2

tests/bundles/overlays/lunar-antelope.yaml.j2

@@ -1 +0,0 @@
-ha.yaml.j2

tests/tests.yaml

@@ -1,14 +1,15 @@
 charm_name: keystone-openidc
 
 smoke_bundles:
-- jammy-zed
+- jammy-antelope
 
 gate_bundles:
-- jammy-zed
+- jammy-antelope
 
 dev_bundles:
-- jammy-antelope
+- jammy-bobcat
 - lunar-antelope
+- mantic-bobcat
 
 configure:
 - zaza.openstack.charm_tests.vault.setup.auto_initialize
@@ -41,3 +42,4 @@ target_deploy_status:
 tests_options:
   force_deploy:
     - lunar-antelope
+    - mantic-bobcat