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

Change-Id: I51bf4c9fecb20e1fa9465a5855f1e7bde9a82438
---
 tests/bundles/focal-victoria.yaml  | 63 ++++++++++++++++++++++++++++++
 tests/bundles/groovy-victoria.yaml | 63 ++++++++++++++++++++++++++++++
 tests/tests.yaml                   |  5 ++-
 3 files changed, 129 insertions(+), 2 deletions(-)
 create mode 100644 tests/bundles/focal-victoria.yaml
 create mode 100644 tests/bundles/groovy-victoria.yaml

diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml
new file mode 100644
index 00000000..6fef8ab7
--- /dev/null
+++ b/tests/bundles/focal-victoria.yaml
@@ -0,0 +1,63 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-victoria
+
+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':
+
+applications:
+
+  glance-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'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+
+  glance:
+    charm: ../../../glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+
+relations:
+
+  - - "keystone:shared-db"
+    - "keystone-mysql-router:shared-db"
+  - - "glance:shared-db"
+    - "glance-mysql-router:shared-db"
+  - - "glance:identity-service"
+    - "keystone:identity-service"
+  - - "glance-mysql-router:db-router"
+    - "mysql-innodb-cluster:db-router"
+  - - "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 100644
index 00000000..09ee691f
--- /dev/null
+++ b/tests/bundles/groovy-victoria.yaml
@@ -0,0 +1,63 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: groovy
+
+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':
+
+applications:
+
+  glance-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'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+
+  glance:
+    charm: ../../../glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+
+relations:
+
+  - - "keystone:shared-db"
+    - "keystone-mysql-router:shared-db"
+  - - "glance:shared-db"
+    - "glance-mysql-router:shared-db"
+  - - "glance:identity-service"
+    - "keystone:identity-service"
+  - - "glance-mysql-router:db-router"
+    - "mysql-innodb-cluster:db-router"
+  - - "keystone-mysql-router:db-router"
+    - "mysql-innodb-cluster:db-router"
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 4e85cfc9..8b06393d 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -18,7 +18,8 @@ gate_bundles:
   - bionic-ussuri
   - focal-ussuri
 dev_bundles:
-  - focal-ussuri
+  - focal-victoria
+  - groovy-victoria
 
 configure:
   - zaza.openstack.charm_tests.glance.setup.add_lts_image
@@ -32,4 +33,4 @@ tests_options:
   policyd:
     service: glance
   force_deploy:
-    - focal-ussuri
+    - groovy-victoria