Update functional test definitions

Change-Id: If79038bb9b4e8de9bf073fb061568bc07cfa4082

tests/bundles/cosmic-rocky.yaml

@@ -1,38 +0,0 @@
-series: cosmic
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-relations:
-- - keystone:shared-db
-  - mysql:shared-db
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:identity-service
-  - keystone:identity-service
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  keystone:
-    series: cosmic
-    charm: ../../../keystone
-    num_units: 3
-    options:
-      token-expiration: 60
-    to:
-    - '1'
-    - '2'
-    - '3'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    to:
-    - '4'

tests/tests.yaml

@@ -2,16 +2,15 @@ charm_name: keystone
 smoke_bundles:
 - bionic-stein
 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
 dev_bundles:
-- cosmic-rocky
 - disco-stein
 comment: |
   disable ``disco-stein`` test pending LP: #1823718