From 3f41645f975eacc2e1ddc413dcd2e95f61b2cf19 Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex@ajkavanagh.co.uk>
Date: Thu, 26 Mar 2020 18:25:11 +0000
Subject: [PATCH] Enable focal and ussuri as part of the gate tests

Add bionic-ussuri and focal-ussuri (with mysql8 support) bundles.

Change-Id: I5c440e973b0e91dfef275d5644ac6ba93e194dae
---
 metadata.yaml                    |   1 +
 tests/bundles/bionic-ussuri.yaml |  51 +++++++++++++++
 tests/bundles/focal-ussuri.yaml  | 105 +++++++++++++++++++++++++++++++
 tests/tests.yaml                 |   5 ++
 4 files changed, 162 insertions(+)
 create mode 100644 tests/bundles/bionic-ussuri.yaml
 create mode 100644 tests/bundles/focal-ussuri.yaml

diff --git a/metadata.yaml b/metadata.yaml
index 4c72b6c..314a33f 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -21,6 +21,7 @@ series:
   - xenial
   - bionic
   - eoan
+  - focal
   - trusty
 extra-bindings:
   public:
diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml
new file mode 100644
index 0000000..24f40ea
--- /dev/null
+++ b/tests/bundles/bionic-ussuri.yaml
@@ -0,0 +1,51 @@
+series: bionic
+applications:
+  swift-proxy:
+    charm: swift-proxy
+    series: bionic
+    num_units: 1
+    options:
+      zone-assignment: manual
+      replicas: 1
+      swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
+      openstack-origin: cloud:bionic-ussuri
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      dataset-size: 25%
+      max-connections: 1000
+      source: cloud:bionic-ussuri
+  keystone:
+    expose: True
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+  glance:
+    expose: True
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+  swift-storage:
+    charm: cs:~openstack-charmers-next/swift-storage
+    num_units: 1
+    storage:
+      block-devices: 'cinder,10G'
+    options:
+      openstack-origin: cloud:bionic-ussuri
+      zone: 1
+relations:
+- - keystone:shared-db
+  - percona-cluster:shared-db
+- - glance:shared-db
+  - percona-cluster:shared-db
+- - glance:identity-service
+  - keystone:identity-service
+- - swift-proxy:identity-service
+  - keystone:identity-service
+- - swift-storage:swift-storage
+  - swift-proxy:swift-storage
+- - glance:object-store
+  - swift-proxy:object-store
diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml
new file mode 100644
index 0000000..7c3a121
--- /dev/null
+++ b/tests/bundles/focal-ussuri.yaml
@@ -0,0 +1,105 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+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':
+
+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
+  nova-cloud-controller-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  placement-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:
+    expose: True
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+
+  swift-proxy:
+    charm: swift-proxy
+    num_units: 1
+    options:
+      zone-assignment: manual
+      replicas: 1
+      swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+
+  glance:
+    expose: True
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+
+  swift-storage:
+    charm: cs:~openstack-charmers-next/swift-storage
+    num_units: 1
+    storage:
+      block-devices: 'cinder,10G'
+    options:
+      zone: 1
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+
+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'
+
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'swift-proxy:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'swift-storage:swift-storage'
+    - 'swift-proxy:swift-storage'
+
+  - - 'glance:object-store'
+    - 'swift-proxy:object-store'
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 05eab5b..5f63723 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -1,5 +1,7 @@
 charm_name: swift-proxy
 gate_bundles:
+  - test-s3api: focal-ussuri
+  - test-s3api: bionic-ussuri
   - test-s3api: bionic-train
   - test-s3api: bionic-stein
   - test-s3api: bionic-rocky
@@ -26,3 +28,6 @@ tests:
     - zaza.openstack.charm_tests.swift.tests.S3APITest
   - swift_gr_region1:
     - zaza.openstack.charm_tests.swift.tests.SwiftGlobalReplicationTests
+tests_options:
+  force_deploy:
+    - focal-ussuri