[6.12.z] Make oscap profile configurable in settings file (#14667)

Make oscap profile configurable in settings file (#14535) to enable tests for OS other than rhel (cherry picked from commit ca8ab78) Co-authored-by: dosas <[email protected]>
SatelliteQE · Apr 8, 2024 · f2261ff · f2261ff
1 parent 81ecbf4
commit f2261ff
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/conf/oscap.yaml.template b/conf/oscap.yaml.template
@@ -1,2 +1,4 @@
 OSCAP:
   CONTENT_PATH: /usr/share/xml/scap/ssg/content/ssg-rhel7-ds.xml
+  # see: robottelo/constants/__init__.py OSCAP_PROFILE
+  PROFILE: security7
diff --git a/pytest_fixtures/component/oscap.py b/pytest_fixtures/component/oscap.py
@@ -39,7 +39,7 @@ def scap_content(import_ansible_roles, module_target_sat):
     scap_profile_id = [
         profile['id']
         for profile in scap_info.scap_content_profiles
-        if OSCAP_PROFILE['security7'] in profile['title']
+        if OSCAP_PROFILE[settings.oscap.profile] in profile['title']
     ][0]
     return {
         "title": title,

diff --git a/robottelo/config/validators.py b/robottelo/config/validators.py
@@ -225,7 +225,12 @@
         Validator(
             'oscap.content_path',
             must_exist=True,
-        )
+        ),
+        Validator(
+            'oscap.profile',
+            default='security7',
+            must_exist=True,
+        ),
     ],
     osp=[
         Validator(