From 41ffa85d3fdb2f331fc4d24b3eea0a0efefda97d Mon Sep 17 00:00:00 2001 From: amol patil Date: Thu, 25 Jul 2024 03:11:37 +0530 Subject: [PATCH] changed the version of rhel --- pytest_fixtures/core/xdist.py | 14 +++++++------- tests/foreman/cli/test_discoveredhost.py | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pytest_fixtures/core/xdist.py b/pytest_fixtures/core/xdist.py index 5302b255c45..216589e85d7 100644 --- a/pytest_fixtures/core/xdist.py +++ b/pytest_fixtures/core/xdist.py @@ -30,13 +30,13 @@ def align_to_satellite(request, worker_id, satellite_factory): worker_pos = 0 if worker_id in ["master", "local"] else int(worker_id.replace("gw", "")) # attempt to add potential satellites from the broker inventory file - # if settings.server.inventory_filter: - # logger.info( - # f'{worker_id=}: Attempting to add Satellite hosts using inventory filter: ' - # f'{settings.server.inventory_filter}' - # ) - # hosts = Satellite.get_hosts_from_inventory(filter=settings.server.inventory_filter) - # settings.server.hostnames += [host.hostname for host in hosts] + if settings.server.inventory_filter: + logger.info( + f'{worker_id=}: Attempting to add Satellite hosts using inventory filter: ' + f'{settings.server.inventory_filter}' + ) + hosts = Satellite.get_hosts_from_inventory(filter=settings.server.inventory_filter) + settings.server.hostnames += [host.hostname for host in hosts] logger.debug( f'{worker_id=}: {settings.server.xdist_behavior=}, ' diff --git a/tests/foreman/cli/test_discoveredhost.py b/tests/foreman/cli/test_discoveredhost.py index 62e6c73c4b4..804486baf58 100644 --- a/tests/foreman/cli/test_discoveredhost.py +++ b/tests/foreman/cli/test_discoveredhost.py @@ -440,9 +440,9 @@ def test_positive_verify_updated_fdi_image(target_sat): target_sat.execute('yum -y --disableplugin=foreman-protector install foreman-discovery-image') if target_sat.os_version.major == 9: - version = '8.9' if is_open('SAT-25275') else str(target_sat.os_version) + version = '8.10' if is_open('SAT-25275') else str(target_sat.os_version) elif target_sat.os_version.major == 8: - version = '8.9' if is_open('SAT-24197') else str(target_sat.os_version) + version = '8.10' if is_open('SAT-24197') else str(target_sat.os_version) result = target_sat.execute(f'grep "url=" {discovery_ks_path}') assert version in result.stdout