Repository navigation
node-test-commit-linux on 'ubuntu2404-x64' is failing since 2026-07-20 #4401
Description
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 failureThe 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
Activity
[-]node-test-commit-linux on 'ubuntu2404-x64' is failing since 2026-07-20 with "Merge conflict in Makefile"[/-][+]node-test-commit-linux on 'ubuntu2404-x64' is failing since 2026-07-20[/+]trivikr commentedon Jul 20, 2026
When these issues happened in the past, the solutions were:
git rebase --abortin [2026-05-24] Tests ondebian12-x64have been failing with error "Merge conflict in Makefile" #4345 (comment)test-rackspace-ubuntu2404-x64-1have 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.
trivikr commentedon Jul 27, 2026
This continues to be a problem as >60% builds keep failing, as of 2026-07-25
https://ci.nodejs.org/job/node-test-commit-linux/nodes=ubuntu2404-x64/
sxa commentedon Jul 27, 2026
All of these are running on https://ci.nodejs.org/computer/test-rackspace-ubuntu2404-x64-1/ so there is no difference in the machines being used. Some v27 ones are passing while others are failing.
The latest example from https://ci.nodejs.org/job/node-test-commit-linux/nodes=ubuntu2404-x64/71455/console is occuring when running
git rebase --committer-date-is-author-date 58795e9733c33f7155ed11804658d1c3f0479e63which is resulting in a lot of conficts. That one was from PR 63963.The errors are not always consistent although the previous one at https://ci.nodejs.org/job/node-test-commit-linux/nodes=ubuntu2404-x64/71454/console from PR 64777 looks to have been a similar set of files.
The previous one at https://ci.nodejs.org/job/node-test-commit-linux/nodes=ubuntu2404-x64/71453/console from PR63851
The run prior to that at https://ci.nodejs.org/job/node-test-commit-linux/nodes=ubuntu2404-x64/71452/console from PR64700 also failed with a conflict on the Makefile.
I'm going to take the machine offline for now so I can take a bit more of a look at it.
sxa commentedon Jul 27, 2026
Similar to the analysis in #4402 (comment) the same occurs with the workspace on the rackspace machine from running:
Full list of conflicts showing from the above rebase
I've backed up the
nodeworkspace asnode-broken-build4401.tar.xzand removed the node workspace so it will be regenerated.sxa commentedon Jul 28, 2026
All builds on the rackspace machine in the last day (or at least the first page of runs) look ok. Closing.