Bug 224300 - commit-queue should perform git reset --hard between retry attempts
Summary: commit-queue should perform git reset --hard between retry attempts
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Aakash Jain
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2021-04-07 12:38 PDT by Aakash Jain
Modified: 2021-04-07 14:01 PDT (History)
5 users (show)

See Also:

Attachments
[fast-cq] Patch (4.97 KB, patch)
2021-04-07 12:40 PDT, Aakash Jain 		no flags Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Aakash Jain 2021-04-07 12:38:19 PDT 
We added rety in commit-queue in https://bugs.webkit.org/show_bug.cgi?id=222038. However, in many cases, that also doesn't help. Another idea is to perform: 'git reset --hard' between retry attempts.' We can reset to few commits earlier, and in next build-step buildbot will update to latest revision. This is to reset the state in case the repo is in some weird/unexpected state.
Comment 1 Aakash Jain 2021-04-07 12:40:11 PDT 
Created attachment 425427 [details]
[fast-cq] Patch
Comment 2 EWS 2021-04-07 14:00:29 PDT 
Committed r275624: <https://commits.webkit.org/r275624>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 425427 [details].
Comment 3 Radar WebKit Bug Importer 2021-04-07 14:01:22 PDT 
<rdar://problem/76364346>