From 65c245ec695d741a1803f79a1feabb6c616ce490 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 7 Sep 2018 14:53:42 +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. 2. We promote the distro_install jobs, given that they are all now working. Change-Id: If1c1cbb25cef257c239b507581e27b9ba6c59d96 --- tox.ini | 8 -------- zuul.d/jobs.yaml | 21 --------------------- zuul.d/project.yaml | 7 ++----- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 zuul.d/jobs.yaml diff --git a/tox.ini b/tox.ini index 91e70c9..43cb5d4 100644 --- a/tox.ini +++ b/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" diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml deleted file mode 100644 index bf62a69..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-heat-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 1a6bf85..448433f 100644 --- a/zuul.d/project.yaml +++ b/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