224300 2021-04-07 12:38:19 -0700 commit-queue should perform git reset --hard between retry attempts 2021-04-07 14:01:22 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=222038 InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap jbedard ryanhaddad webkit-bug-importer oldest_to_newest 1748025 0 aakash_jain 2021-04-07 12:38:19 -0700 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. 1748026 1 425427 aakash_jain 2021-04-07 12:40:11 -0700 Created attachment 425427 [fast-cq] Patch 1748054 2 ews-feeder 2021-04-07 14:00:29 -0700 Committed r275624: <https://commits.webkit.org/r275624> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425427. 1748055 3 webkit-bug-importer 2021-04-07 14:01:22 -0700 <rdar://problem/76364346> 425427 2021-04-07 12:40:11 -0700 2021-04-07 14:00:29 -0700 [fast-cq] Patch bug-224300-20210407154010.patch text/plain 5089 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NTYyMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIxLTA0LTA3ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBjb21taXQtcXVldWUgc2hvdWxkIHBlcmZvcm0gZ2l0IHJlc2V0IC0taGFy ZCBiZXR3ZWVuIHJldHJ5IGF0dGVtcHRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjQzMDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIENJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHk6CisgICAgICAg IChHaXRSZXNldEhhcmQpOiBCdWlsZCBzdGVwIHRvIHBlcmZvcm0gZ2l0IHJlc2V0IC0taGFyZC4K KyAgICAgICAgKEdpdFJlc2V0SGFyZC5zdGFydCk6CisgICAgICAgIChQdXNoQ29tbWl0VG9XZWJL aXRSZXBvLmV2YWx1YXRlQ29tbWFuZCk6CisgICAgICAgICogQ0lTdXBwb3J0L2V3cy1idWlsZC9z dGVwc191bml0dGVzdC5weTogQWRkZWQgdW5pdC10ZXN0LgorCiAyMDIxLTA0LTA3ICBKb25hdGhh biBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBbYnVpbGQud2Via2l0Lm9y Z10gQ29tbWl0IHF1ZXVlIHNob3VsZCBwb3N0IHRoZSBpZGVudGlmaWVyCkluZGV4OiBUb29scy9D SVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NJU3VwcG9y dC9ld3MtYnVpbGQvc3RlcHMucHkJKHJldmlzaW9uIDI3NTYyMikKKysrIFRvb2xzL0NJU3VwcG9y dC9ld3MtYnVpbGQvc3RlcHMucHkJKHdvcmtpbmcgY29weSkKQEAgLTE2OSw2ICsxNjksMTggQEAg Y2xhc3MgQ2hlY2tPdXRTcGVjaWZpY1JldmlzaW9uKHNoZWxsLlNoZQogICAgICAgICByZXR1cm4g c2hlbGwuU2hlbGxDb21tYW5kLnN0YXJ0KHNlbGYpCiAKIAorY2xhc3MgR2l0UmVzZXRIYXJkKHNo ZWxsLlNoZWxsQ29tbWFuZCk6CisgICAgbmFtZSA9ICdnaXQtcmVzZXQtaGFyZCcKKyAgICBkZXNj cmlwdGlvbkRvbmUgPSBbJ1BlcmZvcm1lZCBnaXQgcmVzZXQgLS1oYXJkJ10KKworICAgIGRlZiBf X2luaXRfXyhzZWxmLCAqKmt3YXJncyk6CisgICAgICAgIHN1cGVyKEdpdFJlc2V0SGFyZCwgc2Vs ZikuX19pbml0X18obG9nRW52aXJvbj1GYWxzZSwgKiprd2FyZ3MpCisKKyAgICBkZWYgc3RhcnQo c2VsZik6CisgICAgICAgIHNlbGYuc2V0Q29tbWFuZChbJ2dpdCcsICdyZXNldCcsICdIRUFEfjEw JywgJy0taGFyZCddKQorICAgICAgICByZXR1cm4gc2hlbGwuU2hlbGxDb21tYW5kLnN0YXJ0KHNl bGYpCisKKwogY2xhc3MgRmV0Y2hCcmFuY2hlcyhzaGVsbC5TaGVsbENvbW1hbmQpOgogICAgIG5h bWUgPSAnZmV0Y2gtYnJhbmNoLXJlZmVyZW5jZXMnCiAgICAgZGVzY3JpcHRpb25Eb25lID0gWydV cGRhdGVkIGJyYW5jaCBpbmZvcm1hdGlvbiddCkBAIC0zMjcxLDcgKzMyODMsNyBAQCBjbGFzcyBQ dXNoQ29tbWl0VG9XZWJLaXRSZXBvKHNoZWxsLlNoZWxsCiAgICAgICAgICAgICByZXRyeV9jb3Vu dCA9IGludChzZWxmLmdldFByb3BlcnR5KCdyZXRyeV9jb3VudCcsIDApKQogICAgICAgICAgICAg aWYgcmV0cnlfY291bnQgPCBzZWxmLk1BWF9SRVRSWToKICAgICAgICAgICAgICAgICBzZWxmLnNl dFByb3BlcnR5KCdyZXRyeV9jb3VudCcsIHJldHJ5X2NvdW50ICsgMSkKLSAgICAgICAgICAgICAg ICBzZWxmLmJ1aWxkLmFkZFN0ZXBzQWZ0ZXJDdXJyZW50U3RlcChbQ2hlY2tPdXRTb3VyY2UoKSwg U2hvd0lkZW50aWZpZXIoKSwgVXBkYXRlV29ya2luZ0RpcmVjdG9yeSgpLCBBcHBseVBhdGNoKCks IENyZWF0ZUxvY2FsR0lUQ29tbWl0KCksIFB1c2hDb21taXRUb1dlYktpdFJlcG8oKV0pCisgICAg ICAgICAgICAgICAgc2VsZi5idWlsZC5hZGRTdGVwc0FmdGVyQ3VycmVudFN0ZXAoW0dpdFJlc2V0 SGFyZCgpLCBDaGVja091dFNvdXJjZSgpLCBTaG93SWRlbnRpZmllcigpLCBVcGRhdGVXb3JraW5n RGlyZWN0b3J5KCksIEFwcGx5UGF0Y2goKSwgQ3JlYXRlTG9jYWxHSVRDb21taXQoKSwgUHVzaENv bW1pdFRvV2ViS2l0UmVwbygpXSkKICAgICAgICAgICAgICAgICByZXR1cm4gcmMKIAogICAgICAg ICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnYnVnemlsbGFfY29tbWVudF90ZXh0Jywgc2VsZi5jb21t ZW50X3RleHRfZm9yX2J1ZygpKQpJbmRleDogVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVw c191bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0 ZXBzX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNzU2MjIpCisrKyBUb29scy9DSVN1cHBvcnQvZXdz LWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0Niw3IEBA IGZyb20gc3RlcHMgaW1wb3J0IChBbmFseXplQVBJVGVzdHNSZXN1bHQKICAgICAgICAgICAgICAg ICAgICBDbGVhbkJ1aWxkLCBDbGVhblVwR2l0SW5kZXhMb2NrLCBDbGVhbldvcmtpbmdEaXJlY3Rv cnksIENvbXBpbGVKU0MsIENvbXBpbGVKU0NXaXRob3V0UGF0Y2gsIENvbXBpbGVXZWJLaXQsCiAg ICAgICAgICAgICAgICAgICAgQ29tcGlsZVdlYktpdFdpdGhvdXRQYXRjaCwgQ29uZmlndXJlQnVp bGQsIENyZWF0ZUxvY2FsR0lUQ29tbWl0LAogICAgICAgICAgICAgICAgICAgIERvd25sb2FkQnVp bHRQcm9kdWN0LCBEb3dubG9hZEJ1aWx0UHJvZHVjdEZyb21NYXN0ZXIsIEVXU19CVUlMRF9IT1NU TkFNRSwgRXh0cmFjdEJ1aWx0UHJvZHVjdCwgRXh0cmFjdFRlc3RSZXN1bHRzLAotICAgICAgICAg ICAgICAgICAgIEZldGNoQnJhbmNoZXMsIEZpbmRNb2RpZmllZENoYW5nZUxvZ3MsIEZpbmRNb2Rp ZmllZExheW91dFRlc3RzLCBJbnN0YWxsR3RrRGVwZW5kZW5jaWVzLCBJbnN0YWxsV3BlRGVwZW5k ZW5jaWVzLAorICAgICAgICAgICAgICAgICAgIEZldGNoQnJhbmNoZXMsIEZpbmRNb2RpZmllZENo YW5nZUxvZ3MsIEZpbmRNb2RpZmllZExheW91dFRlc3RzLCBHaXRSZXNldEhhcmQsIEluc3RhbGxH dGtEZXBlbmRlbmNpZXMsIEluc3RhbGxXcGVEZXBlbmRlbmNpZXMsCiAgICAgICAgICAgICAgICAg ICAgS2lsbE9sZFByb2Nlc3NlcywgUHJpbnRDb25maWd1cmF0aW9uLCBQdXNoQ29tbWl0VG9XZWJL aXRSZXBvLCBSZVJ1bkFQSVRlc3RzLCBSZVJ1bkphdmFTY3JpcHRDb3JlVGVzdHMsIFJlUnVuV2Vi S2l0UGVybFRlc3RzLAogICAgICAgICAgICAgICAgICAgIFJlUnVuV2ViS2l0VGVzdHMsIFJ1bkFQ SVRlc3RzLCBSdW5BUElUZXN0c1dpdGhvdXRQYXRjaCwgUnVuQmluZGluZ3NUZXN0cywgUnVuQnVp bGRXZWJLaXRPcmdVbml0VGVzdHMsCiAgICAgICAgICAgICAgICAgICAgUnVuQnVpbGRib3RDaGVj a0NvbmZpZ0ZvckJ1aWxkV2ViS2l0LCBSdW5CdWlsZGJvdENoZWNrQ29uZmlnRm9yRVdTLCBSdW5F V1NVbml0VGVzdHMsIFJ1blJlc3VsdHNkYnB5VGVzdHMsCkBAIC04MzksNiArODM5LDQwIEBAIGNs YXNzIFRlc3RLaWxsT2xkUHJvY2Vzc2VzKEJ1aWxkU3RlcE1peGkKICAgICAgICAgcmV0dXJuIHNl bGYucnVuU3RlcCgpCiAKIAorY2xhc3MgVGVzdEdpdFJlc2V0SGFyZChCdWlsZFN0ZXBNaXhpbkFk ZGl0aW9ucywgdW5pdHRlc3QuVGVzdENhc2UpOgorICAgIGRlZiBzZXRVcChzZWxmKToKKyAgICAg ICAgc2VsZi5sb25nTWVzc2FnZSA9IFRydWUKKyAgICAgICAgcmV0dXJuIHNlbGYuc2V0VXBCdWls ZFN0ZXAoKQorCisgICAgZGVmIHRlYXJEb3duKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi50 ZWFyRG93bkJ1aWxkU3RlcCgpCisKKyAgICBkZWYgdGVzdF9zdWNjZXNzKHNlbGYpOgorICAgICAg ICBzZWxmLnNldHVwU3RlcChHaXRSZXNldEhhcmQoKSkKKyAgICAgICAgc2VsZi5leHBlY3RSZW1v dGVDb21tYW5kcygKKyAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywKKyAg ICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydnaXQnLCAncmVzZXQnLCAnSEVBRH4xMCcs ICctLWhhcmQnXSwKKyAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCisg ICAgICAgICAgICAgICAgICAgICAgICApCisgICAgICAgICAgICArIDAsCisgICAgICAgICkKKyAg ICAgICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1TVUNDRVNTLCBzdGF0ZV9zdHJpbmc9J1Bl cmZvcm1lZCBnaXQgcmVzZXQgLS1oYXJkJykKKyAgICAgICAgcmV0dXJuIHNlbGYucnVuU3RlcCgp CisKKyAgICBkZWYgdGVzdF9mYWlsdXJlKHNlbGYpOgorICAgICAgICBzZWxmLnNldHVwU3RlcChH aXRSZXNldEhhcmQoKSkKKyAgICAgICAgc2VsZi5leHBlY3RSZW1vdGVDb21tYW5kcygKKyAgICAg ICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywKKyAgICAgICAgICAgICAgICAgICAg ICAgIGNvbW1hbmQ9WydnaXQnLCAncmVzZXQnLCAnSEVBRH4xMCcsICctLWhhcmQnXSwKKyAgICAg ICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCisgICAgICAgICAgICAgICAgICAg ICAgICApCisgICAgICAgICAgICArIEV4cGVjdFNoZWxsLmxvZygnc3RkaW8nLCBzdGRvdXQ9J1Vu ZXhwZWN0ZWQgZXJyb3IuJykKKyAgICAgICAgICAgICsgMiwKKyAgICAgICAgKQorICAgICAgICBz ZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PUZBSUxVUkUsIHN0YXRlX3N0cmluZz0nUGVyZm9ybWVk IGdpdCByZXNldCAtLWhhcmQgKGZhaWx1cmUpJykKKyAgICAgICAgcmV0dXJuIHNlbGYucnVuU3Rl cCgpCisKKwogY2xhc3MgVGVzdENsZWFuQnVpbGQoQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVu aXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgc2V0VXAoc2VsZik6CiAgICAgICAgIHNlbGYubG9u Z01lc3NhZ2UgPSBUcnVlCg==