From 2bdcd9431dc7f2dc6686d7d8a55f9e5dc4175c04 Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Mon, 11 Nov 2024 12:59:09 +0100 Subject: [PATCH 1/3] Adjust rule assertions after group platform change The group for partitions rules is not applicable for containers. Let's adjust these failing assertions. --- tests/assertions/ocp4/rhcos4-high-4.16.yml | 8 ++++---- tests/assertions/ocp4/rhcos4-high-4.17.yml | 16 ++++++++-------- tests/assertions/ocp4/rhcos4-moderate-4.16.yml | 8 ++++---- tests/assertions/ocp4/rhcos4-moderate-4.17.yml | 16 ++++++++-------- tests/assertions/ocp4/rhcos4-stig-4.16.yml | 4 ++-- tests/assertions/ocp4/rhcos4-stig-4.17.yml | 4 ++-- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/tests/assertions/ocp4/rhcos4-high-4.16.yml b/tests/assertions/ocp4/rhcos4-high-4.16.yml index 88f3e4a238b..5739c94befc 100644 --- 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 index b7a10413062..0526754008c 100644 --- 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 index 5ffc3304c8b..a920261d2ea 100644 --- 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 index 11253aad6e8..1592abb3798 100644 --- 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 index 04fbb61a775..da6800daff2 100644 --- 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 index cabff3a56bc..8b8787646d0 100644 --- a/tests/assertions/ocp4/rhcos4-stig-4.17.yml +++ b/tests/assertions/ocp4/rhcos4-stig-4.17.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 result_after_remediation: MANUAL e2e-stig-master-selinux-policytype: default_result: PASS @@ -681,7 +681,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 result_after_remediation: MANUAL e2e-stig-worker-selinux-policytype: default_result: PASS From 0746fc8bec5b8ed7e1f99c2b545a9f28325832fa Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Mon, 11 Nov 2024 13:01:06 +0100 Subject: [PATCH 2/3] Adjust resource-requests-quota 4.17 assertion This was probably forgotten in previous PR. --- tests/assertions/ocp4/ocp4-moderate-4.17.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/assertions/ocp4/ocp4-moderate-4.17.yml b/tests/assertions/ocp4/ocp4-moderate-4.17.yml index ad9baca022b..39ee9bf1612 100644 --- 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 From 15bcad973584d86eabc28310cc7079c4555c59eb Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Mon, 11 Nov 2024 16:39:33 +0100 Subject: [PATCH 3/3] Adjust remediated result as well The remediated result for partition-for-var-log-audit is the same as the default result. --- tests/assertions/ocp4/rhcos4-stig-4.17.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/assertions/ocp4/rhcos4-stig-4.17.yml b/tests/assertions/ocp4/rhcos4-stig-4.17.yml index 8b8787646d0..7c00f8e7dad 100644 --- a/tests/assertions/ocp4/rhcos4-stig-4.17.yml +++ b/tests/assertions/ocp4/rhcos4-stig-4.17.yml @@ -325,7 +325,7 @@ rule_results: result_after_remediation: PASS e2e-stig-master-partition-for-var-log-audit: default_result: NOT-APPLICABLE - result_after_remediation: MANUAL + result_after_remediation: NOT-APPLICABLE e2e-stig-master-selinux-policytype: default_result: PASS result_after_remediation: PASS @@ -682,7 +682,7 @@ rule_results: result_after_remediation: PASS e2e-stig-worker-partition-for-var-log-audit: default_result: NOT-APPLICABLE - result_after_remediation: MANUAL + result_after_remediation: NOT-APPLICABLE e2e-stig-worker-selinux-policytype: default_result: PASS result_after_remediation: PASS