[Virt] Removes EFI boot for cloning tests on s390x #1144
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Important Review skippedDraft detected. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
for more information, see https://pre-commit.ci
openshift-virtualization-qe-bot
added
tox:verify-tc-requirement-polarion:running
openshift-virtualization-qe-bot
approved these changes
Jun 4, 2025
OhadRevah
suggested changes
Jun 5, 2025
Comment on lines
+2498
to
+2499
| cluster_arch = get_nodes_cpu_architecture() | ||
| rhel9_preference = RHEL9_PREFERENCE_S390X if cluster_arch == S390X else RHEL9_PREFERENCE |
There was a problem hiding this comment.
No need, you can use directly in line 2506
| with VirtualMachineForCloning( | ||
| name=RHEL_WITH_INSTANCETYPE_AND_PREFERENCE, | ||
| image=Images.Rhel.RHEL9_REGISTRY_GUEST_IMG, | ||
| namespace=namespace.name, | ||
| client=unprivileged_client, | ||
| vm_instance_type=VirtualMachineClusterInstancetype(name=U1_SMALL), | ||
| vm_preference=VirtualMachineClusterPreference(name=RHEL9_PREFERENCE), | ||
| vm_preference=VirtualMachineClusterPreference(name=rhel9_preference), |
There was a problem hiding this comment.
Suggested change
| vm_preference=VirtualMachineClusterPreference(name=rhel9_preference), | |
| vm_preference=VirtualMachineClusterPreference(name=RHEL9_PREFERENCE_S390X if get_nodes_cpu_architecture() == S390X else RHEL9_PREFERENCE), |
| cluster_arch = get_nodes_cpu_architecture() | ||
| smm_enabled = True | ||
| efi_params = {"secureBoot": True} | ||
| if cluster_arch == S390X: |
There was a problem hiding this comment.
Only used once, use directly:
Suggested change
| if cluster_arch == S390X: | |
| if get_nodes_cpu_architecture() == S390X: |
| @@ -680,6 +680,7 @@ class NamespacesNames: | |||
|
|
|||
| RHEL_WITH_INSTANCETYPE_AND_PREFERENCE = "rhel-with-instancetype-and-preference" | |||
| RHEL9_PREFERENCE = "rhel.9" | |||
| RHEL9_PREFERENCE_S390X = "rhel.9.s390x" | |||
There was a problem hiding this comment.
Suggested change
| RHEL9_PREFERENCE_S390X = "rhel.9.s390x" | |
| RHEL9_PREFERENCE_S390X = f"{RHEL9_PREFERENCE}.s390x" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Short description:
Adds support of test on s390x by changing to bios boots for vm cloning tests
More details:
What this PR does / why we need it:
Allows
tests/virt/cluster/vm_cloning/test_vm_cloning.pyto be run on s390x archWhich issue(s) this PR fixes:
Special notes for reviewer:
jira-ticket: