Revert "Update machine type to pc-q35-rhel9.8.0 (#4415)"

[mkowalski]

Short description:

Revert PR #4415 which updated machine type from pc-q35-rhel9.6.0 to pc-q35-rhel9.8.0.

More details:

This reverts commit 214aad4.

The machine type update to pc-q35-rhel9.8.0 broke OpenShift 4.22. This is a release blocker tracked in OCPBUGS-83598.

What this PR does / why we need it:

Reverts the machine type change back to pc-q35-rhel9.6.0 to unblock OpenShift 4.22.

Which issue(s) this PR fixes:

Special notes for reviewer:

Release blocker — OCPBUGS-83598

jira-ticket:

https://issues.redhat.com/browse/OCPBUGS-83598

[coderabbitai]

📝 Walkthrough

Walkthrough

The changes update machine type constant definitions and their corresponding test to replace RHEL 9.8 Q35 machine type references with RHEL 9.6 variants, affecting both constant declarations and test assertions.

Changes

Cohort / File(s)	Summary
Machine Type Constants tests/virt/constants.py	Updated MachineTypesNames class to replace pc_q35_rhel9_8 definition ({pc_q35}-rhel9.8.0) with pc_q35_rhel9_6 definition ({pc_q35}-rhel9.6.0).
Machine Type Tests tests/virt/node/general/test_machinetype.py	Renamed test function from test_machine_type_as_rhel_9_8 to test_machine_type_as_rhel_9_6 and updated expected values from MachineTypesNames.pc_q35_rhel9_8 / pc-q35-rhel9.8.0 to MachineTypesNames.pc_q35_rhel9_6 / pc-q35-rhel9.6.0, including assertion failure message updates.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~4 minutes

🚥 Pre-merge checks | ✅ 3

✅ Passed checks (3 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title accurately describes the main change: reverting a previous PR that updated the machine type to RHEL 9.8.0.
Docstring Coverage	✅ Passed	Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.
Description check	✅ Passed	The PR description includes all required sections with sufficient context about the revert rationale and blocking issue.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

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.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[openshift-virtualization-qe-bot-2]

Report bugs in Issues

Welcome! 🎉

This pull request will be automatically processed with the following features:

🔄 Automatic Actions

• Reviewer Assignment: Reviewers are automatically assigned based on the OWNERS file in the repository root
• Size Labeling: PR size labels (XS, S, M, L, XL, XXL) are automatically applied based on changes
• Issue Creation: A tracking issue is created for this PR and will be closed when the PR is merged or closed
• Branch Labeling: Branch-specific labels are applied to track the target branch
• Auto-verification: Auto-verified users have their PRs automatically marked as verified
• Labels: Enabled categories: branch, can-be-merged, cherry-pick, has-conflicts, hold, needs-rebase, size, verified, wip

📋 Available Commands

PR Status Management

• /wip - Mark PR as work in progress (adds WIP: prefix to title)
• /wip cancel - Remove work in progress status
• /hold - Block PR merging (approvers only)
• /hold cancel - Unblock PR merging
• /verified - Mark PR as verified
• /verified cancel - Remove verification status
• /reprocess - Trigger complete PR workflow reprocessing (useful if webhook failed or configuration changed)
• /regenerate-welcome - Regenerate this welcome message

Review & Approval

• /lgtm - Approve changes (looks good to me)
• /approve - Approve PR (approvers only)
• /assign-reviewers - Assign reviewers based on OWNERS file
• /assign-reviewer @username - Assign specific reviewer
• /check-can-merge - Check if PR meets merge requirements

Testing & Validation

• /retest tox - Run Python test suite with tox
• /retest build-container - Rebuild and test container image
• /retest verify-bugs-are-open - verify-bugs-are-open
• /retest all - Run all available tests

Container Operations

• /build-and-push-container - Build and push container image (tagged with PR number)
  • Supports additional build arguments: /build-and-push-container --build-arg KEY=value

Cherry-pick Operations

• /cherry-pick <branch> - Schedule cherry-pick to target branch when PR is merged
  • Multiple branches: /cherry-pick branch1 branch2 branch3

Label Management

• /<label-name> - Add a label to the PR
• /<label-name> cancel - Remove a label from the PR

✅ Merge Requirements

This PR will be automatically approved when the following conditions are met:

1. Approval: /approve from at least one approver
2. LGTM Count: Minimum 2 /lgtm from reviewers
3. Status Checks: All required status checks must pass
4. No Blockers: No wip, hold, has-conflicts labels and PR must be mergeable (no conflicts)
5. Verified: PR must be marked as verified

📊 Review Process

Approvers and Reviewers

Approvers:

• dshchedr
• vsibirsk

Reviewers:

• SamAlber
• akri3i
• dshchedr
• kbidarkar
• vsibirsk

Available Labels

• hold
• verified
• wip
• lgtm
• approve

AI Features

• Cherry-Pick Conflict Resolution: Enabled (claude/claude-opus-4-6[1m])

💡 Tips

• WIP Status: Use /wip when your PR is not ready for review
• Verification: The verified label is removed on new commits unless the push is detected as a clean rebase
• Cherry-picking: Cherry-pick labels are processed when the PR is merged
• Container Builds: Container images are automatically tagged with the PR number
• Permission Levels: Some commands require approver permissions
• Auto-verified Users: Certain users have automatic verification and merge privileges

For more information, please refer to the project documentation or contact the maintainers.

[openshift-virtualization-qe-bot-3]

Clean rebase detected — no code changes compared to previous head (c7ce470).
The following labels were preserved: lgtm-coderabbitai[bot].

[kbidarkar]

Reverting this test will impact CNV 4.22 testing, We should not revert this.

Root cause of the test failures: Instead please update the openshift 4.22 lane to consume 4.22 CNV version and not 4.99 CNV version.

Also, the CI release team only moved to el9.8 pkgs for 4.22 and not 4.99, 4.99 is still using el9.7.

CNV 4.22 MUST release only with pc-q35-rhel9.8.0

I NACK reverting this PR.

A note for the maintainers,
Root Cause: Testing ocp 4.22 with cnv 4.99 , rather they should test it ocp 4.22 with cnv 4.22
Please refer this link and check the installedCSV value, https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/logs/periodic-ci-openshift-ovn-kubernetes-release-4.22-periodics-e2e-metal-ipi-ovn-bgp-virt-ipv4-techpreview/2044672242599596032/artifacts/e2e-metal-ipi-ovn-bgp-virt-ipv4-techpreview/gather-extra/artifacts/subscriptions.json

@vsibirsk @rnetser @dshchedr cc

[mkowalski]

I am wearing OCP staff engineering hat now and the process is that this PR is the immediate reason of component readiness failing for 4.22

The process is to revert first and then you have time to fix whatever is necessary to be fixed.

[mkowalski]

/hold

[openshift-virtualization-qe-bot-4]

mkowalski is not part of the approver, only approvers can mark pull request with hold

[kbidarkar]

@akri3i filed this bug for cnv 4.99 build, https://redhat.atlassian.net/browse/CNV-84732

[dshchedr]

/hold

[mkowalski]

/close

Tracking fix via https://redhat.atlassian.net/browse/CNV-84732