catch package_rsync_removed in waivers, for RHEL-7

Signed-off-by: Jiri Jaburek <[email protected]>

conf/remediation.py

@@ -30,9 +30,9 @@ def excludes():
             ]
 
     # Host hardenings
-    if re.fullmatch('/hardening/host-os/.*', test_name):
+    if versions.rhel == 7 and re.fullmatch('/hardening/host-os/.*', test_name):
         rules += [
-            # required by TMT
+            # required by TMT, see waivers
             'package_rsync_removed',
         ]
 

conf/waivers-upstream

@@ -2,6 +2,11 @@
 # see conf/remediation.py
 /hardening/.*/accounts_password_set_max_life_(existing|root)
     True
+# RHEL-7 only, because RHEL-8+ check for rsync-daemon,
+# while TMT only needs the 'rsync' command executed via ssh,
+# so remove the remediation exception + waiver on RHEL-8+
+/hardening/host-os/oscap/[^/]+/package_rsync_removed
+    rhel == 7
 
 # requires running firewalld (firewall-cmd) and NetworkManager,
 # which are not available in their final form in the Anaconda environment