diff --git a/pytest_fixtures/core/sat_cap_factory.py b/pytest_fixtures/core/sat_cap_factory.py index 018a89fdc24..f064fec6da1 100644 --- a/pytest_fixtures/core/sat_cap_factory.py +++ b/pytest_fixtures/core/sat_cap_factory.py @@ -301,7 +301,11 @@ def installer_satellite(request): sat.setup_firewall() # # Register for RHEL8 repos, get Ohsnap repofile, and enable and download satellite sat.register_to_cdn() - sat.download_repofile(product='satellite', release=settings.server.version.release) + sat.download_repofile( + product='satellite', + release=settings.server.version.release, + snap=settings.server.version.snap, + ) sat.execute('dnf -y module enable satellite:el8 && dnf -y install satellite') installed_version = sat.execute('rpm --query satellite').stdout assert sat_version in installed_version diff --git a/tests/foreman/destructive/test_clone.py b/tests/foreman/destructive/test_clone.py index 3979feee20a..60dfc31ca29 100644 --- a/tests/foreman/destructive/test_clone.py +++ b/tests/foreman/destructive/test_clone.py @@ -94,7 +94,9 @@ def test_positive_clone_backup(target_sat, sat_ready_rhel, backup_type, skip_pul # Disabling repositories assert sat_ready_rhel.execute('subscription-manager repos --disable=*').status == 0 # Getting satellite maintenace repo - sat_ready_rhel.download_repofile(product='satellite', release=sat_version) + sat_ready_rhel.download_repofile( + product='satellite', release=sat_version, snap=settings.server.version.snap + ) # Enabling repositories for repo in getattr(constants, f"OHSNAP_RHEL{rhel_version}_REPOS"): sat_ready_rhel.enable_repo(repo, force=True) diff --git a/tests/foreman/installer/test_installer.py b/tests/foreman/installer/test_installer.py index c8be1e85a8a..f3812f5a00e 100644 --- a/tests/foreman/installer/test_installer.py +++ b/tests/foreman/installer/test_installer.py @@ -1342,7 +1342,11 @@ def common_sat_install_assertions(satellite): def install_satellite(satellite, installer_args): # Register for RHEL8 repos, get Ohsnap repofile, and enable and download satellite satellite.register_to_cdn() - satellite.download_repofile(product='satellite', release=settings.server.version.release) + satellite.download_repofile( + product='satellite', + release=settings.server.version.release, + snap=settings.server.version.snap, + ) satellite.execute('dnf -y module enable satellite:el8 && dnf -y install satellite') # Configure Satellite firewall to open communication satellite.execute( @@ -1400,7 +1404,11 @@ def test_capsule_installation(sat_default_install, cap_ready_rhel, default_org): """ # Get Capsule repofile, and enable and download satellite-capsule cap_ready_rhel.register_to_cdn() - cap_ready_rhel.download_repofile(product='capsule', release=settings.server.version.release) + cap_ready_rhel.download_repofile( + product='capsule', + release=settings.server.version.release, + snap=settings.server.version.snap, + ) cap_ready_rhel.execute( 'dnf -y module enable satellite-capsule:el8 && dnf -y install satellite-capsule' ) diff --git a/tests/foreman/maintain/test_upgrade.py b/tests/foreman/maintain/test_upgrade.py index 8e7147e2949..9fc02d39799 100644 --- a/tests/foreman/maintain/test_upgrade.py +++ b/tests/foreman/maintain/test_upgrade.py @@ -152,7 +152,9 @@ def test_negative_pre_upgrade_tuning_profile_check(request, custom_host): timeout='30m', ) # Get current Satellite version's repofile - custom_host.download_repofile(product='satellite', release=sat_version) + custom_host.download_repofile( + product='satellite', release=sat_version, snap=settings.server.version.snap + ) # Run satellite-maintain to have it self update to the newest version, # however, this will not actually execute the command after updating custom_host.execute('satellite-maintain upgrade list-versions') diff --git a/tests/foreman/sys/test_katello_certs_check.py b/tests/foreman/sys/test_katello_certs_check.py index 073f7b22fb1..f058328e2e4 100644 --- a/tests/foreman/sys/test_katello_certs_check.py +++ b/tests/foreman/sys/test_katello_certs_check.py @@ -43,7 +43,11 @@ def test_positive_install_sat_with_katello_certs(certs_data, sat_ready_rhel): :CaseAutomation: Automated """ - sat_ready_rhel.download_repofile(product='satellite', release=settings.server.version.release) + sat_ready_rhel.download_repofile( + product='satellite', + release=settings.server.version.release, + snap=settings.server.version.snap, + ) sat_ready_rhel.register_to_cdn() sat_ready_rhel.execute('dnf -y update') result = sat_ready_rhel.execute(