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.

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] Fetch pre_upgrade data based on node properties #16552

Merged

Conversation

Satellite-QE
Copy link
Collaborator

Cherrypick of PR: #16423

Problem Statement

During TFA I've seen several post_upgrade failures for "rhel_contenthost-parametrized" upgrade scenario tests where the pre-data could not be fetched from the scenario_entities file:

failed on setup with "Failed: Invalid test parameter: rhel7. Test data not found."

The reason is that the pre-upgrade test names are now suffixed with -ipv4 or -ipv6 so the scenario_entities hold items like this:

{"tests/upgrades/test_repository.py::TestSimpleContentAccessOnly::test_pre_simple_content_access_only[rhel7-ipv4]": {...}}

while this piece of code requires the exact param, which is just rhel7, rhel8, rhel9.

Solution(?)

There are probably more than one solution and I'm not sure which one would be the best.

Initially I thought we could go regardless the ipvX suffix since I supposed the pipelines were separated (first commit).
That's probably not a good solution when we start decorating tests with ['ipv4', 'ipv6'] explicitly, so I took the network type from the settings.

Please let me know if there is a better place where to get that information from in scope of the pre_upgrade_data fixture.

* Fetch pre_upgrade data regardless the ipvX suffix

* Fetch pre_upgrade data based on node properties

* Fetch pre_upgrade data based on settings

(cherry picked from commit 65d7c33)
@Satellite-QE Satellite-QE requested a review from a team as a code owner October 2, 2024 16:05
@Satellite-QE Satellite-QE added 6.15.z Introduced in or relating directly to Satellite 6.15 Auto_Cherry_Picked Automatically cherrypicked PR using GHA No-CherryPick PR doesnt need CherryPick to previous branches labels Oct 2, 2024
Copy link
Contributor

@vsedmik vsedmik left a comment

Choose a reason for hiding this comment

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

CP looks good

@vsedmik vsedmik enabled auto-merge (squash) October 2, 2024 16:11
@vsedmik vsedmik merged commit 2d08856 into 6.15.z Oct 2, 2024
13 checks passed
@vsedmik vsedmik deleted the cherry-pick-6.15.z-65d7c33465f2f7ff3bb05cbeda2b77d8f146bdd0 branch October 2, 2024 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.15.z Introduced in or relating directly to Satellite 6.15 Auto_Cherry_Picked Automatically cherrypicked PR using GHA No-CherryPick PR doesnt need CherryPick to previous branches
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants