[release-4.22] USHIFT-7428: remove origin pin workaround and update openshift-tests-private commit

[agullon]

Summary

• Remove the temporary sed -i 's|@main|@release-4.22|g' Makefile workaround from scripts/fetch_tools.sh that pinned openshift/origin to the release branch to avoid a cgroups/kubernetes dependency skew
• Update OPENSHIFT_TESTS_PRIVATE_REPO_COMMIT in test/bin/common_versions.sh to 264a5b49369c2db96100374758c9c5cfb29a0259 (latest on release-4.22, which includes the upstream fix)

Context

The workaround was introduced in USHIFT-7427 to work around a build breakage caused by opencontainers/cgroups v0.0.6 incompatibility in openshift-tests-private. The upstream fix has now landed via OCPQE-32095 (commit 264a5b4 on release-4.22), so the workaround is no longer needed.

Test plan

• CI passes — ginkgo tool build in fetch_tools.sh succeeds without the origin pin
• extended-platform-tests binary compiles and runs correctly

Ref: USHIFT-7428

🤖 Generated with Claude Code

[openshift-ci-robot]

@agullon: This pull request references USHIFT-7428 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Summary

• Remove the temporary sed -i 's|@main|@release-4.22|g' Makefile workaround from scripts/fetch_tools.sh that pinned openshift/origin to the release branch to avoid a cgroups/kubernetes dependency skew
• Update OPENSHIFT_TESTS_PRIVATE_REPO_COMMIT in test/bin/common_versions.sh to 264a5b49369c2db96100374758c9c5cfb29a0259 (latest on release-4.22, which includes the upstream fix)

Context

The workaround was introduced in USHIFT-7427 to work around a build breakage caused by opencontainers/cgroups v0.0.6 incompatibility in openshift-tests-private. The upstream fix has now landed via OCPQE-32095 (commit 264a5b4 on release-4.22), so the workaround is no longer needed.

Test plan

• CI passes — ginkgo tool build in fetch_tools.sh succeeds without the origin pin
• extended-platform-tests binary compiles and runs correctly

Ref: USHIFT-7428

🤖 Generated with Claude Code

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: d5f5fd0c-2841-4a26-a759-80cca171ca3c

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

---

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

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: agullon

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [agullon]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-ci]

@agullon: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-aws-tests-periodic	fc98a8b	link	true	/test e2e-aws-tests-periodic
ci/prow/e2e-aws-tests-bootc-periodic-el9	fc98a8b	link	true	/test e2e-aws-tests-bootc-periodic-el9
ci/prow/test-unit	fc98a8b	link	true	/test test-unit

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.