openstack/ansible-hardening
Code Issues Proposed changes

Merge "Restore RHEL 6 STIG content gating"

Browse Source
This commit is contained in:
Jenkins 2017-01-30 20:47:09 +00:00 committed by Gerrit Code Review
commit 91a5c64c8e
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tox.ini
View File

@ -114,18 +114,29 @@ commands =
{[testenv:tests_clone]commands} {[testenv:tests_clone]commands}
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh" 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] [testenv:func_rhel7]
deps = deps =
{[testenv:ansible]deps} {[testenv:ansible]deps}
setenv = setenv =
{[testenv]setenv} {[testenv]setenv}
# NOTE(mhayden): Disabling chrony since it causes conflicts in CI. # NOTE(mhayden): Disabling chrony since it causes conflicts in CI.
ANSIBLE_PARAMETERS=-e stig_version=rhel7 -e security_rhel7_enable_chrony=no ANSIBLE_PARAMETERS=-e stig_version=rhel6 --skip-tags V-38462,V-38660 -e security_enable_chrony=no
commands = commands =
{[testenv:tests_clone]commands} {[testenv:tests_clone]commands}
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh" bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
[testenv:func_rhel6]
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
commands =
{[testenv:tests_clone]commands}
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
[testenv:linters] [testenv:linters]
deps = deps =