From 2d86350944cce2de8329c91c32a5a409cdc10501 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Fri, 7 Sep 2018 14:34:29 +0100
Subject: [PATCH] Clean up role tests

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.
2. We promote the distro_install jobs, given that they are
   all now working.

Change-Id: I7a997360fe8b03d1eac52e7c1a8d45c38d194357
---
 tox.ini             |  8 +-------
 zuul.d/jobs.yaml    | 21 ---------------------
 zuul.d/project.yaml |  7 ++-----
 3 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 zuul.d/jobs.yaml

diff --git a/tox.ini b/tox.ini
index 04a9917..95fd829 100644
--- a/tox.ini
+++ b/tox.ini
@@ -92,6 +92,7 @@ commands =
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
 
+
 [testenv:distro_install]
 setenv =
     {[testenv]setenv}
@@ -99,13 +100,6 @@ setenv =
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
 
-[testenv:ssl]
-setenv =
-    {[testenv]setenv}
-    ANSIBLE_PARAMETERS=-vvv -e galera_use_ssl=True
-commands =
-    bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
-
 
 [testenv:linters]
 commands =
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
deleted file mode 100644
index a94fb2a..0000000
--- 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-barbican-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 fc47931..448433f 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -21,13 +21,10 @@
     check:
       jobs:
         - openstack-ansible-functional-distro_install-ubuntu-xenial
-          # NOTE(hwoarang) Centos7 is having some troubles with repo dependencies
-          # so disabling until it's investigated.
-        - openstack-ansible-functional-distro_install-centos-7:
-            voting: false
+        - openstack-ansible-functional-distro_install-centos-7
         - openstack-ansible-functional-distro_install-opensuse-423
-        - openstack-ansible-barbican-ssl-nv
     gate:
       jobs:
         - openstack-ansible-functional-distro_install-ubuntu-xenial
+        - openstack-ansible-functional-distro_install-centos-7
         - openstack-ansible-functional-distro_install-opensuse-423