node-test-commit-linux on 'ubuntu2404-x64' is failing since 2026-07-20

[trivikr]

https://ci.nodejs.org/job/node-test-commit-linux/nodes=ubuntu2404-x64/

Example error

+ git --version
git version 2.43.0
+ git config --replace-all user.name Dummy
+ git config --replace-all user.email dummy@dummy.com
+ git config user.name
Dummy
+ git config user.email
dummy@dummy.com
+ echo

+ echo

+ git rebase --abort
fatal: No rebase in progress?
+ true
+ git checkout -f refs/remotes/origin/_jenkins_local_branch
HEAD is now at 8ff2fe61751 diagnostics_channel: grow native channel storage
+ git config user.name
Dummy
+ git config user.email
dummy@dummy.com
+ echo

+ echo

+ git status
HEAD detached at 8ff2fe61751
nothing to commit, working tree clean
+ git rev-parse HEAD
8ff2fe61751cd5c559f58cec3eed4115b590991d
+ git rev-parse fe3b3b8b728f1424ffff6a49c37d975438877005
fe3b3b8b728f1424ffff6a49c37d975438877005
+ '[' -z 8ff2fe61751cd5c559f58cec3eed4115b590991d ']'
+ echo 8ff2fe61751cd5c559f58cec3eed4115b590991d
+ grep -qE '^[0-9a-fA-F]+$'
++ git rev-parse HEAD
++ git rev-parse 8ff2fe61751cd5c559f58cec3eed4115b590991d
+ '[' 8ff2fe61751cd5c559f58cec3eed4115b590991d '!=' 8ff2fe61751cd5c559f58cec3eed4115b590991d ']'
+ '[' -n fe3b3b8b728f1424ffff6a49c37d975438877005 ']'
+ git rebase --committer-date-is-author-date fe3b3b8b728f1424ffff6a49c37d975438877005
Rebasing (1/47082)
Rebasing (2/47082)
Auto-merging Makefile
CONFLICT (add/add): Merge conflict in Makefile
error: could not apply 61890720c8a... add readme and initial code
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 61890720c8a... add readme and initial code
Build step 'Execute shell' marked build as failure

The first one of the consistent failures started at Jul 20, 2026, 11:28:09 AM
https://ci.nodejs.org/job/node-test-commit-linux/nodes=ubuntu2404-x64/71234/console

[trivikr]

When these issues happened in the past, the solutions were:

• running git rebase --abort in [2026-05-24] Tests on debian12-x64 have been failing with error "Merge conflict in Makefile" #4345 (comment)
• deleting the node repository on the machine in [2026-06-09] Tests on test-rackspace-ubuntu2404-x64-1 have been failing with error "Merge conflict in Makefile" #4362 (comment)

There was a PR in #4346 to fetch refs before test commit rebase to fix this.