fix: clean dirty metal3-dev-env tree between dev-scripts passes#56
Conversation
dev-scripts' 01_install_requirements.sh uses sed -i to downgrade the ansible version in metal3-dev-env/lib/common.sh (10.7.0 -> 8.7.0 for RHEL 9 Python 3.9 compatibility). This leaves the file dirty. When 'make all' re-runs sync_repo_and_patch, git rebase fails with "cannot rebase: You have unstaged changes". Add a task to git checkout the modified file after requirements install, before 'make all' runs. Upstream issue: openshift-metal3/dev-scripts Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
|
Hi @gamado. Thanks for your PR. I'm waiting for a openshift-eng member to verify that this patch is reasonable to test. If it is, they should reply with Regular contributors should join the org to skip this step. Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions 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. |
openshift-ci
bot
added
the
needs-ok-to-test
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: fonta-rh, gamado The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
2 participants
dev-scripts' 01_install_requirements.sh uses sed -i to downgrade the ansible version in metal3-dev-env/lib/common.sh (10.7.0 -> 8.7.0 for RHEL 9 Python 3.9 compatibility). This leaves the file dirty. When 'make all' re-runs sync_repo_and_patch, git rebase fails with "cannot rebase: You have unstaged changes".
Add a task to git checkout the modified file after requirements install, before 'make all' runs.
Upstream issue: openshift-metal3/dev-scripts