From 1845ed2f50453257e83a1c16d0389cc6aa1ebd4f Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex@ajkavanagh.co.uk>
Date: Wed, 3 Mar 2021 20:38:55 +0000
Subject: [PATCH] Test bundles for focal-wallaby and hirsute-wallaby

These are the test bundles (and any associated changes) for
focal-wallaby and hirsute-wallaby support.

Change-Id: I53d0b42b43731ac06d96932f3dcf72c116f360f3
---
 .../focal-wallaby-image-mirroring.yaml        | 171 ++++++++++++++++++
 src/tests/bundles/focal-wallaby.yaml          | 167 +++++++++++++++++
 .../hirsute-wallaby-image-mirroring.yaml      | 171 ++++++++++++++++++
 src/tests/bundles/hirsute-wallaby.yaml        | 166 +++++++++++++++++
 src/tests/tests.yaml                          |   6 +-
 5 files changed, 680 insertions(+), 1 deletion(-)
 create mode 100644 src/tests/bundles/focal-wallaby-image-mirroring.yaml
 create mode 100644 src/tests/bundles/focal-wallaby.yaml
 create mode 100644 src/tests/bundles/hirsute-wallaby-image-mirroring.yaml
 create mode 100644 src/tests/bundles/hirsute-wallaby.yaml

diff --git a/src/tests/bundles/focal-wallaby-image-mirroring.yaml b/src/tests/bundles/focal-wallaby-image-mirroring.yaml
new file mode 100644
index 0000000..b28a824
--- /dev/null
+++ b/src/tests/bundles/focal-wallaby-image-mirroring.yaml
@@ -0,0 +1,171 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-wallaby
+
+series: &series focal
+
+machines:
+  '0':
+    constraints: "mem=3072M"
+  '1':
+    constraints: "mem=3072M"
+  '2':
+    constraints: "mem=3072M"
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  cinder-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+
+  cinder:
+    charm: cs:~openstack-charmers-next/cinder
+    num_units: 1
+    options:
+      block-device: None
+      glance-api-version: 2
+      openstack-origin: *openstack-origin
+
+  cinder-ceph:
+    charm: cs:~openstack-charmers-next/cinder-ceph
+    num_units: 0
+    options:
+      rbd-mirroring-mode: image
+
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      expected-osd-count: 3
+      source: *openstack-origin
+
+  ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    options:
+      source: *openstack-origin
+      bluestore: False
+      use-direct-io: False
+      osd-devices: /opt
+
+  ceph-rbd-mirror:
+    series: *series
+    charm: ../../../ceph-rbd-mirror
+    num_units: 1
+    options:
+      source: *openstack-origin
+
+  ceph-mon-b:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      expected-osd-count: 3
+      source: *openstack-origin
+
+  ceph-osd-b:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    options:
+      source: *openstack-origin
+      bluestore: False
+      use-direct-io: False
+      osd-devices: /opt
+
+  ceph-rbd-mirror-b:
+    series: *series
+    charm: ../../../ceph-rbd-mirror
+    num_units: 1
+    options:
+      source: *openstack-origin
+
+relations:
+
+- - 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
+
+- - cinder:shared-db
+  - cinder-mysql-router:shared-db
+- - cinder-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+
+- - rabbitmq-server
+  - cinder
+
+- - keystone
+  - cinder
+- - keystone
+  - glance
+
+- - cinder
+  - cinder-ceph
+- - cinder-ceph:ceph
+  - ceph-mon:client
+- - cinder-ceph:ceph-replication-device
+  - ceph-mon-b:client
+
+- - nova-compute:ceph-access
+  - cinder-ceph:ceph-access
+- - nova-compute:amqp
+  - rabbitmq-server:amqp
+
+- - glance:image-service
+  - nova-compute:image-service
+- - glance
+  - ceph-mon
+
+- - ceph-mon:osd
+  - ceph-osd:mon
+- - ceph-mon
+  - ceph-rbd-mirror:ceph-local
+- - ceph-mon
+  - ceph-rbd-mirror-b:ceph-remote
+
+- - ceph-mon-b:osd
+  - ceph-osd-b:mon
+- - ceph-mon-b
+  - ceph-rbd-mirror-b:ceph-local
+- - ceph-mon-b
+  - ceph-rbd-mirror:ceph-remote
diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml
new file mode 100644
index 0000000..8e82a18
--- /dev/null
+++ b/src/tests/bundles/focal-wallaby.yaml
@@ -0,0 +1,167 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-wallaby
+
+series: &series focal
+
+machines:
+  '0':
+    constraints: "mem=3072M"
+  '1':
+    constraints: "mem=3072M"
+  '2':
+    constraints: "mem=3072M"
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  cinder-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+
+  cinder:
+    charm: cs:~openstack-charmers-next/cinder
+    num_units: 1
+    options:
+      block-device: None
+      glance-api-version: 2
+      openstack-origin: *openstack-origin
+
+  cinder-ceph:
+    charm: cs:~openstack-charmers-next/cinder-ceph
+    num_units: 0
+
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      expected-osd-count: 3
+      source: *openstack-origin
+
+  ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    options:
+      source: *openstack-origin
+      bluestore: False
+      use-direct-io: False
+      osd-devices: /opt
+
+  ceph-rbd-mirror:
+    series: *series
+    charm: ../../../ceph-rbd-mirror
+    num_units: 1
+    options:
+      source: *openstack-origin
+
+  ceph-mon-b:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      expected-osd-count: 3
+      source: *openstack-origin
+
+  ceph-osd-b:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    options:
+      source: *openstack-origin
+      bluestore: False
+      use-direct-io: False
+      osd-devices: /opt
+
+  ceph-rbd-mirror-b:
+    series: *series
+    charm: ../../../ceph-rbd-mirror
+    num_units: 1
+    options:
+      source: *openstack-origin
+
+relations:
+
+- - 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
+
+- - cinder:shared-db
+  - cinder-mysql-router:shared-db
+- - cinder-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+
+- - rabbitmq-server
+  - cinder
+
+- - keystone
+  - cinder
+- - keystone
+  - glance
+
+- - cinder
+  - cinder-ceph
+- - cinder-ceph:ceph
+  - ceph-mon:client
+
+- - nova-compute:ceph-access
+  - cinder-ceph:ceph-access
+- - nova-compute:amqp
+  - rabbitmq-server:amqp
+
+- - glance:image-service
+  - nova-compute:image-service
+- - glance
+  - ceph-mon
+
+- - ceph-mon:osd
+  - ceph-osd:mon
+- - ceph-mon
+  - ceph-rbd-mirror:ceph-local
+- - ceph-mon
+  - ceph-rbd-mirror-b:ceph-remote
+
+- - ceph-mon-b:osd
+  - ceph-osd-b:mon
+- - ceph-mon-b
+  - ceph-rbd-mirror-b:ceph-local
+- - ceph-mon-b
+  - ceph-rbd-mirror:ceph-remote
diff --git a/src/tests/bundles/hirsute-wallaby-image-mirroring.yaml b/src/tests/bundles/hirsute-wallaby-image-mirroring.yaml
new file mode 100644
index 0000000..61413d3
--- /dev/null
+++ b/src/tests/bundles/hirsute-wallaby-image-mirroring.yaml
@@ -0,0 +1,171 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: &series hirsute
+
+machines:
+  '0':
+    constraints: "mem=3072M"
+  '1':
+    constraints: "mem=3072M"
+  '2':
+    constraints: "mem=3072M"
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  cinder-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+
+  cinder:
+    charm: cs:~openstack-charmers-next/cinder
+    num_units: 1
+    options:
+      block-device: None
+      glance-api-version: 2
+      openstack-origin: *openstack-origin
+
+  cinder-ceph:
+    charm: cs:~openstack-charmers-next/cinder-ceph
+    num_units: 0
+    options:
+      rbd-mirroring-mode: image
+
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      expected-osd-count: 3
+      source: *openstack-origin
+
+  ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    options:
+      source: *openstack-origin
+      bluestore: False
+      use-direct-io: False
+      osd-devices: /opt
+
+  ceph-rbd-mirror:
+    series: *series
+    charm: ../../../ceph-rbd-mirror
+    num_units: 1
+    options:
+      source: *openstack-origin
+
+  ceph-mon-b:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      expected-osd-count: 3
+      source: *openstack-origin
+
+  ceph-osd-b:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    options:
+      source: *openstack-origin
+      bluestore: False
+      use-direct-io: False
+      osd-devices: /opt
+
+  ceph-rbd-mirror-b:
+    series: *series
+    charm: ../../../ceph-rbd-mirror
+    num_units: 1
+    options:
+      source: *openstack-origin
+
+relations:
+
+- - 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
+
+- - cinder:shared-db
+  - cinder-mysql-router:shared-db
+- - cinder-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+
+- - rabbitmq-server
+  - cinder
+
+- - keystone
+  - cinder
+- - keystone
+  - glance
+
+- - cinder
+  - cinder-ceph
+- - cinder-ceph:ceph
+  - ceph-mon:client
+- - cinder-ceph:ceph-replication-device
+  - ceph-mon-b:client
+
+- - nova-compute:ceph-access
+  - cinder-ceph:ceph-access
+- - nova-compute:amqp
+  - rabbitmq-server:amqp
+
+- - glance:image-service
+  - nova-compute:image-service
+- - glance
+  - ceph-mon
+
+- - ceph-mon:osd
+  - ceph-osd:mon
+- - ceph-mon
+  - ceph-rbd-mirror:ceph-local
+- - ceph-mon
+  - ceph-rbd-mirror-b:ceph-remote
+
+- - ceph-mon-b:osd
+  - ceph-osd-b:mon
+- - ceph-mon-b
+  - ceph-rbd-mirror-b:ceph-local
+- - ceph-mon-b
+  - ceph-rbd-mirror:ceph-remote
diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml
new file mode 100644
index 0000000..e2e10c5
--- /dev/null
+++ b/src/tests/bundles/hirsute-wallaby.yaml
@@ -0,0 +1,166 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: &series hirsute
+
+machines:
+  '0':
+    constraints: "mem=3072M"
+  '1':
+    constraints: "mem=3072M"
+  '2':
+    constraints: "mem=3072M"
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  cinder-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+
+  cinder:
+    charm: cs:~openstack-charmers-next/cinder
+    num_units: 1
+    options:
+      block-device: None
+      glance-api-version: 2
+
+  cinder-ceph:
+    charm: cs:~openstack-charmers-next/cinder-ceph
+    num_units: 0
+
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      expected-osd-count: 3
+      source: *openstack-origin
+
+  ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    options:
+      source: *openstack-origin
+      bluestore: False
+      use-direct-io: False
+      osd-devices: /opt
+
+  ceph-rbd-mirror:
+    series: *series
+    charm: ../../../ceph-rbd-mirror
+    num_units: 1
+    options:
+      source: *openstack-origin
+
+  ceph-mon-b:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      expected-osd-count: 3
+      source: *openstack-origin
+
+  ceph-osd-b:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    options:
+      source: *openstack-origin
+      bluestore: False
+      use-direct-io: False
+      osd-devices: /opt
+
+  ceph-rbd-mirror-b:
+    series: *series
+    charm: ../../../ceph-rbd-mirror
+    num_units: 1
+    options:
+      source: *openstack-origin
+
+relations:
+
+- - 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
+
+- - cinder:shared-db
+  - cinder-mysql-router:shared-db
+- - cinder-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+
+- - rabbitmq-server
+  - cinder
+
+- - keystone
+  - cinder
+- - keystone
+  - glance
+
+- - cinder
+  - cinder-ceph
+- - cinder-ceph:ceph
+  - ceph-mon:client
+
+- - nova-compute:ceph-access
+  - cinder-ceph:ceph-access
+- - nova-compute:amqp
+  - rabbitmq-server:amqp
+
+- - glance:image-service
+  - nova-compute:image-service
+- - glance
+  - ceph-mon
+
+- - ceph-mon:osd
+  - ceph-osd:mon
+- - ceph-mon
+  - ceph-rbd-mirror:ceph-local
+- - ceph-mon
+  - ceph-rbd-mirror-b:ceph-remote
+
+- - ceph-mon-b:osd
+  - ceph-osd-b:mon
+- - ceph-mon-b
+  - ceph-rbd-mirror-b:ceph-local
+- - ceph-mon-b
+  - ceph-rbd-mirror:ceph-remote
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index abbdd2b..bb6fa20 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -10,8 +10,12 @@ comment: |
   The e2e bundles are useful for development but adds no additional value to
   the functional tests.
 dev_bundles:
+- hirsute-wallaby
+- hirsute-wallaby-image-mirroring
 - groovy-victoria
 - groovy-victoria-image-mirroring
+- focal-wallaby
+- focal-wallaby-image-mirroring
 - focal-victoria
 - focal-victoria-image-mirroring
 - bionic-queens-e2e
@@ -32,4 +36,4 @@ tests:
 - zaza.openstack.charm_tests.ceph.rbd_mirror.tests.CephRBDMirrorDisasterFailoverTest
 tests_options:
   force_deploy:
-    - groovy-victoria
+    - hirsute-wallaby