Skip to content

Commit 56da0ee

Browse files
committed
SAT-20386 Jira card is closed; removing it. (#20839)
(cherry picked from commit 1e9d8e4)
1 parent 966b75d commit 56da0ee

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

tests/foreman/api/test_provisioning.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,16 @@ def test_rhel_pxe_provisioning_fips_enabled(
498498
499499
:Verifies: SAT-26071
500500
"""
501+
# Skip RHEL7 UEFI test due to known issue SAT-41340
502+
if (
503+
is_open('SAT-41340')
504+
and pxe_loader.vm_firmware in ['uefi']
505+
and module_provisioning_rhel_content.os.major == '7'
506+
):
507+
pytest.skip(
508+
f"Test not supported for rhel{module_provisioning_rhel_content.os.major} {pxe_loader.vm_firmware} firmware"
509+
)
510+
501511
sat = module_provisioning_sat.sat
502512
host_mac_addr = provisioning_host.provisioning_nic_mac_addr
503513
# Verify password hashing algorithm SHA512 is set in OS used for provisioning
@@ -534,7 +544,7 @@ def test_rhel_pxe_provisioning_fips_enabled(
534544
# the result of the installation. Wait until Satellite reports that the host is installed.
535545
wait_for(
536546
lambda: host.read().build_status_label != 'Pending installation',
537-
timeout=1500,
547+
timeout=2000,
538548
delay=10,
539549
)
540550
host = host.read()
@@ -573,7 +583,7 @@ def test_rhel_pxe_provisioning_fips_enabled(
573583

574584
# Verify FIPS is enabled on host after provisioning is completed successfully
575585
result = provisioning_host.execute('cat /proc/sys/crypto/fips_enabled')
576-
assert (0 if is_open('SAT-20386') else 1) == int(result.stdout)
586+
assert int(result.stdout) == 1
577587

578588
# Run a command on the host using REX to verify that Satellite's SSH key is present on the host
579589
# Add workaround for SAT-32007 and SAT-32006

0 commit comments

Comments
 (0)