Skip to content

jenkins: only run git rebase --abort if rebase in progress - #4551

Open
sxa wants to merge 2 commits into
nodejs:mainfrom
sxa:rebase_abort_fix
Open

sxa wants to merge 2 commits into
nodejs:mainfrom
sxa:rebase_abort_fix

Conversation

@sxa

@sxa sxa commented Nov 2, 2026

Copy link
Copy Markdown
Member

Draft for now as this still has debug in it while it undergoes some testing but a potential solution for rogue entries in the reliability reports if this is considered the preferred solution.

Fixes nodejs/reliability#1711

Signed-off-by: Stewart X Addison <sxa@ibm.com>
@sxa

sxa commented Nov 3, 2026

Copy link
Copy Markdown
Member Author

I'm fairly certain this won't be a problem, but if it is then we can analyse those problems if and when they show up, therefore moving this out of draft.

@sxa
sxa marked this pull request as ready for review November 3, 2026 17:08
Comment thread jenkins/scripts/node-test-commit-pre.sh Outdated
echo $GIT_AUTHOR_NAME

git rebase --abort || true
pwd

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure this is strictly needed as the script ought to be being run from the workspace directory, which Jenkins outputs in the job logs.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I just didn't take the debug out when I moved it out of draft - sorted.
I was slightly tempted to leave the ls .git in just to show what was in there in case the check is invalid but given it seems incredibly infrequent that it has to do anything I've left it out.

Signed-off-by: Stewart X Addison <sxa@ibm.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Incorrect detecton of failure: fatal: No rebase in progress?

2 participants