openstack/ansible-hardening
Code Issues Proposed changes

Restore RHEL 6 STIG content gating

Browse Source 
When the role was switched to use RHEL 7 STIG content as the default,
the RHEL 6 STIG content was no longer being gated. This patch adds a
new test environment, `func_rhel6` and replaces the `func_rhel7`
environment with testing of the RHEL 6 STIG content. This is only
temporary and the `func_rhel7` environment should be removed as soon
as upstream gating is updated to use the new `func_rhel6` environment.

Change-Id: I9f91dac8ecadd3b791954f18e0607403ff147876
This commit is contained in:
Major Hayden 2017-01-26 08:03:09 -06:00 committed by Jesse Pretorius (odyssey4me)
parent b14056ee44
commit 1025238b01
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}
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=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 =
{[testenv:tests_clone]commands}
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]
deps =