USHIFT-7428: remove origin pin workaround and update openshift-tests-private commit

[agullon]

Summary

• Remove the temporary sed -i 's|@main|@398edca0cfe4|g' Makefile workaround from scripts/fetch_tools.sh that pinned openshift/origin to avoid a cgroups/kubernetes dependency skew
• Update OPENSHIFT_TESTS_PRIVATE_REPO_COMMIT in test/bin/common_versions.sh to 1a6ccbcdc7c6c4120c0f9d5aed9b7835068265be (latest on release-5.0, 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 883f466 on release-5.0), 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

Summary by CodeRabbit

• Chores
  • Updated build tooling to use the repository's existing dependency reference without applying an additional override.
  • Updated the pinned testing tools revision for the release-5.0 test suite, keeping test execution aligned with the latest approved version.

[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 "5.0.0" version, but no target version was set.

Details

In response to this:

Summary

• Remove the temporary sed -i 's|@main|@398edca0cfe4|g' Makefile workaround from scripts/fetch_tools.sh that pinned openshift/origin to avoid a cgroups/kubernetes dependency skew
• Update OPENSHIFT_TESTS_PRIVATE_REPO_COMMIT in test/bin/common_versions.sh to 1a6ccbcdc7c6c4120c0f9d5aed9b7835068265be (latest on release-5.0, 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 883f466 on release-5.0), 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]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 79e47292-1221-4995-b67d-1edd4f88e599

📥 Commits

Reviewing files that changed from the base of the PR and between 2650686 and 37b85aa.

📒 Files selected for processing (3)

• scripts/fetch_tools.sh
• test/assets/common_versions.sh.template
• test/bin/common_versions.sh

💤 Files with no reviewable changes (1)

• scripts/fetch_tools.sh

🚧 Files skipped from review as they are similar to previous changes (1)

• test/bin/common_versions.sh

---

Walkthrough

The build script no longer modifies the cloned repository’s Makefile before running make all. The release-5.0 private test repository pin now references commit 1a6ccbcdc7c6c4120c0f9d5aed9b7835068265be.

Changes

Build and test updates

Layer / File(s)	Summary
Build dependency handling scripts/fetch_tools.sh	Removed the Makefile rewrite that pinned the openshift/origin dependency before the build.
Private test repository pin test/bin/common_versions.sh, test/assets/common_versions.sh.template	Updated the openshift-tests-private commit pin to 1a6ccbcdc7c6c4120c0f9d5aed9b7835068265be.

Estimated code review effort: 2 (Simple) | ~10 minutes

Suggested reviewers: jogeo, pacevedom, kasturinarra

🚥 Pre-merge checks | ✅ 15

✅ Passed checks (15 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately describes the two main changes: removing the origin pin workaround and updating the openshift-tests-private commit.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names	✅ Passed	The PR modifies only bash scripts and version files (scripts/fetch_tools.sh, test/bin/common_versions.sh, test/assets/common_versions.sh.template). No Go test files or Ginkgo test definitions are m...
Test Structure And Quality	✅ Passed	The PR changes only a shell build script and version-pin files; it adds or modifies no Ginkgo test code, so the listed test-quality checks are not applicable.
Microshift Test Compatibility	✅ Passed	PR does not add new Ginkgo e2e tests; it only removes a build workaround and updates version pins. Check applies only to new test additions.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	The patch changes only a shell build workaround and repository commit pins; it adds no Ginkgo tests or multi-node assumptions requiring SNO review.
Topology-Aware Scheduling Compatibility	✅ Passed	The PR modifies only build and test configuration scripts (fetch_tools.sh, common_versions.sh) with no deployment manifests, operator code, or scheduling constraints; therefore, the topology-aware...
Ote Binary Stdout Contract	✅ Passed	PR modifies only shell script and configuration files (scripts/fetch_tools.sh, test/bin/common_versions.sh, test/assets/common_versions.sh.template) with no Go source code changes. No stdout writes...
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	This PR removes a build workaround and updates version pins. It does not add new Ginkgo e2e tests, so the IPv6/disconnected network compatibility check does not apply.
No-Weak-Crypto	✅ Passed	No weak cryptographic algorithms, custom crypto implementations, or insecure secret comparisons detected in the modified files. Changes are dependency version updates and build script modifications.
Container-Privileges	✅ Passed	PR modifies only shell scripts and version pins. No container or K8s manifests with privileged settings are introduced.
No-Sensitive-Data-In-Logs	✅ Passed	No sensitive data exposure in logs. GITHUB_TOKEN is embedded only in git clone with stderr redirection. Commit hashes are public. No error messages log sensitive values.

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

_{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	37b85aa	link	true	/test e2e-aws-tests-periodic
ci/prow/e2e-aws-tests-bootc-periodic-arm-el10	37b85aa	link	true	/test e2e-aws-tests-bootc-periodic-arm-el10
ci/prow/e2e-aws-tests-bootc-periodic-el9	37b85aa	link	true	/test e2e-aws-tests-bootc-periodic-el9

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.