Test upgrade path

This patchset rearranges the tests so that the upgrade path is
properly tested, with the tests that aren't in main moved into
a different class.

func-test-pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/849
Change-Id: I5ca38134115f82ac6dff5f559757df68a6c0cd24

tests/bundles/focal-xena.yaml

@@ -72,7 +72,8 @@ applications:
     channel: quincy/edge
 
   ceph-mon:
-    charm: ../../ceph-mon.charm
+    charm: ch:ceph-mon
+    channel: quincy/edge
     num_units: 3
     options:
       source: *openstack-origin

tests/bundles/focal-yoga.yaml

@@ -72,7 +72,8 @@ applications:
     channel: quincy/edge
 
   ceph-mon:
-    charm: ../../ceph-mon.charm
+    charm: ch:ceph-mon
+    channel: quincy/edge
     num_units: 3
     options:
       source: *openstack-origin

tests/bundles/jammy-yoga.yaml

@@ -73,7 +73,8 @@ applications:
     channel: quincy/edge
 
   ceph-mon:
-    charm: ../../ceph-mon.charm
+    charm: ch:ceph-mon
+    channel: quincy/edge
     num_units: 3
     options:
       source: *openstack-origin

tests/bundles/local-focal-yoga.yaml

@@ -0,0 +1,249 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-yoga
+
+series: focal
+
+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':
+  '10':
+  '11':
+  '12':
+  '13':
+  '14':
+  '15':
+  '16':
+
+
+applications:
+
+  keystone-mysql-router:
+    charm: ch:mysql-router
+    channel: 8.0.19/edge
+  glance-mysql-router:
+    charm: ch:mysql-router
+    channel: 8.0.19/edge
+  cinder-mysql-router:
+    charm: ch:mysql-router
+    channel: 8.0.19/edge
+  nova-cloud-controller-mysql-router:
+    charm: ch:mysql-router
+    channel: 8.0.19/edge
+  placement-mysql-router:
+    charm: ch:mysql-router
+    channel: 8.0.19/edge
+
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+    channel: 8.0.19/edge
+
+  ceph-osd:
+    charm: ch:ceph-osd
+    num_units: 3
+    storage:
+      osd-devices: '10G'
+    options:
+      source: *openstack-origin
+      osd-devices: '/dev/test-non-existent'
+    to:
+      - '3'
+      - '4'
+      - '5'
+    channel: quincy/edge
+
+  ceph-mon:
+    charm: ../../ceph-mon.charm
+    num_units: 3
+    options:
+      source: *openstack-origin
+      monitor-count: '3'
+    to:
+      - '6'
+      - '7'
+      - '8'
+
+  rabbitmq-server:
+    charm: ch:rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '9'
+    channel: 3.9/edge
+
+  keystone:
+    expose: True
+    charm: ch:keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '10'
+    channel: yoga/edge
+
+  nova-compute:
+    charm: ch:nova-compute
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      libvirt-image-backend: rbd
+    to:
+      - '11'
+    channel: yoga/edge
+
+  glance:
+    expose: True
+    charm: ch:glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '12'
+    channel: yoga/edge
+
+  cinder:
+    expose: True
+    charm: ch:cinder
+    num_units: 1
+    options:
+      block-device: 'None'
+      glance-api-version: '2'
+      openstack-origin: *openstack-origin
+    to:
+      - '13'
+    channel: yoga/edge
+
+  cinder-ceph:
+    charm: ch:cinder-ceph
+    channel: yoga/edge
+
+  nova-cloud-controller:
+    expose: True
+    charm: ch:nova-cloud-controller
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '14'
+    channel: yoga/edge
+
+  placement:
+    charm: ch:placement
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '15'
+    channel: yoga/edge
+
+  prometheus2:
+    charm: ch:prometheus2
+    num_units: 1
+    to:
+      - '16'
+
+relations:
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+
+  - - 'nova-compute:ceph'
+    - 'ceph-mon:client'
+
+  - - nova-compute:ceph-access
+    - cinder-ceph:ceph-access
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:shared-db'
+    - 'glance-mysql-router:shared-db'
+  - - 'glance-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'glance:ceph'
+    - 'ceph-mon:client'
+
+  - - '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:image-service'
+    - 'glance:image-service'
+
+  - - 'cinder-ceph:storage-backend'
+    - 'cinder:storage-backend'
+
+  - - 'cinder-ceph:ceph'
+    - 'ceph-mon:client'
+
+  - - 'ceph-osd:mon'
+    - 'ceph-mon:osd'
+
+  - - '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:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
+
+  - - 'placement:shared-db'
+    - 'placement-mysql-router:shared-db'
+  - - 'placement-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'placement'
+    - 'keystone'
+
+  - - 'placement'
+    - 'nova-cloud-controller'
+
+  - - 'ceph-mon:prometheus'
+    - 'prometheus2:target'

tests/tests.yaml

@@ -20,7 +20,16 @@ tests:
   - zaza.openstack.charm_tests.ceph.tests.CephTest
   - zaza.openstack.charm_tests.ceph.osd.tests.SecurityTest
   - zaza.openstack.charm_tests.ceph.tests.CephPrometheusTest
-
+  # Charm upgrade, then re-run tests
+  - zaza.charm_tests.lifecycle.tests.UpgradeCharmsToPath;ceph-mon
+  - zaza.openstack.charm_tests.ceph.tests.CheckPoolTypes
+  - zaza.openstack.charm_tests.ceph.tests.CephLowLevelTest
+  - zaza.openstack.charm_tests.ceph.tests.CephRelationTest
+  - zaza.openstack.charm_tests.ceph.tests.CephTest
+  - zaza.openstack.charm_tests.ceph.osd.tests.SecurityTest
+  - zaza.openstack.charm_tests.ceph.tests.CephPrometheusTest
+  # Tests from quincy.
+  - zaza.openstack.charm_tests.ceph.tests.CephAuthTest
 tests_options:
   force_deploy:
     - jammy-yoga