Repository navigation
CARRY: fix(skills): move ODH installer guidance out of upstream skill - #124
Merged
Merged
Conversation
Keep debug-openshell-cluster identical to upstream so the upstream sync stops conflicting, and move the ODH installer guidance into a midstream-only debug-odh-openshell-install skill. Signed-off-by: Andre Lustosa <alustosa@redhat.com>
|
Note Currently processing new changes in this PR. This may take a few minutes, please wait... ⚙️ Run configuration
📒 Files selected for processing: 2
Comment |
EmilienM
approved these changes
Oct 23, 2026
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
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.
Summary
The upstream auto-merge failed with a conflict in
skills/debug-openshell-cluster/SKILL.md(rhods-devops-infra run 39951574868). Midstream carried an ODH installer block inside that upstream-owned file, and an earlier sync merge kept a stale midstream table row, so upstream NVIDIA#4702 conflicted with it. This moves the ODH guidance into a midstream-only skill and makesdebug-openshell-clusteridentical to upstream so future syncs merge it cleanly.Related Issue
The target repository (
opendatahub-io/openshell) has GitHub Issues disabled, so there is no target-repository issue to close.Changes
skills/debug-openshell-cluster/SKILL.mdto the upstream merge-base version (132c582). This also restores the SCC troubleshooting row from upstream chore(e2e): remove obsolete OpenShift sandbox SCC grant NVIDIA/OpenShell#4823 that sync merge c2830aa dropped.skills/debug-odh-openshell-install/SKILL.mdwith the ODH gateway-and-dashboard installer guidance, unchanged, plus a pointer back todebug-openshell-cluster.Testing
upstream/main(9a85667) into this branch completes without conflictsSKILL.mdmatchesupstream/mainmarkdownlint-cli2andscripts/update_license_headers.py --checkpassChecklist
🤖 Generated with Claude Code
Summary by CodeRabbit