From 1025238b01ceab5e31fe6d2155bbcb4508688a3e Mon Sep 17 00:00:00 2001
From: Major Hayden <major@mhtx.net>
Date: Thu, 26 Jan 2017 08:03:09 -0600
Subject: [PATCH] Restore RHEL 6 STIG content gating

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
---
 tox.ini | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 87e9d2a6..418f2fd7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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 =