From 4c909ef778a30df1132d4a06e37ea22e4e935934 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Sun, 9 Sep 2018 11:18:30 +0100
Subject: [PATCH] Clean up role tests

Now that we're using the general templates, we can slim down
the role test definitions. We can also remove tests which are
not being watched, or which are fundamentally broken. With
this we can also remove unused scripts/plays.

We do the following:

1. We remove the 'ssl' job, given that the person working on
   that is no longer doing so, and no-one else has picked up
   the work.

Change-Id: I2ce20adf933e050e7429d6876fa1f0049db4183d
(cherry picked from commit 873b7585a54fd1805ab44cbb12efc83bc7739052)
---
 tox.ini             | 11 -----------
 zuul.d/jobs.yaml    | 21 ---------------------
 zuul.d/project.yaml |  1 -
 3 files changed, 33 deletions(-)
 delete mode 100644 zuul.d/jobs.yaml

diff --git a/tox.ini b/tox.ini
index b8848230..5d308437 100644
--- a/tox.ini
+++ b/tox.ini
@@ -103,17 +103,6 @@ commands =
     bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
 
 
-[testenv:ssl]
-deps =
-    {[testenv:ansible]deps}
-setenv =
-    {[testenv]setenv}
-    ANSIBLE_PARAMETERS=-vvv -e galera_use_ssl=True
-commands =
-    bash -c "{toxinidir}/tests/tests-repo-clone.sh"
-    bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
-
-
 [testenv:linters]
 deps =
     {[testenv:ansible]deps}
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
deleted file mode 100644
index 93fff5ad..00000000
--- a/zuul.d/jobs.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# Copyright 2017, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- job:
-    name: openstack-ansible-octavia-ssl-nv
-    parent: openstack-ansible-functional-ubuntu-xenial
-    voting: false
-    vars:
-      tox_env: ssl
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 0f73488a..01c1667d 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -21,7 +21,6 @@
       jobs:
         - openstack-ansible-linters
         - openstack-ansible-functional-ubuntu-xenial
-        - openstack-ansible-octavia-ssl-nv
     experimental:
       jobs:
         - openstack-ansible-integrated-deploy-aio