Remove uw_nginx jobs
Nginx with uWSGI has been the default keystone deployment since Pike. The uw_nginx jobs should be no different than the functional jobs at this point, but they have been incorrectly using the uw_apache tox environment anyway. Change-Id: I73c01b9899819da96f51744d5fba12a05bb7ec2c
This commit is contained in:
parent
0bc3b64915
commit
ada86843ee
10
tox.ini
10
tox.ini
@ -126,16 +126,6 @@ commands =
|
|||||||
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
|
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]
|
[testenv:linters]
|
||||||
deps =
|
deps =
|
||||||
{[testenv:ansible]deps}
|
{[testenv:ansible]deps}
|
||||||
|
@ -29,20 +29,3 @@
|
|||||||
parent: openstack-ansible-uw_apache
|
parent: openstack-ansible-uw_apache
|
||||||
voting: false
|
voting: false
|
||||||
nodeset: centos-7
|
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
|
|
||||||
|
@ -24,8 +24,6 @@
|
|||||||
- openstack-ansible-upgrade-ubuntu-xenial
|
- openstack-ansible-upgrade-ubuntu-xenial
|
||||||
- openstack-ansible-uw_apache-centos-7-nv
|
- openstack-ansible-uw_apache-centos-7-nv
|
||||||
- openstack-ansible-uw_apache-ubuntu-xenial
|
- openstack-ansible-uw_apache-ubuntu-xenial
|
||||||
- openstack-ansible-uw_nginx-centos-7-nv
|
|
||||||
- openstack-ansible-uw_nginx-ubuntu-xenial
|
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-ansible-linters
|
- openstack-ansible-linters
|
||||||
@ -34,4 +32,3 @@
|
|||||||
- openstack-ansible-functional-ubuntu-xenial
|
- openstack-ansible-functional-ubuntu-xenial
|
||||||
- openstack-ansible-upgrade-ubuntu-xenial
|
- openstack-ansible-upgrade-ubuntu-xenial
|
||||||
- openstack-ansible-uw_apache-ubuntu-xenial
|
- openstack-ansible-uw_apache-ubuntu-xenial
|
||||||
- openstack-ansible-uw_nginx-ubuntu-xenial
|
|
||||||
|
Loading…
Reference in New Issue
Block a user