From e43e1de8ca44561bac74f860fed9659aff7194fc Mon Sep 17 00:00:00 2001
From: Aurelien Lourot <aurelien.lourot@canonical.com>
Date: Wed, 15 Jul 2020 10:17:50 +0200
Subject: [PATCH] Add Victoria test bundles

Change-Id: I5af31091596098726e269a337f78955ec9b91d44
---
 tests/bundles/focal-victoria.yaml  | 54 ++++++++++++++++++++++++++++++
 tests/bundles/groovy-victoria.yaml | 54 ++++++++++++++++++++++++++++++
 tests/tests.yaml                   |  5 +--
 3 files changed, 111 insertions(+), 2 deletions(-)
 create mode 100755 tests/bundles/focal-victoria.yaml
 create mode 100755 tests/bundles/groovy-victoria.yaml

diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml
new file mode 100755
index 0000000..a333fb2
--- /dev/null
+++ b/tests/bundles/focal-victoria.yaml
@@ -0,0 +1,54 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-victoria
+
+series: focal
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+
+applications:
+
+  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'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 3
+    options:
+      token-expiration: 60
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+      - '4'
+      - '5'
+
+  hacluster:
+    charm: ../../../hacluster
+    subordinate-to:
+      - keystone
+
+relations:
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'hacluster:ha'
+    - 'keystone:ha'
+  - - "keystone-mysql-router:db-router"
+    - "mysql-innodb-cluster:db-router"
diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml
new file mode 100755
index 0000000..fa9ffc4
--- /dev/null
+++ b/tests/bundles/groovy-victoria.yaml
@@ -0,0 +1,54 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: groovy
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+
+applications:
+
+  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'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 3
+    options:
+      token-expiration: 60
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+      - '4'
+      - '5'
+
+  hacluster:
+    charm: ../../../hacluster
+    subordinate-to:
+      - keystone
+
+relations:
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'hacluster:ha'
+    - 'keystone:ha'
+  - - "keystone-mysql-router:db-router"
+    - "mysql-innodb-cluster:db-router"
diff --git a/tests/tests.yaml b/tests/tests.yaml
index b87d4a2..9fa8def 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -15,7 +15,8 @@ gate_bundles:
   - bionic-ussuri
   - focal-ussuri
 dev_bundles:
-  - focal-ussuri
+  - focal-victoria
+  - groovy-victoria
 
 configure:
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
@@ -25,4 +26,4 @@ tests:
 
 tests_options:
   force_deploy:
-    - focal-ussuri
+    - groovy-victoria