Merge pull request #12139 from mildas/test_ccn_in_ci

Add `package_firewalld_installed` to CCN and enable CCN Advanced profile test in CI
ComplianceAsCode · Jul 9, 2024 · a2c51f1 · a2c51f1
2 parents 8d27fb0 + dbb2c78
commit a2c51f1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/.packit.yaml b/.packit.yaml
@@ -37,12 +37,11 @@ jobs:
 - <<: *test-static-checks
   identifier: /hardening/host-os/ansible/anssi_bp28_high
   tmt_plan: /hardening/host-os/ansible/anssi_bp28_high
-# disable for now - it seems to be broken on CentOS Stream
-#- <<: *test-static-checks
-#  identifier: /hardening/host-os/ansible/ccn_advanced
-#  tmt_plan: /hardening/host-os/ansible/ccn_advanced
-#  targets:
-#    centos-stream-9: {}
+- <<: *test-static-checks
+  identifier: /hardening/host-os/ansible/ccn_advanced
+  tmt_plan: /hardening/host-os/ansible/ccn_advanced
+  targets:
+    centos-stream-9: {}
 - <<: *test-static-checks
   identifier: /hardening/host-os/ansible/cis
   tmt_plan: /hardening/host-os/ansible/cis

diff --git a/controls/ccn_rhel9.yml b/controls/ccn_rhel9.yml
@@ -444,6 +444,7 @@ controls:
       - firewalld_loopback_traffic_restricted
       - firewalld_loopback_traffic_trusted
       - service_firewalld_enabled
+      - package_firewalld_installed
       - service_nftables_disabled
       - set_firewalld_default_zone
 

diff --git a/tests/tmt-plans/main.fmf b/tests/tmt-plans/main.fmf
@@ -16,9 +16,8 @@ report:
 /hardening/host-os/ansible/anssi_bp28_high:
     discover+: {test: /hardening/host-os/ansible/anssi_bp28_high$}
 
-# see .packit.yaml
-#/hardening/host-os/ansible/ccn_advanced:
-#    discover+: {test: /hardening/host-os/ansible/ccn_advanced$}
+/hardening/host-os/ansible/ccn_advanced:
+    discover+: {test: /hardening/host-os/ansible/ccn_advanced$}
 
 /hardening/host-os/ansible/cis:
     discover+: {test: /hardening/host-os/ansible/cis$}