-
Notifications
You must be signed in to change notification settings - Fork 115
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.
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 support, test in Errata e2e parametrized registered hosts #16807
Conversation
trigger: test-robottelo |
trigger: test-robottelo |
PRT Result
|
trigger: test-robottelo |
PRT Result
|
trigger: test-robottelo |
PRT Result
|
|
|
trigger: test-robottelo |
953a2e8
to
de4ebbc
Compare
|
PRT Result
|
|
|
|
fa7ea97
to
66d14e9
Compare
|
1 similar comment
|
8c83f78
to
f468398
Compare
|
^ SatJenkins MR has been merged, 'rhel10' is in |
trigger: test-robottelo |
PRT Result
|
f468398
to
fa1f051
Compare
trigger: test-robottelo |
fa1f051
to
5ca9d7b
Compare
trigger: test-robottelo |
|
PRT Result
|
5ca9d7b
to
597462b
Compare
597462b
to
82bae97
Compare
|
PRT Result
|
^ All cases parametrized by RHEL10 pass, collection is as expected with a higher total number. |
with Broker( | ||
nick='rhel10', workflow='deploy-template', host_class=ContentHost, _count=2 | ||
) as clients: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@damoore044 If we already have the nick defined in broker_settings, we might not require workflow arg here
# one custom repo on satellite, for all hosts to use | ||
custom_repo = target_sat.api.Repository(url=CUSTOM_REPO_URL, product=module_product).create() | ||
custom_repo.sync() | ||
module_cv.repository = [custom_repo] | ||
module_cv.update(['repository']) | ||
with Broker( | ||
nick=distro, | ||
workflow='deploy-rhel', | ||
workflow='deploy-template', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same here
Fix CLI setup methodsetup_org_for_a_custom_repo
, where updating the activation-key requires the name.^This was a bug, wrapping up reverting those changes
Problem Statement:
('|10')
, or we use string matching for regex to get two-digit versions matched, see below.Solution
Pass the
rhel_ver_match
fixture a string to collect rhel8, 9, and 10 params for fixturerhel_contenthost
.@pytest.marker.rhel_ver_match(r'^(?!.*(7|fips)).*$')
< str match, exclude any with "7" or "fips"@pytest.marker.rhel_ver_match('8|9|10') or ('[^7]|10')
< pass "10" explicitly^ Above solutions will need regular bumping, when versions are added or dropped from
supportability.yaml
@pytest.marker.rhel_ver_match('N-2')
N is RHEL10 (newest version), additionally RHEL9, RHEL8Proposed Fixture change
For pytest marker
rhel_ver_match
, it would be useful to accept input of N-# (major rhel versions). This would be helpful because we won't have to change the fixtures for each and every test, everytime we add a new RHEL version or remove one fromsupportability.yaml
.ie: many tests use
('[^6]')
which is 'all single-char versions except 6' , RHEL6 is not in supportability anymore, and 10 is two digits and so will be all future versions. So we would need to pass explicitly, ie('10|11|12')
and bump with each added/removed version.Solution: Accept and check for a strict fixture argument of length 3,
"N-#"
, where N is always the latest supported version, and # is a single digit number of preceding supported versions to also collect, excluding fips. Existing test markers will not conflict and will be parsed as before, so their collection should not be impacted.Example:
@pytest.mark.rhel_ver_match('N-3')
would collect 4 params, N which in this PR is RHEL10, along with the 3 preceding supported versions, RHEL9, RHEL8 and RHEL7.To collect a single param for just N (latest version only, here is RHEL10);
simply pass the marker
rhel_ver_match('N-0')
PRT