From 5f6c9e74c4f8396817f0c94dac6bc86b35155d71 Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex.kavanagh@canonical.com>
Date: Fri, 5 Mar 2021 18:00:13 +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: I968788863d39248f2d1e401ac043bfffa3efb99a
Co-authored-by: Aurelien Lourot <aurelien.lourot@canonical.com>
---
 osci.yaml                              |  4 +-
 src/tests/bundles/focal-wallaby.yaml   | 78 +++++++++++++++++++++++++
 src/tests/bundles/hirsute-wallaby.yaml | 79 ++++++++++++++++++++++++++
 src/tests/tests.yaml                   | 11 +++-
 4 files changed, 170 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 db721d5..7332d70 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -7,7 +7,9 @@
       - bionic-ussuri
       - focal-ussuri
       - focal-victoria
+      - focal-wallaby
       - groovy-victoria
+      - hirsute-wallaby
     vars:
       needs_charm_build: true
-      charm_build_name: ovn-dedicated-chassis
\ No newline at end of file
+      charm_build_name: ovn-dedicated-chassis
diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml
new file mode 100644
index 0000000..1965f4e
--- /dev/null
+++ b/src/tests/bundles/focal-wallaby.yaml
@@ -0,0 +1,78 @@
+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':
+  '6':
+  '7':
+  '8':
+
+applications:
+
+  vault-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'
+
+  vault:
+    charm: cs:~openstack-charmers-next/vault
+    num_units: 1
+    to:
+      - '3'
+
+  ovn-central:
+    charm: cs:~openstack-charmers-next/ovn-central
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '4'
+      - '5'
+      - '6'
+
+  nrpe:
+    charm: cs:nrpe
+
+  ovn-dedicated-chassis:
+    charm: cs:~openstack-charmers-next/ovn-dedicated-chassis
+    num_units: 2
+    options:
+      source: *openstack-origin
+    to:
+      - '7'
+      - '8'
+
+relations:
+
+  - - 'vault-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+  - - 'vault:shared-db'
+    - 'vault-mysql-router:shared-db'
+  - - 'ovn-central:certificates'
+    - 'vault:certificates'
+  - - 'ovn-dedicated-chassis:ovsdb'
+    - 'ovn-central:ovsdb'
+  - - 'ovn-dedicated-chassis:certificates'
+    - 'vault:certificates'
+  - - 'ovn-dedicated-chassis:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'
diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml
new file mode 100644
index 0000000..ea83f15
--- /dev/null
+++ b/src/tests/bundles/hirsute-wallaby.yaml
@@ -0,0 +1,79 @@
+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':
+  '6':
+  '7':
+  '8':
+
+applications:
+
+  vault-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'
+
+  vault:
+    charm: cs:~openstack-charmers-next/vault
+    num_units: 1
+    to:
+      - '3'
+  
+  nrpe:
+    charm: cs:nrpe
+
+  ovn-central:
+    charm: cs:~openstack-charmers-next/ovn-central
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '4'
+      - '5'
+      - '6'
+
+  ovn-dedicated-chassis:
+    charm: ../../../ovn-dedicated-chassis
+    num_units: 2
+    options:
+      source: *openstack-origin
+    to:
+      - '7'
+      - '8'
+
+
+relations:
+
+  - - 'vault-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+  - - 'vault:shared-db'
+    - 'vault-mysql-router:shared-db'
+  - - 'ovn-central:certificates'
+    - 'vault:certificates'
+  - - 'ovn-dedicated-chassis:ovsdb'
+    - 'ovn-central:ovsdb'
+  - - 'ovn-dedicated-chassis:certificates'
+    - 'vault:certificates'
+  - - 'ovn-dedicated-chassis:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 41e58d1..2a7bd72 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,12 +1,17 @@
 charm_name: ovn-dedicated-chassis
+
 gate_bundles:
 - bionic-train
 - bionic-ussuri
 - focal-ussuri
 - focal-victoria
+- focal-wallaby
 - groovy-victoria
+- hirsute-wallaby
+
 smoke_bundles:
 - focal-ussuri
+
 target_deploy_status:
   ovn-central:
     workload-status: waiting
@@ -20,11 +25,15 @@ target_deploy_status:
   nrpe:
     workload-status: blocked
     workload-status-message: "Nagios server not configured or related"
+
 configure:
 - zaza.openstack.charm_tests.vault.setup.auto_initialize_no_validation
+
 tests:
 - zaza.openstack.charm_tests.ovn.tests.OVNDedicatedChassisDeferredRestartTest
 - zaza.openstack.charm_tests.ovn.tests.ChassisCharmOperationTest
+
 tests_options:
   force_deploy:
-    - groovy-victoria
+    - groovy-victoria  # workaround for lp:1933643
+    - hirsute-wallaby