From e7b0ae68ad70178a517168cbaf77295117e4d722 Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex.kavanagh@canonical.com>
Date: Fri, 5 Mar 2021 12:16:19 +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.

hisute-wallaby test is disabled (moved to dev) due to [1].

[1] https://github.com/juju-solutions/layer-basic/issues/194

Change-Id: I70c579bc425746b30be12cb30e660542da842c48
(cherry picked from commit 129e0ca9bf504aa8f87ca1421e96fe2947654680)
---
 osci.yaml                              |  4 +-
 src/tests/bundles/focal-wallaby.yaml   | 85 ++++++++++++++++++++++++++
 src/tests/bundles/hirsute-wallaby.yaml | 85 ++++++++++++++++++++++++++
 src/tests/tests.yaml                   | 11 +++-
 4 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 src/tests/bundles/focal-wallaby.yaml
 create mode 100644 src/tests/bundles/hirsute-wallaby.yaml

diff --git a/osci.yaml b/osci.yaml
index 72d3718..e17a471 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -9,7 +9,9 @@
       - bionic-ussuri
       - focal-ussuri
       - focal-victoria
+      - focal-wallaby
       - groovy-victoria
+      - hirsute-wallaby
     vars:
       needs_charm_build: true
-      charm_build_name: manila-generic
\ No newline at end of file
+      charm_build_name: manila-generic
diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml
new file mode 100644
index 0000000..b164f4a
--- /dev/null
+++ b/src/tests/bundles/focal-wallaby.yaml
@@ -0,0 +1,85 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-wallaby
+
+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':
+
+services:
+
+  manila-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  keystone-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'
+
+  manila:
+    charm: cs:~openstack-charmers-next/manila
+    num_units: 1
+    options:
+      default-share-backend: generic
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+
+  manila-generic:
+    charm: ../../../manila-generic
+    options:
+      driver-handles-share-servers: False
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '4'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+
+relations:
+
+  - - 'manila:shared-db'
+    - 'manila-mysql-router:shared-db'
+  - - 'manila-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'manila:manila-plugin'
+    - 'manila-generic'
+
+  - - 'manila'
+    - 'rabbitmq-server'
+
+  - - 'manila'
+    - 'keystone'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml
new file mode 100644
index 0000000..5c28b1b
--- /dev/null
+++ b/src/tests/bundles/hirsute-wallaby.yaml
@@ -0,0 +1,85 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: hirsute
+
+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':
+
+services:
+
+  manila-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  keystone-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'
+
+  manila:
+    charm: cs:~openstack-charmers-next/manila
+    num_units: 1
+    options:
+      default-share-backend: generic
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+
+  manila-generic:
+    charm: ../../../manila-generic
+    options:
+      driver-handles-share-servers: False
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '4'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+
+relations:
+
+  - - 'manila:shared-db'
+    - 'manila-mysql-router:shared-db'
+  - - 'manila-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'manila:manila-plugin'
+    - 'manila-generic'
+
+  - - 'manila'
+    - 'rabbitmq-server'
+
+  - - 'manila'
+    - 'keystone'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 5f0bc60..d89aa0e 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,4 +1,5 @@
 charm_name: manila-generic
+
 gate_bundles:
   - bionic-queens
   - bionic-stein
@@ -6,18 +7,26 @@ gate_bundles:
   - bionic-ussuri
   - focal-ussuri
   - focal-victoria
+  - focal-wallaby
   - groovy-victoria
+
 smoke_bundles:
   - focal-ussuri
+
 dev_bundles:
   - xenial-pike
   - xenial-queens
   - bionic-rocky
+  - hirsute-wallaby
+
 target_deploy_status: {}
+
 tests:
   - zaza.openstack.charm_tests.manila.tests.ManilaTests
+
 configure:
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
+
 tests_options:
   force_deploy:
-    - groovy-victoria
+    - hirsute-wallaby