Merge pull request #12596 from yuumasato/adjust_rule_assertions_11.11

Adjust rule assertions 11.11
ComplianceAsCode · Nov 11, 2024 · 512d92d · 512d92d
2 parents 3322dc9 + 15bcad9
commit 512d92d
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 31 deletions.
diff --git a/tests/assertions/ocp4/ocp4-moderate-4.17.yml b/tests/assertions/ocp4/ocp4-moderate-4.17.yml
@@ -342,7 +342,7 @@ rule_results:
    default_result: PASS
    result_after_remediation: PASS
  e2e-moderate-resource-requests-quota:
-   default_result: FAIL
+   default_result: PASS
    result_after_remediation: PASS
  e2e-moderate-route-ip-whitelist:
    default_result: PASS

diff --git a/tests/assertions/ocp4/rhcos4-high-4.16.yml b/tests/assertions/ocp4/rhcos4-high-4.16.yml
@@ -572,9 +572,9 @@ rule_results:
     default_result: FAIL
     result_after_remediation: PASS
   e2e-high-master-partition-for-var-log:
-    default_result: MANUAL
+    default_result: NOT-APPLICABLE
   e2e-high-master-partition-for-var-log-audit:
-    default_result: MANUAL
+    default_result: NOT-APPLICABLE
   e2e-high-master-require-singleuser-auth:
     default_result: PASS
     result_after_remediation: PASS
@@ -1292,9 +1292,9 @@ rule_results:
     default_result: FAIL
     result_after_remediation: PASS
   e2e-high-worker-partition-for-var-log:
-    default_result: MANUAL
+    default_result: NOT-APPLICABLE
   e2e-high-worker-partition-for-var-log-audit:
-    default_result: MANUAL
+    default_result: NOT-APPLICABLE
   e2e-high-worker-require-singleuser-auth:
     default_result: PASS
     result_after_remediation: PASS

diff --git a/tests/assertions/ocp4/rhcos4-high-4.17.yml b/tests/assertions/ocp4/rhcos4-high-4.17.yml
@@ -573,11 +573,11 @@ rule_results:
    default_result: FAIL
    result_after_remediation: PASS
  e2e-high-master-partition-for-var-log:
-   default_result: MANUAL
-   result_after_remediation: MANUAL
+   default_result: NOT-APPLICABLE
+   result_after_remediation: NOT-APPLICABLE
  e2e-high-master-partition-for-var-log-audit:
-   default_result: MANUAL
-   result_after_remediation: MANUAL
+   default_result: NOT-APPLICABLE
+   result_after_remediation: NOT-APPLICABLE
  e2e-high-master-require-singleuser-auth:
    default_result: PASS
    result_after_remediation: PASS
@@ -1299,11 +1299,11 @@ rule_results:
    default_result: FAIL
    result_after_remediation: PASS
  e2e-high-worker-partition-for-var-log:
-   default_result: MANUAL
-   result_after_remediation: MANUAL
+   default_result: NOT-APPLICABLE
+   result_after_remediation: NOT-APPLICABLE
  e2e-high-worker-partition-for-var-log-audit:
-   default_result: MANUAL
-   result_after_remediation: MANUAL
+   default_result: NOT-APPLICABLE
+   result_after_remediation: NOT-APPLICABLE
  e2e-high-worker-require-singleuser-auth:
    default_result: PASS
    result_after_remediation: PASS

diff --git a/tests/assertions/ocp4/rhcos4-moderate-4.16.yml b/tests/assertions/ocp4/rhcos4-moderate-4.16.yml
@@ -572,9 +572,9 @@ rule_results:
     default_result: FAIL
     result_after_remediation: PASS
   e2e-moderate-master-partition-for-var-log:
-    default_result: MANUAL
+    default_result: NOT-APPLICABLE
   e2e-moderate-master-partition-for-var-log-audit:
-    default_result: MANUAL
+    default_result: NOT-APPLICABLE
   e2e-moderate-master-require-singleuser-auth:
     default_result: PASS
     result_after_remediation: PASS
@@ -1289,9 +1289,9 @@ rule_results:
     default_result: FAIL
     result_after_remediation: PASS
   e2e-moderate-worker-partition-for-var-log:
-    default_result: MANUAL
+    default_result: NOT-APPLICABLE
   e2e-moderate-worker-partition-for-var-log-audit:
-    default_result: MANUAL
+    default_result: NOT-APPLICABLE
   e2e-moderate-worker-require-singleuser-auth:
     default_result: PASS
     result_after_remediation: PASS

diff --git a/tests/assertions/ocp4/rhcos4-moderate-4.17.yml b/tests/assertions/ocp4/rhcos4-moderate-4.17.yml
@@ -573,11 +573,11 @@ rule_results:
    default_result: FAIL
    result_after_remediation: PASS
  e2e-moderate-master-partition-for-var-log:
-   default_result: MANUAL
-   result_after_remediation: MANUAL
+   default_result: NOT-APPLICABLE
+   result_after_remediation: NOT-APPLICABLE
  e2e-moderate-master-partition-for-var-log-audit:
-   default_result: MANUAL
-   result_after_remediation: MANUAL
+   default_result: NOT-APPLICABLE
+   result_after_remediation: NOT-APPLICABLE
  e2e-moderate-master-require-singleuser-auth:
    default_result: PASS
    result_after_remediation: PASS
@@ -1296,11 +1296,11 @@ rule_results:
    default_result: FAIL
    result_after_remediation: PASS
  e2e-moderate-worker-partition-for-var-log:
-   default_result: MANUAL
-   result_after_remediation: MANUAL
+   default_result: NOT-APPLICABLE
+   result_after_remediation: NOT-APPLICABLE
  e2e-moderate-worker-partition-for-var-log-audit:
-   default_result: MANUAL
-   result_after_remediation: MANUAL
+   default_result: NOT-APPLICABLE
+   result_after_remediation: NOT-APPLICABLE
  e2e-moderate-worker-require-singleuser-auth:
    default_result: PASS
    result_after_remediation: PASS

diff --git a/tests/assertions/ocp4/rhcos4-stig-4.16.yml b/tests/assertions/ocp4/rhcos4-stig-4.16.yml
@@ -324,7 +324,7 @@ rule_results:
     default_result: FAIL
     result_after_remediation: PASS
   e2e-stig-master-partition-for-var-log-audit:
-    default_result: MANUAL
+    default_result: NOT-APPLICABLE
   e2e-stig-master-selinux-policytype:
     default_result: PASS
     result_after_remediation: PASS
@@ -680,7 +680,7 @@ rule_results:
     default_result: FAIL
     result_after_remediation: PASS
   e2e-stig-worker-partition-for-var-log-audit:
-    default_result: MANUAL
+    default_result: NOT-APPLICABLE
   e2e-stig-worker-selinux-policytype:
     default_result: PASS
     result_after_remediation: PASS

diff --git a/tests/assertions/ocp4/rhcos4-stig-4.17.yml b/tests/assertions/ocp4/rhcos4-stig-4.17.yml
@@ -324,8 +324,8 @@ rule_results:
    default_result: FAIL
    result_after_remediation: PASS
  e2e-stig-master-partition-for-var-log-audit:
-   default_result: MANUAL
-   result_after_remediation: MANUAL
+   default_result: NOT-APPLICABLE
+   result_after_remediation: NOT-APPLICABLE
  e2e-stig-master-selinux-policytype:
    default_result: PASS
    result_after_remediation: PASS
@@ -681,8 +681,8 @@ rule_results:
    default_result: FAIL
    result_after_remediation: PASS
  e2e-stig-worker-partition-for-var-log-audit:
-   default_result: MANUAL
-   result_after_remediation: MANUAL
+   default_result: NOT-APPLICABLE
+   result_after_remediation: NOT-APPLICABLE
  e2e-stig-worker-selinux-policytype:
    default_result: PASS
    result_after_remediation: PASS