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

RHEL10 Clients coverage, rhel7 & 8 hosts bumped #17003

Merged
merged 3 commits into from
Feb 18, 2025
+87 −97
Merged

RHEL10 Clients coverage, rhel7 & 8 hosts bumped #17003

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8508f5
rhel10 parametrized fixture chosts
damoore044 Dec 17, 2024
f24c0bc
Fixups, reverting some UI tests
damoore044 Feb 17, 2025
f52e93e
drop RHEL6 from supported distros
damoore044 Feb 18, 2025
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
10 changes: 9 additions & 1 deletion pytest_fixtures/component/provisioning_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,15 @@ def module_sync_kickstart_content(
)
task_status = module_target_sat.api.ForemanTask(id=task['id']).poll()
assert task_status['result'] == 'success'
rhel_xy = Version(constants.REPOS['kickstart'][repo_name]['version'])

rhel_xy = Version(
constants.REPOS['kickstart'][f'rhel{rhel_ver}_bos_beta']['version']
if rhel_ver == 10 # TODO: Remove beta repos once RHEL10 is GA
else constants.REPOS['kickstart'][f'rhel{rhel_ver}']['version']
if rhel_ver == 7
else constants.REPOS['kickstart'][f'rhel{rhel_ver}_bos']['version']
)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In cases like these, normal if/elif/else blocks are the same number of lines and flow better.

Suggested change
rhel_xy = Version(
constants.REPOS['kickstart'][f'rhel{rhel_ver}_bos_beta']['version']
if rhel_ver == 10 # TODO: Remove beta repos once RHEL10 is GA
else constants.REPOS['kickstart'][f'rhel{rhel_ver}']['version']
if rhel_ver == 7
else constants.REPOS['kickstart'][f'rhel{rhel_ver}_bos']['version']
)
if rhel_ver == 10 # TODO: Remove beta repos once RHEL10 is GA
rhel_xy = Version(constants.REPOS['kickstart'][f'rhel{rhel_ver}_bos_beta']['version'])
elif rhel_ver == 7:
rhel_xy = Version(constants.REPOS['kickstart'][f'rhel{rhel_ver}']['version'])
else:
rhel_xy = Version(constants.REPOS['kickstart'][f'rhel{rhel_ver}_bos']['version'])


o_systems = module_target_sat.api.OperatingSystem().search(
query={'search': f'family=Redhat and major={rhel_xy.major} and minor={rhel_xy.minor}'}
)
Expand Down
7 changes: 0 additions & 7 deletions pytest_fixtures/core/contenthosts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,6 @@ def rhel8_contenthost_module(request):
yield host


@pytest.fixture(params=[{'rhel_version': 6}])
def rhel6_contenthost(request):
"""A function-level fixture that provides a rhel6 content host object"""
with Broker(**host_conf(request), host_class=ContentHost) as host:
yield host


@pytest.fixture(params=[{'rhel_version': '9'}])
def rhel9_contenthost(request):
"""A fixture that provides a rhel9 content host object"""
Expand Down
3 changes: 2 additions & 1 deletion robottelo/constants/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@


DISTRO_DEFAULT = 'rhel7'
DISTROS_SUPPORTED = ['rhel6', 'rhel7', 'rhel8', 'rhel9']
DISTROS_SUPPORTED = ['rhel6', 'rhel7', 'rhel8', 'rhel9', 'rhel10']
DISTROS_MAJOR_VERSION = {
'rhel6': 6,
'rhel7': 7,
'rhel8': 8,
'rhel9': 9,
'rhel10': 10,
}
MAJOR_VERSION_DISTRO = {value: key for key, value in DISTROS_MAJOR_VERSION.items()}

Expand Down
2 changes: 1 addition & 1 deletion tests/foreman/api/test_ansible.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ def test_positive_ansible_job_on_multiple_host(
assert result.status_label == 'failed'

@pytest.mark.no_containers
@pytest.mark.rhel_ver_match('[^6]')
@pytest.mark.rhel_ver_match(r'^(?!.*fips).*$') # all major versions, excluding fips
def test_positive_ansible_localhost_job_on_host(
self, target_sat, module_org, module_location, module_ak_with_synced_repo, rhel_contenthost
):
Expand Down
10 changes: 5 additions & 5 deletions tests/foreman/api/test_capsulecontent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ def test_flatpak_pulpcore_endpoint(self, target_sat, module_capsule_configured):
@pytest.mark.e2e
@pytest.mark.tier4
@pytest.mark.skip_if_not_set('capsule')
@pytest.mark.parametrize('distro', ['rhel7', 'rhel8_bos', 'rhel9_bos'])
@pytest.mark.parametrize('distro', ['rhel7', 'rhel8_bos', 'rhel9_bos', 'rhel10_bos_beta'])
def test_positive_sync_kickstart_repo(
self, target_sat, module_capsule_configured, function_sca_manifest_org, distro
):
Expand Down Expand Up @@ -868,18 +868,18 @@ def test_positive_sync_kickstart_repo(
module_capsule_configured.wait_for_sync(start_time=timestamp)
cvv = cvv.read()
assert len(cvv.environment) == 2

# Check for kickstart content on SAT and CAPS
tail = (
f'rhel/server/7/{REPOS["kickstart"][distro]["version"]}/x86_64/kickstart'
if distro == 'rhel7'
else f'{distro.split("_")[0]}/{REPOS["kickstart"][distro]["version"]}/beta/x86_64/baseos/kickstart'
if 'beta' in distro # for future beta rhel distros
else f'{distro.split("_")[0]}/{REPOS["kickstart"][distro]["version"]}/x86_64/baseos/kickstart' # noqa:E501
)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

now that you're injecting the two additional lines (and additional condition), i'd recommend the same as earlier.

url_base = (
f'pulp/content/{function_sca_manifest_org.label}/{lce.label}/{cv.label}/'
f'content/dist/{tail}'
)

# Check kickstart specific files
for file in KICKSTART_CONTENT:
sat_file = target_sat.checksum_by_url(f'{target_sat.url}/{url_base}/{file}')
Expand Down Expand Up @@ -1447,13 +1447,13 @@ def test_positive_remove_capsule_orphans(
'repos_collection',
[
{
'distro': 'rhel9',
'distro': 'rhel10',
'YumRepository': {'url': settings.repos.yum_0.url},
}
],
indirect=True,
)
@pytest.mark.rhel_ver_list([settings.content_host.default_rhel_version])
@pytest.mark.rhel_ver_match('N-0')
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't it same as running test against EL10? or do you wish to parametrize this test for EL9 and E10?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes just EL10, I could specify '10' for rhel_ver_match , but with N-0 it will always pick the newest RHEL supported, and only that one.

def test_complete_sync_fixes_metadata(
self,
module_target_sat,
Expand Down
Loading