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

Change-Id: Ic24ebab33b3238775f0c7e5e9d885f2c72bf6e4a
---
 .../bundles/cosmic-rocky-functional.yaml      | 50 -------------------
 src/tests/tests.yaml                          |  3 +-
 2 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 src/tests/bundles/cosmic-rocky-functional.yaml

diff --git a/src/tests/bundles/cosmic-rocky-functional.yaml b/src/tests/bundles/cosmic-rocky-functional.yaml
deleted file mode 100644
index baf8f21..0000000
--- a/src/tests/bundles/cosmic-rocky-functional.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-series: cosmic
-relations:
-- [neutron-dynamic-routing, rabbitmq-server]
-- [neutron-dynamic-routing, quagga]
-- [keystone, mysql]
-- [neutron-api, mysql]
-- [neutron-api, rabbitmq-server]
-- [neutron-api, keystone]
-applications:
-  keystone:
-    charm: cs:~openstack-charmers-next/bionic/keystone
-    constraints: mem=1G
-    num_units: 1
-    options:
-        haproxy-server-timeout: 90000
-        haproxy-client-timeout: 90000
-        haproxy-queue-timeout: 9000
-        haproxy-connect-timeout: 9000
-    series: cosmic
-  mysql:
-    charm: cs:~openstack-charmers-next/bionic/percona-cluster
-    constraints: mem=4G
-    num_units: 1
-    series: cosmic
-  neutron-api:
-    charm: cs:~openstack-charmers-next/bionic/neutron-api
-    constraints: mem=1G
-    num_units: 1
-    options:
-        flat-network-providers: physnet1
-        neutron-security-groups: true
-        haproxy-server-timeout: 90000
-        haproxy-client-timeout: 90000
-        haproxy-queue-timeout: 9000
-        haproxy-connect-timeout: 9000
-    series: cosmic
-  neutron-dynamic-routing:
-    charm: ../../../neutron-dynamic-routing
-    num_units: 1
-    series: cosmic
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
-    constraints: mem=1G
-    num_units: 1
-    series: cosmic
-  quagga:
-    charm: cs:~openstack-charmers-next/bionic/quagga
-    num_units: 1
-    series: cosmic
-
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index c0c7599..9cba9aa 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -2,7 +2,6 @@ charm_name: neutron-dynamic-routing
 configure:
 - zaza.openstack.charm_tests.dragent.configure.setup
 dev_bundles:
-- cosmic-rocky-functional
 - disco-stein-functional
 gate_bundles:
 - bionic-stein-functional
@@ -11,6 +10,6 @@ gate_bundles:
 - xenial-pike-functional
 - xenial-queens-functional
 smoke_bundles:
-- bionic-rocky-functional
+- bionic-stein-functional
 tests:
 - zaza.openstack.charm_tests.dragent.tests.DRAgentTest