openstack/ansible-hardening
Code Issues Proposed changes

Cleanup tox.ini

Browse Source 
This patch removes the `func_rhel7` environment and brings over the
verbose options from the tests role.

Change-Id: I44c2e089ff6175b3004ef7f6713622ac615bf6db
This commit is contained in:
Major Hayden 2017-04-28 13:30:15 -05:00
parent 6d0f8f6e95
commit a54773938a
No known key found for this signature in database
GPG Key ID: 737051E0C1011FB1
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tox.ini
View File

@ -109,20 +109,7 @@ deps =
setenv =
{[testenv]setenv}
# NOTE(mhayden): Disabling chrony since it causes conflicts in CI.
ANSIBLE_PARAMETERS="${ANSIBLE_PARAMETERS} -e security_rhel7_enable_chrony=no"
commands =
{[testenv:tests_clone]commands}
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
# NOTE(mhayden): This should be removed once upstream gating is using the
# func_rhel6 test below.
[testenv:func_rhel7]
deps =
{[testenv:ansible]deps}
setenv =
{[testenv]setenv}
# NOTE(mhayden): Disabling chrony since it causes conflicts in CI.
ANSIBLE_PARAMETERS=-e stig_version=rhel6 --skip-tags V-38462,V-38660 -e security_enable_chrony=no
ANSIBLE_PARAMETERS="-vvv -e security_rhel7_enable_chrony=no"
commands =
{[testenv:tests_clone]commands}
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
@ -133,7 +120,7 @@ deps =
setenv =
{[testenv]setenv}
# NOTE(mhayden): Disabling chrony since it causes conflicts in CI.
ANSIBLE_PARAMETERS=-e stig_version=rhel6 --skip-tags V-38462,V-38660 -e security_enable_chrony=no
ANSIBLE_PARAMETERS="-vvv -e stig_version=rhel6 --skip-tags V-38462,V-38660 -e security_enable_chrony=no"
commands =
{[testenv:tests_clone]commands}
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"