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

Change-Id: Ic8c456597a1be8c1945906db377b3fe5f1f5f6ec
---
 tests/bundles/cosmic-rocky.yaml | 90 ---------------------------------
 tests/tests.yaml                |  1 -
 2 files changed, 91 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 97a6c6e8..00000000
--- a/tests/bundles/cosmic-rocky.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-series: cosmic
-applications:
-  ceph-osd:
-    series: cosmic
-    charm: ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      osd-devices: '/srv/ceph /dev/test-non-existent'
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      auth-supported: 'none'
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      dataset-size: 25%
-      max-connections: 1000
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  keystone:
-    expose: True
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-  glance:
-    expose: True
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-  cinder:
-    expose: True
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: 'None'
-      glance-api-version: '2'
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-  nova-cloud-controller:
-    expose: True
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-relations:
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-- - nova-compute:image-service
-  - glance:image-service
-- - nova-compute:ceph
-  - ceph-mon:client
-- - keystone:shared-db
-  - percona-cluster:shared-db
-- - glance:shared-db
-  - percona-cluster:shared-db
-- - glance:identity-service
-  - keystone:identity-service
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - glance:ceph
-  - ceph-mon:client
-- - cinder:shared-db
-  - percona-cluster:shared-db
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:image-service
-  - glance:image-service
-- - cinder-ceph:storage-backend
-  - cinder:storage-backend
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - nova-cloud-controller:shared-db
-  - percona-cluster:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:cloud-compute
-  - nova-compute:cloud-compute
-- - nova-cloud-controller:image-service
-  - glance:image-service
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 273551d4..7e214b57 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -11,7 +11,6 @@ gate_bundles:
 smoke_bundles:
   - bionic-stein
 dev_bundles:
-  - cosmic-rocky
   - disco-stein
 configure:
   - zaza.openstack.charm_tests.glance.setup.add_lts_image