209334 2020-03-20 06:05:52 -0700 [ews] commit-queue should comment on bug if patch fails to apply 2020-03-20 07:32:14 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap jbedard webkit-bug-importer oldest_to_newest 1632059 0 aakash_jain 2020-03-20 06:05:52 -0700 commit-queue should comment on bug and set cq- if patch fails to apply. 1632067 1 394080 aakash_jain 2020-03-20 06:34:57 -0700 Created attachment 394080 Patch 1632068 2 aakash_jain 2020-03-20 06:36:20 -0700 Sample runs: Commit-queue: https://ews-build.webkit-uat.org/#/builders/26/builds/1611 Other queue: https://ews-build.webkit-uat.org/#/builders/14/builds/934 1632071 3 394080 jbedard 2020-03-20 07:24:40 -0700 Comment on attachment 394080 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394080&action=review > Tools/BuildSlaveSupport/ews-build/steps.py:230 > + message = 'Patch {} does not apply'.format(patch_id) Shouldn't we define the message only if the return-code is a failure? 1632073 4 aakash_jain 2020-03-20 07:31:39 -0700 Committed r258760: <https://trac.webkit.org/changeset/258760> 1632074 5 aakash_jain 2020-03-20 07:31:59 -0700 > Shouldn't we define the message only if the return-code is a failure? Done 1632075 6 webkit-bug-importer 2020-03-20 07:32:14 -0700 <rdar://problem/60684345> 394080 2020-03-20 06:34:57 -0700 2020-03-20 07:24:40 -0700 Patch bug-209334-20200320093456.patch text/plain 5842 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1ODc1OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDIwLTAzLTIwICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBjb21taXQtcXVldWUgc2hvdWxkIGNvbW1lbnQgb24gYnVnIGlm IHBhdGNoIGZhaWxzIHRvIGFwcGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMDkzMzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weToKKyAg ICAgICAgKEFwcGx5UGF0Y2gpOgorICAgICAgICAoQXBwbHlQYXRjaC5ldmFsdWF0ZUNvbW1hbmQp OiBPdmVycmlkZGVuIHRvIGNoZWNrIGJ1aWxkIHN0YXR1cyBhbmQgcXVldWUgbmFtZSBhbmQgY29t bWVudCBvbiBidWcgYWNjb3JkaW5nbHkuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdz LWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5OiBBZGRlZCB1bml0LXRlc3RzLgorICAgICAgICAoVGVz dEFwcGx5UGF0Y2gpOgorICAgICAgICAoVGVzdEFwcGx5UGF0Y2guc2V0VXApOgorICAgICAgICAo VGVzdEFwcGx5UGF0Y2guc2V0VXAubW9ja19zdGFydCk6CisgICAgICAgIChUZXN0QXBwbHlQYXRj aC50ZWFyRG93bik6CisgICAgICAgIChUZXN0QXBwbHlQYXRjaC50ZXN0X3N1Y2Nlc3MpOgorICAg ICAgICAoVGVzdEFwcGx5UGF0Y2gudGVzdF9mYWlsdXJlKToKKyAgICAgICAgKFRlc3RBcHBseVBh dGNoLnRlc3RfZmFpbHVyZV9vbl9jb21taXRfcXVldWUpOgorCiAyMDIwLTAzLTIwICBBYWthc2gg SmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbRVdTXSBMaW1pdCBudW1i ZXIgb2YgYnVpbGRzIHRvIGRpc3BsYXkgaW4gc3RhdHVzLWJ1YmJsZSBob3ZlciBvdmVyIG1lc3Nh Z2UgaW4gY2FzZSBvZiBsb3Qgb2YgcmV0cmllZCBidWlsZHMKSW5kZXg6IFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNs YXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJKHJldmlzaW9uIDI1ODc1OSkKKysrIFRvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAt MTkyLDggKzE5Miw3IEBAIGNsYXNzIEFwcGx5UGF0Y2goc2hlbGwuU2hlbGxDb21tYW5kLCBDb20K ICAgICBuYW1lID0gJ2FwcGx5LXBhdGNoJwogICAgIGRlc2NyaXB0aW9uID0gWydhcHBseWluZy1w YXRjaCddCiAgICAgZGVzY3JpcHRpb25Eb25lID0gWydBcHBsaWVkIHBhdGNoJ10KLSAgICBmbHVu a09uRmFpbHVyZSA9IFRydWUKLSAgICBoYWx0T25GYWlsdXJlID0gVHJ1ZQorICAgIGhhbHRPbkZh aWx1cmUgPSBGYWxzZQogICAgIGNvbW1hbmQgPSBbJ3BlcmwnLCAnVG9vbHMvU2NyaXB0cy9zdm4t YXBwbHknLCAnLS1mb3JjZScsICcuYnVpbGRib3QtZGlmZiddCiAKICAgICBkZWYgX19pbml0X18o c2VsZiwgKiprd2FyZ3MpOgpAQCAtMjI1LDYgKzIyNCwxOSBAQCBjbGFzcyBBcHBseVBhdGNoKHNo ZWxsLlNoZWxsQ29tbWFuZCwgQ29tCiAgICAgICAgICAgICByZXR1cm4ge3Unc3RlcCc6IHUnUGF0 Y2ggZG9lcyBub3QgYXBwbHknfQogICAgICAgICByZXR1cm4gc3VwZXIoQXBwbHlQYXRjaCwgc2Vs ZikuZ2V0UmVzdWx0U3VtbWFyeSgpCiAKKyAgICBkZWYgZXZhbHVhdGVDb21tYW5kKHNlbGYsIGNt ZCk6CisgICAgICAgIHJjID0gc2hlbGwuU2hlbGxDb21tYW5kLmV2YWx1YXRlQ29tbWFuZChzZWxm LCBjbWQpCisgICAgICAgIHBhdGNoX2lkID0gc2VsZi5nZXRQcm9wZXJ0eSgncGF0Y2hfaWQnLCAn JykKKyAgICAgICAgbWVzc2FnZSA9ICdQYXRjaCB7fSBkb2VzIG5vdCBhcHBseScuZm9ybWF0KHBh dGNoX2lkKQorICAgICAgICBpZiByYyA9PSBGQUlMVVJFOgorICAgICAgICAgICAgaWYgc2VsZi5n ZXRQcm9wZXJ0eSgnYnVpbGRlcm5hbWUnLCAnJykubG93ZXIoKSA9PSAnY29tbWl0LXF1ZXVlJzoK KyAgICAgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdidWd6aWxsYV9jb21tZW50X3RleHQn LCBtZXNzYWdlLnJlcGxhY2UoJ1BhdGNoJywgJ0F0dGFjaG1lbnQnKSkKKyAgICAgICAgICAgICAg ICBzZWxmLnNldFByb3BlcnR5KCdidWlsZF9maW5pc2hfc3VtbWFyeScsIG1lc3NhZ2UpCisgICAg ICAgICAgICAgICAgc2VsZi5idWlsZC5hZGRTdGVwc0FmdGVyQ3VycmVudFN0ZXAoW0NvbW1lbnRP bkJ1ZygpLCBTZXRDb21taXRRdWV1ZU1pbnVzRmxhZ09uUGF0Y2goKV0pCisgICAgICAgICAgICBl bHNlOgorICAgICAgICAgICAgICAgIHNlbGYuYnVpbGQuYnVpbGRGaW5pc2hlZChbbWVzc2FnZV0s IEZBSUxVUkUpCisgICAgICAgIHJldHVybiByYworCiAKIGNsYXNzIENoZWNrUGF0Y2hSZWxldmFu Y2UoYnVpbGRzdGVwLkJ1aWxkU3RlcCk6CiAgICAgbmFtZSA9ICdjaGVjay1wYXRjaC1yZWxldmFu Y2UnCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRl c3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0 ZXBzX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNTg3NTkpCisrKyBUb29scy9CdWlsZFNsYXZlU3Vw cG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTIwMzIs NiArMjAzMiw3MSBAQCBjbGFzcyBUZXN0VXBkYXRlV29ya2luZ0RpcmVjdG9yeShCdWlsZFN0CiAg ICAgICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQogCiAKK2NsYXNzIFRlc3RBcHBseVBhdGNoKEJ1 aWxkU3RlcE1peGluQWRkaXRpb25zLCB1bml0dGVzdC5UZXN0Q2FzZSk6CisgICAgZGVmIHNldFVw KHNlbGYpOgorICAgICAgICBzZWxmLmxvbmdNZXNzYWdlID0gVHJ1ZQorCisgICAgICAgIGRlZiBt b2NrX3N0YXJ0KGNscywgKmFyZ3MsICoqa3dhcmdzKToKKyAgICAgICAgICAgIGZyb20gYnVpbGRi b3Quc3RlcHMgaW1wb3J0IHNoZWxsCisgICAgICAgICAgICByZXR1cm4gc2hlbGwuU2hlbGxDb21t YW5kLnN0YXJ0KGNscykKKyAgICAgICAgQXBwbHlQYXRjaC5zdGFydCA9IG1vY2tfc3RhcnQKKyAg ICAgICAgcmV0dXJuIHNlbGYuc2V0VXBCdWlsZFN0ZXAoKQorCisgICAgZGVmIHRlYXJEb3duKHNl bGYpOgorICAgICAgICByZXR1cm4gc2VsZi50ZWFyRG93bkJ1aWxkU3RlcCgpCisKKyAgICBkZWYg dGVzdF9zdWNjZXNzKHNlbGYpOgorICAgICAgICBzZWxmLnNldHVwU3RlcChBcHBseVBhdGNoKCkp CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoQXBwbHlQYXRjaC5mbHVua09uRmFpbHVyZSwgVHJ1 ZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChBcHBseVBhdGNoLmhhbHRPbkZhaWx1cmUsIEZh bHNlKQorICAgICAgICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAorICAgICAgICAgICAgRXhw ZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAorICAgICAgICAgICAgICAgICAgICAgICAgdGltZW91 dD02MDAsCisgICAgICAgICAgICAgICAgICAgICAgICBsb2dFbnZpcm9uPUZhbHNlLAorICAgICAg ICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3BlcmwnLCAnVG9vbHMvU2NyaXB0cy9zdm4tYXBw bHknLCAnLS1mb3JjZScsICcuYnVpbGRib3QtZGlmZiddLAorICAgICAgICAgICAgICAgICAgICAg ICAgKSArCisgICAgICAgICAgICAwLAorICAgICAgICApCisgICAgICAgIHNlbGYuZXhwZWN0T3V0 Y29tZShyZXN1bHQ9U1VDQ0VTUywgc3RhdGVfc3RyaW5nPSdBcHBsaWVkIHBhdGNoJykKKyAgICAg ICAgcmV0dXJuIHNlbGYucnVuU3RlcCgpCisKKyAgICBkZWYgdGVzdF9mYWlsdXJlKHNlbGYpOgor ICAgICAgICBzZWxmLnNldHVwU3RlcChBcHBseVBhdGNoKCkpCisgICAgICAgIHNlbGYuZXhwZWN0 UmVtb3RlQ29tbWFuZHMoCisgICAgICAgICAgICBFeHBlY3RTaGVsbCh3b3JrZGlyPSd3a2Rpcics CisgICAgICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PTYwMCwKKyAgICAgICAgICAgICAgICAg ICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCisgICAgICAgICAgICAgICAgICAgICAgICBjb21tYW5k PVsncGVybCcsICdUb29scy9TY3JpcHRzL3N2bi1hcHBseScsICctLWZvcmNlJywgJy5idWlsZGJv dC1kaWZmJ10sCisgICAgICAgICAgICAgICAgICAgICAgICApICsKKyAgICAgICAgICAgIEV4cGVj dFNoZWxsLmxvZygnc3RkaW8nLCBzdGRvdXQ9J1VuZXhwZWN0ZWQgZmFpbHVyZS4nKSArCisgICAg ICAgICAgICAyLAorICAgICAgICApCisgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9 RkFJTFVSRSwgc3RhdGVfc3RyaW5nPSdQYXRjaCBkb2VzIG5vdCBhcHBseScpCisgICAgICAgIHJj ID0gc2VsZi5ydW5TdGVwKCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLmdldFByb3Bl cnR5KCdidWd6aWxsYV9jb21tZW50X3RleHQnKSwgTm9uZSkKKyAgICAgICAgc2VsZi5hc3NlcnRF cXVhbChzZWxmLmdldFByb3BlcnR5KCdidWlsZF9maW5pc2hfc3VtbWFyeScpLCBOb25lKQorICAg ICAgICByZXR1cm4gcmMKKworICAgIGRlZiB0ZXN0X2ZhaWx1cmVfb25fY29tbWl0X3F1ZXVlKHNl bGYpOgorICAgICAgICBzZWxmLnNldHVwU3RlcChBcHBseVBhdGNoKCkpCisgICAgICAgIHNlbGYu c2V0UHJvcGVydHkoJ2J1aWxkZXJuYW1lJywgJ0NvbW1pdC1RdWV1ZScpCisgICAgICAgIHNlbGYu c2V0UHJvcGVydHkoJ3BhdGNoX2lkJywgJzEyMzQnKQorICAgICAgICBzZWxmLmV4cGVjdFJlbW90 ZUNvbW1hbmRzKAorICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAorICAg ICAgICAgICAgICAgICAgICAgICAgdGltZW91dD02MDAsCisgICAgICAgICAgICAgICAgICAgICAg ICBsb2dFbnZpcm9uPUZhbHNlLAorICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3Bl cmwnLCAnVG9vbHMvU2NyaXB0cy9zdm4tYXBwbHknLCAnLS1mb3JjZScsICcuYnVpbGRib3QtZGlm ZiddLAorICAgICAgICAgICAgICAgICAgICAgICAgKSArCisgICAgICAgICAgICBFeHBlY3RTaGVs bC5sb2coJ3N0ZGlvJywgc3Rkb3V0PSdVbmV4cGVjdGVkIGZhaWx1cmUuJykgKworICAgICAgICAg ICAgMiwKKyAgICAgICAgKQorICAgICAgICBzZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PUZBSUxV UkUsIHN0YXRlX3N0cmluZz0nUGF0Y2ggZG9lcyBub3QgYXBwbHknKQorICAgICAgICByYyA9IHNl bGYucnVuU3RlcCgpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5nZXRQcm9wZXJ0eSgn YnVnemlsbGFfY29tbWVudF90ZXh0JyksICdBdHRhY2htZW50IDEyMzQgZG9lcyBub3QgYXBwbHkn KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYuZ2V0UHJvcGVydHkoJ2J1aWxkX2Zpbmlz aF9zdW1tYXJ5JyksICdQYXRjaCAxMjM0IGRvZXMgbm90IGFwcGx5JykKKyAgICAgICAgcmV0dXJu IHJjCisKKwogY2xhc3MgVGVzdFVuQXBwbHlQYXRjaElmUmVxdWlyZWQoQnVpbGRTdGVwTWl4aW5B ZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgc2V0VXAoc2VsZik6CiAgICAg ICAgIHNlbGYubG9uZ01lc3NhZ2UgPSBUcnVlCg==