Skip to content

NO-JIRA: fix: discard unstaged changes before rebase in sync_repo_and_patch#1872

Open
fracappa wants to merge 2 commits intoopenshift-metal3:masterfrom
fracappa:fca/fix-sync-repo-clean-dirty-tree
Open

NO-JIRA: fix: discard unstaged changes before rebase in sync_repo_and_patch#1872
fracappa wants to merge 2 commits intoopenshift-metal3:masterfrom
fracappa:fca/fix-sync-repo-clean-dirty-tree

Conversation

@fracappa
Copy link

@fracappa fracappa commented Mar 23, 2026

01_install_requirements.sh patches metal3-dev-env/lib/common.sh in place with sed -i, leaving the tree dirty. On subsequent runs, sync_repo_and_patch fails to rebases because of the unstaged changes. Add git restore . before the rebase to start from a clean state.

@openshift-ci openshift-ci bot requested review from dtantsur and tdomnesc March 23, 2026 17:02
@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Mar 23, 2026
@openshift-ci
Copy link

openshift-ci bot commented Mar 23, 2026

Hi @fracappa. Thanks for your PR.

I'm waiting for a openshift-metal3 member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

01_install_requirements.sh patches metal3-dev-env/lib/common.sh in place with sed -i, leaving the tree dirty. On subsequent runs, sync_repo_and_patch fails to rebases because of the unstaged changes. Add git restore . before the rebase to start from a clean state.
@fracappa fracappa force-pushed the fca/fix-sync-repo-clean-dirty-tree branch from abf5d99 to 06b1177 Compare March 23, 2026 17:13
@bfournie
Copy link
Contributor

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 23, 2026
@bfournie
Copy link
Contributor

/approve

@openshift-ci
Copy link

openshift-ci bot commented Mar 23, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bfournie

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 23, 2026
@fracappa
Copy link
Author

/test e2e-agent-compact-ipv4-iso-no-registry e2e-metal-ipi-ovn-dualstack

@openshift-ci
Copy link

openshift-ci bot commented Mar 25, 2026

@fracappa: 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-agent-compact-ipv4-iso-no-registry 8fba18d link false /test e2e-agent-compact-ipv4-iso-no-registry
ci/prow/e2e-metal-ipi-ovn-dualstack 8fba18d link false /test e2e-metal-ipi-ovn-dualstack
ci/prow/e2e-metal-ipi-ovn-ipv6 8fba18d link true /test e2e-metal-ipi-ovn-ipv6
ci/prow/e2e-metal-ipi-bm 8fba18d link true /test e2e-metal-ipi-bm

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants