From 07d798afa8775a06009c47fe646f7c0a92f1bb59 Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Wed, 6 Feb 2019 14:49:14 -0600
Subject: [PATCH] Update functional test definitions

Remove trusty-icehouse test combo from gate, leaving trusty-mitaka
if/where it exists.

Change-Id: If68e9c5a6ddbc12176f22e9d777e5c8c76faf7c5
---
 tests/bundles/trusty-icehouse.yaml | 43 ------------------------------
 tests/tests.yaml                   |  1 -
 2 files changed, 44 deletions(-)
 delete mode 100644 tests/bundles/trusty-icehouse.yaml

diff --git a/tests/bundles/trusty-icehouse.yaml b/tests/bundles/trusty-icehouse.yaml
deleted file mode 100644
index 6d8d9b9d..00000000
--- a/tests/bundles/trusty-icehouse.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-series: trusty
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
-machines:
-  '0':
-    constraints: virt-type=kvm mem=3072M
-  '1':
-    constraints: virt-type=kvm
-  '2':
-    constraints: virt-type=kvm
-  '3':
-    constraints: virt-type=kvm
-  '4':
-    constraints: virt-type=kvm
-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: trusty
-    charm: ../../../keystone
-    num_units: 3
-    constraints:
-      virt-type=kvm
-    to:
-    - '1'
-    - '2'
-    - '3'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    to:
-    - '4'
diff --git a/tests/tests.yaml b/tests/tests.yaml
index d70a64b8..0ad7c3d2 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -2,7 +2,6 @@ charm_name: keystone
 smoke_bundles:
 - bionic-rocky
 gate_bundles:
-- trusty-icehouse
 - trusty-mitaka
 - xenial-mitaka
 - xenial-ocata