diff --git a/tox.ini b/tox.ini index 2012a714..320ae09b 100644 --- a/tox.ini +++ b/tox.ini @@ -126,16 +126,6 @@ commands = bash -c "{toxinidir}/tests/common/test-ansible-functional.sh" -[testenv:uw_nginx] -deps = - {[testenv:ansible]deps} -setenv = - {[testenv]setenv} -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 index 23655564..f544563d 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -29,20 +29,3 @@ parent: openstack-ansible-uw_apache voting: false nodeset: centos-7 - -- job: - name: openstack-ansible-uw_nginx - parent: openstack-ansible-functional - vars: - tox_env: uw_apache - -- job: - name: openstack-ansible-uw_nginx-ubuntu-xenial - parent: openstack-ansible-uw_nginx - nodeset: ubuntu-xenial - -- job: - name: openstack-ansible-uw_nginx-centos-7-nv - parent: openstack-ansible-uw_nginx - voting: false - nodeset: centos-7 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index caf96802..db491dae 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -24,8 +24,6 @@ - openstack-ansible-upgrade-ubuntu-xenial - openstack-ansible-uw_apache-centos-7-nv - openstack-ansible-uw_apache-ubuntu-xenial - - openstack-ansible-uw_nginx-centos-7-nv - - openstack-ansible-uw_nginx-ubuntu-xenial gate: jobs: - openstack-ansible-linters @@ -34,4 +32,3 @@ - openstack-ansible-functional-ubuntu-xenial - openstack-ansible-upgrade-ubuntu-xenial - openstack-ansible-uw_apache-ubuntu-xenial - - openstack-ansible-uw_nginx-ubuntu-xenial