Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

6.15.z-fix keyError: 'rhel8 + _bos' from api>tests_repository.py #14878

Merged
merged 1 commit into from
Apr 24, 2024
Merged

6.15.z-fix keyError: 'rhel8 + _bos' from api>tests_repository.py #14878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions robottelo/constants/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,9 @@ class Colored(Box):
'kickstart': {
'rhel6': 'Red Hat Enterprise Linux 6 Server (Kickstart)',
'rhel7': 'Red Hat Enterprise Linux 7 Server (Kickstart)',
'rhel8': 'Red Hat Enterprise Linux 8 for x86_64 - BaseOS (Kickstart)',
'rhel8_bos': 'Red Hat Enterprise Linux 8 for x86_64 - BaseOS (Kickstart)',
'rhel8_aps': 'Red Hat Enterprise Linux 8 for x86_64 - AppStream (Kickstart)',
'rhel9': 'Red Hat Enterprise Linux 9 for x86_64 - BaseOS (Kickstart)',
'rhel9_bos': 'Red Hat Enterprise Linux 9 for x86_64 - BaseOS (Kickstart)',
'rhel9_aps': 'Red Hat Enterprise Linux 9 for x86_64 - AppStream (Kickstart)',
},
'rhel8_bos': 'Red Hat Enterprise Linux 8 for x86_64 - BaseOS (RPMs)',
Expand Down Expand Up @@ -535,7 +535,7 @@ class Colored(Box):
'id': 'rhel-8-for-x86_64-baseos-kickstart',
'name': 'Red Hat Enterprise Linux 8 for x86_64 - BaseOS Kickstart 8.9',
'version': '8.9',
'reposet': REPOSET['kickstart']['rhel8'],
'reposet': REPOSET['kickstart']['rhel8_bos'],
'product': PRDS['rhel8'],
'distro': 'rhel8',
},
Expand All @@ -551,7 +551,7 @@ class Colored(Box):
'id': 'rhel-9-for-x86_64-baseos-kickstart',
'name': 'Red Hat Enterprise Linux 9 for x86_64 - BaseOS Kickstart 9.3',
'version': '9.3',
'reposet': REPOSET['kickstart']['rhel9'],
'reposet': REPOSET['kickstart']['rhel9_bos'],
'product': PRDS['rhel9'],
'distro': 'rhel9',
},
Expand Down
2 changes: 1 addition & 1 deletion tests/foreman/api/test_repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1488,7 +1488,7 @@ def test_positive_sync_kickstart_check_os(
1. OS with corresponding version was created.
"""
distro = f'rhel{distro} + "_bos"' if distro > 7 else f'rhel{distro}'
distro = f'rhel{distro}_bos' if distro > 7 else f'rhel{distro}'
repo_id = target_sat.api_factory.enable_rhrepo_and_fetchid(
basearch='x86_64',
org_id=module_entitlement_manifest_org.id,
Expand Down
2 changes: 1 addition & 1 deletion tests/foreman/cli/test_repositories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def test_positive_disable_rh_repo_with_basearch(module_target_sat, module_entitl
disabled_repo = module_target_sat.cli.RepositorySet.disable(
{
'basearch': DEFAULT_ARCHITECTURE,
'name': REPOSET['kickstart']['rhel8'],
'name': REPOSET['kickstart']['rhel8_bos'],
'product-id': repo.product.id,
'organization-id': module_entitlement_manifest_org.id,
'releasever': REPOS['kickstart']['rhel8_aps']['version'],
Expand Down