From a5698e04beefe0acd51c54a418a166981c8438c7 Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@canonical.com>
Date: Wed, 9 Sep 2020 16:20:25 +0200
Subject: [PATCH] Test with Ceph by default from focal-ussuri onwards

Change-Id: I7bbe2907ce4ed266945b69548d7c6c07b73a0479
---
 tests/bundles/focal-ussuri-ec.yaml | 122 -----------------------------
 tests/bundles/focal-ussuri.yaml    |  93 ++++++++++++++++++----
 tests/bundles/focal-victoria.yaml  |  93 ++++++++++++++++++----
 tests/bundles/groovy-victoria.yaml |  93 ++++++++++++++++++----
 tests/tests.yaml                   |  13 +--
 5 files changed, 236 insertions(+), 178 deletions(-)
 delete mode 100644 tests/bundles/focal-ussuri-ec.yaml

diff --git a/tests/bundles/focal-ussuri-ec.yaml b/tests/bundles/focal-ussuri-ec.yaml
deleted file mode 100644
index 122becd1..00000000
--- a/tests/bundles/focal-ussuri-ec.yaml
+++ /dev/null
@@ -1,122 +0,0 @@
-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':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-  '14':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-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'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: '10G'
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-      - '6'
-      - '7'
-      - '8'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    to:
-      - '9'
-      - '10'
-      - '11'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '12'
-
-  keystone:
-    expose: True
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-
-  glance:
-    expose: True
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      pool-type: erasure-coded
-      ec-profile-k: 4
-      ec-profile-m: 2
-      ec-profile-plugin: jerasure
-    to:
-      - '14'
-
-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'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml
index 1f4d9d9e..122becd1 100644
--- a/tests/bundles/focal-ussuri.yaml
+++ b/tests/bundles/focal-ussuri.yaml
@@ -4,8 +4,7 @@ variables:
 series: focal
 
 comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
+- 'machines section to decide order of deployment. database sooner = faster'
 machines:
   '0':
     constraints: mem=3072M
@@ -15,13 +14,23 @@ machines:
     constraints: mem=3072M
   '3':
   '4':
+  '5':
+  '6':
+  '7':
+  '8':
+  '9':
+  '10':
+  '11':
+  '12':
+  '13':
+  '14':
 
 applications:
 
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
   keystone-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
 
   mysql-innodb-cluster:
     charm: cs:~openstack-charmers-next/mysql-innodb-cluster
@@ -33,31 +42,81 @@ applications:
       - '1'
       - '2'
 
+  ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 6
+    storage:
+      osd-devices: '10G'
+    options:
+      source: *openstack-origin
+    to:
+      - '3'
+      - '4'
+      - '5'
+      - '6'
+      - '7'
+      - '8'
+
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      source: *openstack-origin
+      monitor-count: '3'
+    to:
+      - '9'
+      - '10'
+      - '11'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '12'
+
   keystone:
+    expose: True
     charm: cs:~openstack-charmers-next/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
-      - '3'
+      - '13'
 
   glance:
-    charm: ../../../glance
+    expose: True
+    charm: cs:~openstack-charmers-next/glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
+      pool-type: erasure-coded
+      ec-profile-k: 4
+      ec-profile-m: 2
+      ec-profile-plugin: jerasure
     to:
-      - '4'
+      - '14'
 
 relations:
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
 
-  - - "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"
+  - - 'glance:shared-db'
+    - 'glance-mysql-router:shared-db'
+  - - 'glance-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'glance:ceph'
+    - 'ceph-mon:client'
+
+  - - 'ceph-osd:mon'
+    - 'ceph-mon:osd'
diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml
index 6fef8ab7..33dfc752 100644
--- a/tests/bundles/focal-victoria.yaml
+++ b/tests/bundles/focal-victoria.yaml
@@ -4,8 +4,7 @@ variables:
 series: focal
 
 comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
+- 'machines section to decide order of deployment. database sooner = faster'
 machines:
   '0':
     constraints: mem=3072M
@@ -15,13 +14,23 @@ machines:
     constraints: mem=3072M
   '3':
   '4':
+  '5':
+  '6':
+  '7':
+  '8':
+  '9':
+  '10':
+  '11':
+  '12':
+  '13':
+  '14':
 
 applications:
 
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
   keystone-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
 
   mysql-innodb-cluster:
     charm: cs:~openstack-charmers-next/mysql-innodb-cluster
@@ -33,31 +42,81 @@ applications:
       - '1'
       - '2'
 
+  ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 6
+    storage:
+      osd-devices: '10G'
+    options:
+      source: *openstack-origin
+    to:
+      - '3'
+      - '4'
+      - '5'
+      - '6'
+      - '7'
+      - '8'
+
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      source: *openstack-origin
+      monitor-count: '3'
+    to:
+      - '9'
+      - '10'
+      - '11'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '12'
+
   keystone:
+    expose: True
     charm: cs:~openstack-charmers-next/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
-      - '3'
+      - '13'
 
   glance:
-    charm: ../../../glance
+    expose: True
+    charm: cs:~openstack-charmers-next/glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
+      pool-type: erasure-coded
+      ec-profile-k: 4
+      ec-profile-m: 2
+      ec-profile-plugin: jerasure
     to:
-      - '4'
+      - '14'
 
 relations:
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
 
-  - - "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"
+  - - 'glance:shared-db'
+    - 'glance-mysql-router:shared-db'
+  - - 'glance-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'glance:ceph'
+    - 'ceph-mon:client'
+
+  - - 'ceph-osd:mon'
+    - 'ceph-mon:osd'
diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml
index 09ee691f..8bd96d8f 100644
--- a/tests/bundles/groovy-victoria.yaml
+++ b/tests/bundles/groovy-victoria.yaml
@@ -4,8 +4,7 @@ variables:
 series: groovy
 
 comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
+- 'machines section to decide order of deployment. database sooner = faster'
 machines:
   '0':
     constraints: mem=3072M
@@ -15,13 +14,23 @@ machines:
     constraints: mem=3072M
   '3':
   '4':
+  '5':
+  '6':
+  '7':
+  '8':
+  '9':
+  '10':
+  '11':
+  '12':
+  '13':
+  '14':
 
 applications:
 
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
   keystone-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
 
   mysql-innodb-cluster:
     charm: cs:~openstack-charmers-next/mysql-innodb-cluster
@@ -33,31 +42,81 @@ applications:
       - '1'
       - '2'
 
+  ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 6
+    storage:
+      osd-devices: '10G'
+    options:
+      source: *openstack-origin
+    to:
+      - '3'
+      - '4'
+      - '5'
+      - '6'
+      - '7'
+      - '8'
+
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      source: *openstack-origin
+      monitor-count: '3'
+    to:
+      - '9'
+      - '10'
+      - '11'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '12'
+
   keystone:
+    expose: True
     charm: cs:~openstack-charmers-next/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
-      - '3'
+      - '13'
 
   glance:
-    charm: ../../../glance
+    expose: True
+    charm: cs:~openstack-charmers-next/glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
+      pool-type: erasure-coded
+      ec-profile-k: 4
+      ec-profile-m: 2
+      ec-profile-plugin: jerasure
     to:
-      - '4'
+      - '14'
 
 relations:
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
 
-  - - "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"
+  - - 'glance:shared-db'
+    - 'glance-mysql-router:shared-db'
+  - - 'glance-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'glance:ceph'
+    - 'ceph-mon:client'
+
+  - - 'ceph-osd:mon'
+    - 'ceph-mon:osd'
diff --git a/tests/tests.yaml b/tests/tests.yaml
index f7cf5a8a..36e95d52 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -2,11 +2,12 @@ charm_name: glance
 
 comment:
   - 'the glance configure job validates operation of identity-service relation'
+  - 'we do testing on Ceph by default from focal-ussuri and onwards'
 
 smoke_bundles:
   - full_run: bionic-train
 gate_bundles:
-  - erasure-coded: focal-ussuri-ec
+  - ceph: focal-ussuri
   - trusty-mitaka
   - xenial-mitaka
   - xenial-ocata
@@ -17,14 +18,16 @@ gate_bundles:
   - bionic-stein
   - bionic-train
   - bionic-ussuri
-  - focal-ussuri
-  - focal-victoria
+  - ceph: focal-victoria
 dev_bundles:
-  - groovy-victoria
+  - ceph: groovy-victoria
 
 configure:
   - zaza.openstack.charm_tests.glance.setup.add_lts_image
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
+  - ceph:
+    - zaza.openstack.charm_tests.glance.setup.add_lts_image
+    - zaza.openstack.charm_tests.keystone.setup.add_demo_user
   - full_run:
     - zaza.openstack.charm_tests.glance.setup.add_cirros_image
     - zaza.openstack.charm_tests.glance.setup.add_cirros_alt_image
@@ -32,7 +35,7 @@ configure:
     - zaza.openstack.charm_tests.keystone.setup.add_tempest_roles
     - zaza.openstack.charm_tests.tempest.setup.render_tempest_config_keystone_v3
 tests:
-  - erasure-coded:
+  - ceph:
     - zaza.openstack.charm_tests.glance.tests.GlanceTest
     - zaza.openstack.charm_tests.policyd.tests.GlanceTests
     - zaza.openstack.charm_tests.ceph.tests.CheckPoolTypes