From ae15a2477f8d2b7f34e2aec7fa935cebba5f2d67 Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@canonical.com>
Date: Wed, 17 Jul 2019 15:08:35 +0200
Subject: [PATCH] Update functional test definitions

Change-Id: I81e4583c1f2d172cbbba0eb3a091d3a0f88a9df2
---
 tests/bundles/cosmic-rocky.yaml | 43 ---------------------------------
 tests/tests.yaml                | 15 ++++++------
 2 files changed, 7 insertions(+), 51 deletions(-)
 delete mode 100644 tests/bundles/cosmic-rocky.yaml

diff --git a/tests/bundles/cosmic-rocky.yaml b/tests/bundles/cosmic-rocky.yaml
deleted file mode 100644
index 6ddbfecd..00000000
--- a/tests/bundles/cosmic-rocky.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-options:
-  source: &source distro
-series: cosmic
-applications:
-  ceph-radosgw:
-    charm: ceph-radosgw
-    num_units: 1
-    series: cosmic
-    options:
-      source: *source
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    constraints: "mem=2048"
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *source
-      osd-devices: '/srv/ceph /dev/test-non-existent'
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *source
-      auth-supported: 'none'
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-  keystone:
-    expose: True
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *source
-relations:
-- - keystone:shared-db
-  - percona-cluster:shared-db
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - ceph-radosgw:mon
-  - ceph-mon:radosgw
-- - ceph-radosgw:identity-service
-  - keystone:identity-service
diff --git a/tests/tests.yaml b/tests/tests.yaml
index adc68702..db9d6630 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -1,17 +1,16 @@
 charm_name: ceph-radosgw
 gate_bundles:
-  - trusty-mitaka
-  - xenial-mitaka
-  - xenial-ocata
-  - xenial-pike
-  - xenial-queens
-  - bionic-queens
-  - bionic-rocky
   - bionic-stein
+  - bionic-rocky
+  - bionic-queens
+  - xenial-queens
+  - xenial-pike
+  - xenial-ocata
+  - xenial-mitaka
+  - trusty-mitaka
 smoke_bundles:
   - bionic-stein
 dev_bundles:
-  - cosmic-rocky
   - bionic-queens-multisite
   - bionic-rocky-multisite
 tests: