diff --git a/tox.ini b/tox.ini index d09bccac..0e33368f 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 8b1c419a..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-horizon-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 68d6c8e6..2b158dfa 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -23,7 +23,6 @@ - openstack-ansible-functional-distro_install-centos-7 - openstack-ansible-functional-distro_install-opensuse-423 - openstack-ansible-functional-distro_install-ubuntu-xenial - - openstack-ansible-horizon-ssl-nv gate: jobs: - openstack-ansible-functional-distro_install-centos-7