Merge "Add upgrade func testing"

tests/bundles/jammy-antelope.yaml

@@ -26,21 +26,20 @@ applications:
 
   keystone-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     num_units: 3
-    options:
-      source: *source
     to:
       - '0'
       - '1'
       - '2'
-    channel: latest/edge
+    channel: 8.0/edge
 
   ceph-radosgw:
-    charm: ../../ceph-radosgw.charm
+    charm: ch:ceph-radosgw
+    channel: latest/edge
     num_units: 1
     options:
       source: *source
@@ -85,14 +84,14 @@ applications:
 
   vault-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
 
   vault:
     charm: ch:vault
     num_units: 1
     to:
       - '11'
-    channel: latest/edge
+    channel: 1.8/stable
 
 relations:
 

tests/bundles/local-jammy-antelope.yaml

@@ -0,0 +1,121 @@
+options:
+  source: &source cloud:jammy-antelope
+
+series: jammy
+
+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':
+
+applications:
+
+  keystone-mysql-router:
+    charm: ch:mysql-router
+    channel: 8.0/edge
+
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    num_units: 3
+    to:
+      - '0'
+      - '1'
+      - '2'
+    channel: 8.0/edge
+
+  ceph-radosgw:
+    charm: ../../ceph-radosgw.charm
+    num_units: 1
+    options:
+      source: *source
+    to:
+      - '3'
+
+  ceph-osd:
+    charm: ch:ceph-osd
+    num_units: 3
+    constraints: "mem=2048"
+    storage:
+      osd-devices: 'cinder,10G'
+    options:
+      source: *source
+      osd-devices: '/srv/ceph /dev/test-non-existent'
+    to:
+      - '4'
+      - '5'
+      - '6'
+    channel: latest/edge
+
+  ceph-mon:
+    charm: ch:ceph-mon
+    num_units: 3
+    options:
+      source: *source
+    to:
+      - '7'
+      - '8'
+      - '9'
+    channel: latest/edge
+
+  keystone:
+    expose: True
+    charm: ch:keystone
+    num_units: 1
+    options:
+      openstack-origin: *source
+    to:
+      - '10'
+    channel: latest/edge
+
+  vault-mysql-router:
+    charm: ch:mysql-router
+    channel: 8.0/edge
+
+  vault:
+    charm: ch:vault
+    num_units: 1
+    to:
+      - '11'
+    channel: 1.8/stable
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'ceph-osd:mon'
+    - 'ceph-mon:osd'
+
+  - - 'ceph-radosgw:mon'
+    - 'ceph-mon:radosgw'
+
+  - - 'ceph-radosgw:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'vault-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'vault:shared-db'
+    - 'vault-mysql-router:shared-db'
+
+  - - 'keystone:certificates'
+    - 'vault:certificates'
+
+  - - 'ceph-radosgw:certificates'
+    - 'vault:certificates'

tests/tests.yaml

@@ -39,6 +39,12 @@ tests:
     - zaza.openstack.charm_tests.swift.tests.S3APITest
     - zaza.openstack.charm_tests.ceph.tests.CheckPoolTypes
     - zaza.openstack.charm_tests.ceph.tests.BlueStoreCompressionCharmOperation
+    # Charm upgrade, then re-run tests
+    - zaza.charm_tests.lifecycle.tests.UpgradeCharmsToPath;ceph-radosgw
+    - zaza.openstack.charm_tests.ceph.tests.CephRGWTest
+    - zaza.openstack.charm_tests.swift.tests.S3APITest
+    - zaza.openstack.charm_tests.ceph.tests.CheckPoolTypes
+    - zaza.openstack.charm_tests.ceph.tests.BlueStoreCompressionCharmOperation
 
 tests_options:
   force_deploy: