Skip to content

Commit

Permalink
changed the version of rhel
Browse files Browse the repository at this point in the history
  • Loading branch information
amolpati30 committed Jul 25, 2024
1 parent 9805e47 commit 41ffa85
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions pytest_fixtures/core/xdist.py
Original file line number Diff line number Diff line change
Expand Up @@ -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=}, '
Expand Down
4 changes: 2 additions & 2 deletions tests/foreman/cli/test_discoveredhost.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 41ffa85

Please sign in to comment.