|
40 | 40 | from robottelo.exceptions import CLIReturnCodeError |
41 | 41 | from robottelo.hosts import ContentHost |
42 | 42 | from robottelo.utils.datafactory import parametrized |
| 43 | +from robottelo.utils.issue_handlers import is_open |
43 | 44 |
|
44 | 45 | LIBVIRT_URL = LIBVIRT_RESOURCE_URL % settings.libvirt.libvirt_hostname |
45 | 46 |
|
@@ -371,7 +372,7 @@ def test_positive_update_console_password(libvirt_url, set_console_password, mod |
371 | 372 | @pytest.mark.e2e |
372 | 373 | @pytest.mark.on_premises_provisioning |
373 | 374 | @pytest.mark.rhel_ver_match('[7]') |
374 | | -@pytest.mark.parametrize('pxe_loader', ['uefi', 'secureboot'], indirect=True) |
| 375 | +@pytest.mark.parametrize('pxe_loader', ['bios', 'uefi', 'secureboot'], indirect=True) |
375 | 376 | @pytest.mark.parametrize('setting_update', ['destroy_vm_on_host_delete=True'], indirect=True) |
376 | 377 | def test_positive_provision_end_to_end( |
377 | 378 | request, |
@@ -406,6 +407,10 @@ def test_positive_provision_end_to_end( |
406 | 407 |
|
407 | 408 | :customerscenario: true |
408 | 409 | """ |
| 410 | + # Skip test for UEFI and SecureBoot loaders |
| 411 | + if is_open('SAT-41340') and pxe_loader.vm_firmware in ['uefi', 'uefi_secure_boot']: |
| 412 | + pytest.skip(f"Test not supported for {pxe_loader.vm_firmware} firmware") |
| 413 | + |
409 | 414 | sat = module_libvirt_provisioning_sat.sat |
410 | 415 | cr_name = gen_string('alpha') |
411 | 416 | hostname = gen_string('alpha').lower() |
@@ -450,10 +455,15 @@ def test_positive_provision_end_to_end( |
450 | 455 | assert hostname in result.stdout |
451 | 456 |
|
452 | 457 | wait_for( |
453 | | - lambda: sat.cli.Host.info({'name': hostname})['status']['build-status'] |
454 | | - != 'Pending installation', |
| 458 | + lambda: ( |
| 459 | + sat.cli.Host.info({'name': hostname}) |
| 460 | + .get('status', {}) |
| 461 | + .get('build-status', 'Pending installation') |
| 462 | + != 'Pending installation' |
| 463 | + ), |
455 | 464 | timeout=1800, |
456 | 465 | delay=30, |
| 466 | + handle_exception=True, |
457 | 467 | ) |
458 | 468 | host_info = sat.cli.Host.info({'id': host['id']}) |
459 | 469 | assert host_info['status']['build-status'] == 'Installed' |
|
0 commit comments