From a2674427f109195e587b8ba69622a5d296e76091 Mon Sep 17 00:00:00 2001 From: Peter Ondrejka Date: Tue, 3 Dec 2024 13:15:23 +0100 Subject: [PATCH] adjusting oscap tests for rhel10 --- robottelo/constants/__init__.py | 3 +++ tests/foreman/longrun/test_oscap.py | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/robottelo/constants/__init__.py b/robottelo/constants/__init__.py index 8a0637f4c70..e9c77a0fb25 100644 --- a/robottelo/constants/__init__.py +++ b/robottelo/constants/__init__.py @@ -1650,6 +1650,7 @@ 'rhel7_content': 'Red Hat rhel7 default content', 'rhel8_content': 'Red Hat rhel8 default content', 'rhel9_content': 'Red Hat rhel9 default content', + 'rhel10_content': 'Red Hat rhel10 default content', 'rhel_firefox': 'Red Hat firefox default content', } @@ -1659,6 +1660,7 @@ 'dsrhel7': 'DISA STIG for Red Hat Enterprise Linux 7', 'dsrhel8': 'DISA STIG for Red Hat Enterprise Linux 8', 'dsrhel9': 'DISA STIG for Red Hat Enterprise Linux 9', + 'dsrhel10': 'DISA STIG for Red Hat Enterprise Linux 10', 'esp': 'Example Server Profile', 'rhccp': 'Red Hat Corporate Profile for Certified Cloud Providers (RH CCP)', 'firefox': 'Mozilla Firefox STIG', @@ -1671,6 +1673,7 @@ 'cbrhel7': 'PCI-DSS v3.2.1 Control Baseline for Red Hat Enterprise Linux 7', 'cbrhel8': 'PCI-DSS v3.2.1 Control Baseline for Red Hat Enterprise Linux 8', 'cbrhel9': 'PCI-DSS v4.0 Control Baseline for Red Hat Enterprise Linux 9', + 'cbrhel10': 'PCI-DSS v4.0 Control Baseline for Red Hat Enterprise Linux 10', 'ppgpo': 'Protection Profile for General Purpose Operating Systems', 'acscee': 'Australian Cyber Security Centre (ACSC) Essential Eight', 'ospp7': 'OSPP - Protection Profile for General Purpose Operating Systems v4.2.1', diff --git a/tests/foreman/longrun/test_oscap.py b/tests/foreman/longrun/test_oscap.py index 710be7b83b9..c8370e95b66 100644 --- a/tests/foreman/longrun/test_oscap.py +++ b/tests/foreman/longrun/test_oscap.py @@ -28,21 +28,25 @@ from robottelo.logging import logger ak_name = { + 'rhel10': f'ak_{gen_string("alpha")}_rhel10', 'rhel9': f'ak_{gen_string("alpha")}_rhel9', 'rhel8': f'ak_{gen_string("alpha")}_rhel8', 'rhel7': f'ak_{gen_string("alpha")}_rhel7', } cv_name = { + 'rhel10': f'cv_{gen_string("alpha")}_rhel10', 'rhel9': f'cv_{gen_string("alpha")}_rhel9', 'rhel8': f'cv_{gen_string("alpha")}_rhel8', 'rhel7': f'cv_{gen_string("alpha")}_rhel7', } profiles = { + 'rhel10': OSCAP_PROFILE['cbrhel10'], 'rhel9': OSCAP_PROFILE['cbrhel9'], 'rhel8': OSCAP_PROFILE['ospp8'], 'rhel7': OSCAP_PROFILE['security7'], } rhel_repos = { + 'rhel10': settings.repos.rhel10_os, 'rhel9': settings.repos.rhel9_os, 'rhel8': settings.repos.rhel8_os, 'rhel7': settings.repos.rhel7_os,