Merge "Clean up role tests"

tox.ini

@@ -97,14 +97,6 @@ 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 =
     bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"

zuul.d/jobs.yaml

@@ -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-heat-ssl-nv
-    parent: openstack-ansible-functional-ubuntu-xenial
-    voting: false
-    vars:
-      tox_env: ssl

zuul.d/project.yaml

@@ -20,14 +20,11 @@
       - release-notes-jobs-python3
     check:
       jobs:
-        - openstack-ansible-heat-ssl-nv
         - 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
     gate:
       jobs:
         - openstack-ansible-functional-distro_install-ubuntu-xenial
+        - openstack-ansible-functional-distro_install-centos-7
         - openstack-ansible-functional-distro_install-opensuse-423