208539 2020-03-03 14:44:06 -0800 [ews] Add build step to create local git commit for commit-queue 2020-03-04 11:40:43 -0800 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=208589 InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap jbedard webkit-bug-importer oldest_to_newest 1625264 0 aakash_jain 2020-03-03 14:44:06 -0800 Add build step to create local git commit for commit-queue (in new EWS). 1625265 1 392337 aakash_jain 2020-03-03 14:46:58 -0800 Created attachment 392337 Patch 1625266 2 aakash_jain 2020-03-03 14:47:59 -0800 Sample run: https://ews-build.webkit-uat.org/#/builders/26/builds/1059 1625277 3 392337 jbedard 2020-03-03 15:17:31 -0800 Comment on attachment 392337 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=392337&action=review > Tools/BuildSlaveSupport/ews-build/steps.py:2474 > + commit_message_filename = '/tmp/{}.txt'.format(self.getProperty('patch_id')) Any reason we can't store the commit_message in a purporter and then use 'git commit --all --file -' and pip the commit message over stdin? Seems cleaner than sending it into a file. 1625518 4 392415 aakash_jain 2020-03-04 08:02:30 -0800 Created attachment 392415 Patch 1625519 5 aakash_jain 2020-03-04 08:03:28 -0800 (In reply to Jonathan Bedard from comment #3) > Any reason we can't store the commit_message in a purporter and then use 'git commit --all --file -' and pipe the commit message over stdin? Done in updated patch. 1625544 6 392415 jbedard 2020-03-04 09:10:00 -0800 Comment on attachment 392415 Patch Much cleaner all in the same step! 1625558 7 aakash_jain 2020-03-04 09:40:24 -0800 Committed r257848: <https://trac.webkit.org/changeset/257848> 1625559 8 webkit-bug-importer 2020-03-04 09:41:17 -0800 <rdar://problem/60043246> 392337 2020-03-03 14:46:58 -0800 2020-03-04 08:02:27 -0800 Patch bug-208539-20200303174657.patch text/plain 6220 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NzgwMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDIwLTAzLTAzICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBBZGQgYnVpbGQgc3RlcCB0byBjcmVhdGUgbG9jYWwgZ2l0IGNv bW1pdCBmb3IgY29tbWl0LXF1ZXVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMDg1MzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weToKKyAg ICAgICAgKENyZWF0ZUxvY2FsR0lUQ29tbWl0KTogQnVpbGQgc3RlcCB0byBjcmVhdGUgbG9jYWwg Z2l0IGNvbW1pdAorICAgICAgICAoQ3JlYXRlTG9jYWxHSVRDb21taXQuc3RhcnQpOgorICAgICAg ICAoQ3JlYXRlTG9jYWxHSVRDb21taXQuZ2V0UmVzdWx0U3VtbWFyeSk6IFNldCBjdXN0b20gZmFp bHVyZSBtZXNzYWdlLgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVw c191bml0dGVzdC5weTogQWRkZWQgdW5pdC10ZXN0cy4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3Vw cG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5OgorCiAyMDIwLTAzLTAzICBBYWthc2ggSmFpbiAg PGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBjb21taXQtcXVldWUgc2hvdWxkIHVw ZGF0ZSB3b3JraW5nIGRpcmVjdG9yeSBhbmQgcmVhcHBseSBwYXRjaCBqdXN0IGJlZm9yZSBjb21t aXRpbmcKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rv cmllcy5weQkocmV2aXNpb24gMjU3ODAzKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdz LWJ1aWxkL2ZhY3Rvcmllcy5weQkod29ya2luZyBjb3B5KQpAQCAtMjUsNyArMjUsNyBAQCBmcm9t IGJ1aWxkYm90LnByb2Nlc3MgaW1wb3J0IGZhY3RvcnkKIGZyb20gYnVpbGRib3Quc3RlcHMgaW1w b3J0IHRyaWdnZXIKIAogZnJvbSBzdGVwcyBpbXBvcnQgKEFwcGx5UGF0Y2gsIEFwcGx5V2F0Y2hM aXN0LCBDaGVja091dFNvdXJjZSwgQ2hlY2tPdXRTcGVjaWZpY1JldmlzaW9uLCBDaGVja1BhdGNo UmVsZXZhbmNlLAotICAgICAgICAgICAgICAgICAgIENoZWNrU3R5bGUsIENvbXBpbGVKU0MsIENv bXBpbGVXZWJLaXQsIENvbmZpZ3VyZUJ1aWxkLAorICAgICAgICAgICAgICAgICAgIENoZWNrU3R5 bGUsIENvbXBpbGVKU0MsIENvbXBpbGVXZWJLaXQsIENvbmZpZ3VyZUJ1aWxkLCBDcmVhdGVMb2Nh bEdJVENvbW1pdCwKICAgICAgICAgICAgICAgICAgICBEb3dubG9hZEJ1aWx0UHJvZHVjdCwgRXh0 cmFjdEJ1aWx0UHJvZHVjdCwgRmluZE1vZGlmaWVkQ2hhbmdlTG9ncywgSW5zdGFsbEd0a0RlcGVu ZGVuY2llcywKICAgICAgICAgICAgICAgICAgICBJbnN0YWxsV3BlRGVwZW5kZW5jaWVzLCBLaWxs T2xkUHJvY2Vzc2VzLCBQcmludENvbmZpZ3VyYXRpb24sIFJ1bkFQSVRlc3RzLCBSdW5CaW5kaW5n c1Rlc3RzLAogICAgICAgICAgICAgICAgICAgIFJ1bkJ1aWxkV2ViS2l0T3JnVW5pdFRlc3RzLCBS dW5FV1NCdWlsZGJvdENoZWNrQ29uZmlnLCBSdW5FV1NVbml0VGVzdHMsIFJ1blJlc3VsdHNkYnB5 VGVzdHMsCkBAIC0yMjYsMyArMjI2LDQgQEAgY2xhc3MgQ29tbWl0UXVldWVGYWN0b3J5KEZhY3Rv cnkpOgogICAgICAgICBzZWxmLmFkZFN0ZXAoVXBkYXRlV29ya2luZ0RpcmVjdG9yeSgpKQogICAg ICAgICBzZWxmLmFkZFN0ZXAoQXBwbHlQYXRjaCgpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoRmlu ZE1vZGlmaWVkQ2hhbmdlTG9ncygpKQorICAgICAgICBzZWxmLmFkZFN0ZXAoQ3JlYXRlTG9jYWxH SVRDb21taXQoKSkKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVw cy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3Rl cHMucHkJKHJldmlzaW9uIDI1NzgwMykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1i dWlsZC9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAtMjQ1OSwzICsyNDU5LDIzIEBAIGNsYXNz IEZpbmRNb2RpZmllZENoYW5nZUxvZ3Moc2hlbGwuU2hlbGwKICAgICAgICAgICAgIGlmIHNlbGYu aXNfcGF0aF90b19jaGFuZ2Vsb2coZmlsZW5hbWUpOgogICAgICAgICAgICAgICAgIGZpbGVuYW1l cy5hcHBlbmQoZmlsZW5hbWUpCiAgICAgICAgIHJldHVybiBmaWxlbmFtZXMKKworCitjbGFzcyBD cmVhdGVMb2NhbEdJVENvbW1pdChzaGVsbC5TaGVsbENvbW1hbmQpOgorICAgIG5hbWUgPSAnY3Jl YXRlLWdpdC1jb21taXQnCisgICAgZGVzY3JpcHRpb25Eb25lID0gWydDcmVhdGVkIGxvY2FsIGdp dCBjb21taXQnXQorICAgIGNvbW1hbmQgPSBbJ2dpdCcsICdjb21taXQnLCAnLS1hbGwnLCAnLUYn XQorICAgIGhhbHRPbkZhaWx1cmUgPSBUcnVlCisKKyAgICBkZWYgX19pbml0X18oc2VsZiwgKipr d2FyZ3MpOgorICAgICAgICBzaGVsbC5TaGVsbENvbW1hbmQuX19pbml0X18oc2VsZiwgdGltZW91 dD01ICogNjAsIGxvZ0Vudmlyb249RmFsc2UsICoqa3dhcmdzKQorCisgICAgZGVmIHN0YXJ0KHNl bGYpOgorICAgICAgICBjb21taXRfbWVzc2FnZV9maWxlbmFtZSA9ICcvdG1wL3t9LnR4dCcuZm9y bWF0KHNlbGYuZ2V0UHJvcGVydHkoJ3BhdGNoX2lkJykpCisgICAgICAgIHNlbGYuY29tbWFuZC5h cHBlbmQoY29tbWl0X21lc3NhZ2VfZmlsZW5hbWUpCisgICAgICAgIHJldHVybiBzaGVsbC5TaGVs bENvbW1hbmQuc3RhcnQoc2VsZikKKworICAgIGRlZiBnZXRSZXN1bHRTdW1tYXJ5KHNlbGYpOgor ICAgICAgICBpZiBzZWxmLnJlc3VsdHMgIT0gU1VDQ0VTUzoKKyAgICAgICAgICAgIHJldHVybiB7 dSdzdGVwJzogdSdGYWlsZWQgdG8gY3JlYXRlIGdpdCBjb21taXQnfQorICAgICAgICByZXR1cm4g c2hlbGwuU2hlbGxDb21tYW5kLmdldFJlc3VsdFN1bW1hcnkoc2VsZikKSW5kZXg6IFRvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkJKHJl dmlzaW9uIDI1NzgwMykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVw c191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMzYsNyArMzYsNyBAQCBmcm9tIHR3aXN0 ZWQudHJpYWwgaW1wb3J0IHVuaXR0ZXN0CiAKIGZyb20gc3RlcHMgaW1wb3J0IChBbmFseXplQVBJ VGVzdHNSZXN1bHRzLCBBbmFseXplQ29tcGlsZVdlYktpdFJlc3VsdHMsIEFuYWx5emVKU0NUZXN0 c1Jlc3VsdHMsIEFuYWx5emVMYXlvdXRUZXN0c1Jlc3VsdHMsIEFwcGx5UGF0Y2gsIEFwcGx5V2F0 Y2hMaXN0LCBBcmNoaXZlQnVpbHRQcm9kdWN0LCBBcmNoaXZlVGVzdFJlc3VsdHMsCiAgICAgICAg ICAgICAgICAgICAgQ2hlY2tPdXRTb3VyY2UsIENoZWNrT3V0U3BlY2lmaWNSZXZpc2lvbiwgQ2hl Y2tQYXRjaFJlbGV2YW5jZSwgQ2hlY2tTdHlsZSwgQ2xlYW5CdWlsZCwgQ2xlYW5VcEdpdEluZGV4 TG9jaywgQ2xlYW5Xb3JraW5nRGlyZWN0b3J5LAotICAgICAgICAgICAgICAgICAgIENvbXBpbGVK U0MsIENvbXBpbGVKU0NUb1QsIENvbXBpbGVXZWJLaXQsIENvbXBpbGVXZWJLaXRUb1QsIENvbmZp Z3VyZUJ1aWxkLAorICAgICAgICAgICAgICAgICAgIENvbXBpbGVKU0MsIENvbXBpbGVKU0NUb1Qs IENvbXBpbGVXZWJLaXQsIENvbXBpbGVXZWJLaXRUb1QsIENvbmZpZ3VyZUJ1aWxkLCBDcmVhdGVM b2NhbEdJVENvbW1pdCwKICAgICAgICAgICAgICAgICAgICBEb3dubG9hZEJ1aWx0UHJvZHVjdCwg RG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVyLCBFeHRyYWN0QnVpbHRQcm9kdWN0LCBFeHRy YWN0VGVzdFJlc3VsdHMsIEZpbmRNb2RpZmllZENoYW5nZUxvZ3MsIEluc3RhbGxHdGtEZXBlbmRl bmNpZXMsIEluc3RhbGxXcGVEZXBlbmRlbmNpZXMsIEtpbGxPbGRQcm9jZXNzZXMsCiAgICAgICAg ICAgICAgICAgICAgUHJpbnRDb25maWd1cmF0aW9uLCBSZVJ1bkFQSVRlc3RzLCBSZVJ1bkphdmFT Y3JpcHRDb3JlVGVzdHMsIFJlUnVuV2ViS2l0UGVybFRlc3RzLCBSZVJ1bldlYktpdFRlc3RzLCBS dW5BUElUZXN0cywgUnVuQVBJVGVzdHNXaXRob3V0UGF0Y2gsCiAgICAgICAgICAgICAgICAgICAg UnVuQmluZGluZ3NUZXN0cywgUnVuQnVpbGRXZWJLaXRPcmdVbml0VGVzdHMsIFJ1bkVXU0J1aWxk Ym90Q2hlY2tDb25maWcsIFJ1bkVXU1VuaXRUZXN0cywgUnVuUmVzdWx0c2RicHlUZXN0cywgUnVu SmF2YVNjcmlwdENvcmVUZXN0cywgUnVuSlNDVGVzdHNXaXRob3V0UGF0Y2gsIFJ1bldlYktpdDFU ZXN0cywKQEAgLTMwNzMsNSArMzA3Myw0MSBAQCBNCVRvb2xzL1NjcmlwdHMvcnVuLWFwaS10ZXN0 cycnJykgKwogICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKIAogCitjbGFzcyBUZXN0Q3Jl YXRlTG9jYWxHSVRDb21taXQoQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RD YXNlKToKKyAgICBkZWYgc2V0VXAoc2VsZik6CisgICAgICAgIHNlbGYubG9uZ01lc3NhZ2UgPSBU cnVlCisgICAgICAgIHJldHVybiBzZWxmLnNldFVwQnVpbGRTdGVwKCkKKworICAgIGRlZiB0ZWFy RG93bihzZWxmKToKKyAgICAgICAgcmV0dXJuIHNlbGYudGVhckRvd25CdWlsZFN0ZXAoKQorCisg ICAgZGVmIHRlc3Rfc3VjY2VzcyhzZWxmKToKKyAgICAgICAgc2VsZi5zZXR1cFN0ZXAoQ3JlYXRl TG9jYWxHSVRDb21taXQoKSkKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgncGF0Y2hfaWQnLCAn MTIzNCcpCisgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCisgICAgICAgICAgICBF eHBlY3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCisgICAgICAgICAgICAgICAgICAgICAgICB0aW1l b3V0PTMwMCwKKyAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCisgICAg ICAgICAgICAgICAgICAgICAgICBjb21tYW5kPVsnZ2l0JywgJ2NvbW1pdCcsICctLWFsbCcsICct RicsICcvdG1wLzEyMzQudHh0J10pICsKKyAgICAgICAgICAgIDAsCisgICAgICAgICkKKyAgICAg ICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1TVUNDRVNTLCBzdGF0ZV9zdHJpbmc9J0NyZWF0 ZWQgbG9jYWwgZ2l0IGNvbW1pdCcpCisgICAgICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQorCisg ICAgZGVmIHRlc3RfZmFpbHVyZShzZWxmKToKKyAgICAgICAgc2VsZi5zZXR1cFN0ZXAoQ3JlYXRl TG9jYWxHSVRDb21taXQoKSkKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgncGF0Y2hfaWQnLCAn MTIzNCcpCisgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCisgICAgICAgICAgICBF eHBlY3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCisgICAgICAgICAgICAgICAgICAgICAgICB0aW1l b3V0PTMwMCwKKyAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCisgICAg ICAgICAgICAgICAgICAgICAgICBjb21tYW5kPVsnZ2l0JywgJ2NvbW1pdCcsICctLWFsbCcsICct RicsICcvdG1wLzEyMzQudHh0J10pICsKKyAgICAgICAgICAgIEV4cGVjdFNoZWxsLmxvZygnc3Rk aW8nLCBzdGRvdXQ9J1VuZXhwZWN0ZWQgZmFpbHVyZScpICsKKyAgICAgICAgICAgIDIsCisgICAg ICAgICkKKyAgICAgICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1GQUlMVVJFLCBzdGF0ZV9z dHJpbmc9J0ZhaWxlZCB0byBjcmVhdGUgZ2l0IGNvbW1pdCcpCisgICAgICAgIHJldHVybiBzZWxm LnJ1blN0ZXAoKQorCisKIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6CiAgICAgdW5pdHRlc3Qu bWFpbigpCg== 392415 2020-03-04 08:02:30 -0800 2020-03-04 09:10:00 -0800 Patch bug-208539-20200304110229.patch text/plain 9227 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1Nzg0MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDIwLTAzLTA0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBBZGQgYnVpbGQgc3RlcCB0byBjcmVhdGUgbG9jYWwgZ2l0IGNv bW1pdCBmb3IgY29tbWl0LXF1ZXVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMDg1MzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weToKKyAg ICAgICAgKENyZWF0ZUxvY2FsR0lUQ29tbWl0KTogQnVpbGQgc3RlcCB0byBjcmVhdGUgbG9jYWwg Z2l0IGNvbW1pdC4KKyAgICAgICAgKENyZWF0ZUxvY2FsR0lUQ29tbWl0LnN0YXJ0KToKKyAgICAg ICAgKENyZWF0ZUxvY2FsR0lUQ29tbWl0LmdldFJlc3VsdFN1bW1hcnkpOiBTZXQgY3VzdG9tIGZh aWx1cmUgbWVzc2FnZS4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3Rl cHNfdW5pdHRlc3QucHk6IEFkZGVkIHVuaXQtdGVzdHMgYW5kIHJlc3RydWN0dXJlZCBpbXBvcnRz LgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHk6CisK IDIwMjAtMDMtMDQgIEFuZHJlcyBHb256YWxleiAgPGFuZHJlc2dfMjJAYXBwbGUuY29tPgogCiAg ICAgICAgIFJFR1JFU1NJT04gKHIyNTc3MzkpOiB0d28gZmFzdC9ldmVudHMvYXV0b3Njcm9sbCB0 ZXN0IGhhdmUgc3RhcnRlZCB0byBmYWlsCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9l d3MtYnVpbGQvZmFjdG9yaWVzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBw b3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkJKHJldmlzaW9uIDI1Nzg0MikKKysrIFRvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkJKHdvcmtpbmcgY29weSkKQEAg LTI1LDcgKzI1LDcgQEAgZnJvbSBidWlsZGJvdC5wcm9jZXNzIGltcG9ydCBmYWN0b3J5CiBmcm9t IGJ1aWxkYm90LnN0ZXBzIGltcG9ydCB0cmlnZ2VyCiAKIGZyb20gc3RlcHMgaW1wb3J0IChBcHBs eVBhdGNoLCBBcHBseVdhdGNoTGlzdCwgQ2hlY2tPdXRTb3VyY2UsIENoZWNrT3V0U3BlY2lmaWNS ZXZpc2lvbiwgQ2hlY2tQYXRjaFJlbGV2YW5jZSwKLSAgICAgICAgICAgICAgICAgICBDaGVja1N0 eWxlLCBDb21waWxlSlNDLCBDb21waWxlV2ViS2l0LCBDb25maWd1cmVCdWlsZCwKKyAgICAgICAg ICAgICAgICAgICBDaGVja1N0eWxlLCBDb21waWxlSlNDLCBDb21waWxlV2ViS2l0LCBDb25maWd1 cmVCdWlsZCwgQ3JlYXRlTG9jYWxHSVRDb21taXQsCiAgICAgICAgICAgICAgICAgICAgRG93bmxv YWRCdWlsdFByb2R1Y3QsIEV4dHJhY3RCdWlsdFByb2R1Y3QsIEZpbmRNb2RpZmllZENoYW5nZUxv Z3MsIEluc3RhbGxHdGtEZXBlbmRlbmNpZXMsCiAgICAgICAgICAgICAgICAgICAgSW5zdGFsbFdw ZURlcGVuZGVuY2llcywgS2lsbE9sZFByb2Nlc3NlcywgUHJpbnRDb25maWd1cmF0aW9uLCBSdW5B UElUZXN0cywgUnVuQmluZGluZ3NUZXN0cywKICAgICAgICAgICAgICAgICAgICBSdW5CdWlsZFdl YktpdE9yZ1VuaXRUZXN0cywgUnVuRVdTQnVpbGRib3RDaGVja0NvbmZpZywgUnVuRVdTVW5pdFRl c3RzLCBSdW5SZXN1bHRzZGJweVRlc3RzLApAQCAtMjI2LDMgKzIyNiw0IEBAIGNsYXNzIENvbW1p dFF1ZXVlRmFjdG9yeShGYWN0b3J5KToKICAgICAgICAgc2VsZi5hZGRTdGVwKFVwZGF0ZVdvcmtp bmdEaXJlY3RvcnkoKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKEFwcGx5UGF0Y2goKSkKICAgICAg ICAgc2VsZi5hZGRTdGVwKEZpbmRNb2RpZmllZENoYW5nZUxvZ3MoKSkKKyAgICAgICAgc2VsZi5h ZGRTdGVwKENyZWF0ZUxvY2FsR0lUQ29tbWl0KCkpCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3Vw cG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CShyZXZpc2lvbiAyNTc4NDIpCisrKyBUb29scy9CdWls ZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJKHdvcmtpbmcgY29weSkKQEAgLTI0NTks MyArMjQ1OSwzMyBAQCBjbGFzcyBGaW5kTW9kaWZpZWRDaGFuZ2VMb2dzKHNoZWxsLlNoZWxsCiAg ICAgICAgICAgICBpZiBzZWxmLmlzX3BhdGhfdG9fY2hhbmdlbG9nKGZpbGVuYW1lKToKICAgICAg ICAgICAgICAgICBmaWxlbmFtZXMuYXBwZW5kKGZpbGVuYW1lKQogICAgICAgICByZXR1cm4gZmls ZW5hbWVzCisKKworY2xhc3MgQ3JlYXRlTG9jYWxHSVRDb21taXQoc2hlbGwuU2hlbGxDb21tYW5k KToKKyAgICBuYW1lID0gJ2NyZWF0ZS1naXQtY29tbWl0JworICAgIGRlc2NyaXB0aW9uRG9uZSA9 IFsnQ3JlYXRlZCBsb2NhbCBnaXQgY29tbWl0J10KKyAgICBjb21tYW5kID0gWydnaXQnLCAnY29t bWl0JywgJy0tYWxsJywgJy1GJ10KKyAgICBoYWx0T25GYWlsdXJlID0gVHJ1ZQorCisgICAgZGVm IF9faW5pdF9fKHNlbGYsICoqa3dhcmdzKToKKyAgICAgICAgc2hlbGwuU2hlbGxDb21tYW5kLl9f aW5pdF9fKHNlbGYsIHRpbWVvdXQ9NSAqIDYwLCBsb2dFbnZpcm9uPUZhbHNlLCAqKmt3YXJncykK KworICAgIGRlZiBzdGFydChzZWxmKToKKyAgICAgICAgc2VsZi5mYWlsdXJlX21lc3NhZ2UgPSBO b25lCisgICAgICAgIG1vZGlmaWVkX2NoYW5nZWxvZ3MgPSBzZWxmLmdldFByb3BlcnR5KCdtb2Rp ZmllZF9jaGFuZ2Vsb2dzJykKKyAgICAgICAgaWYgbm90IG1vZGlmaWVkX2NoYW5nZWxvZ3M6Cisg ICAgICAgICAgICBzZWxmLmZhaWx1cmVfbWVzc2FnZSA9IHUnTm8gbW9kaWZpZWQgQ2hhbmdlTG9n IGZpbGUgZm91bmQnCisgICAgICAgICAgICBzZWxmLmZpbmlzaGVkKEZBSUxVUkUpCisgICAgICAg ICAgICByZXR1cm4gTm9uZQorCisgICAgICAgIG1vZGlmaWVkX2NoYW5nZWxvZ3MgPSAnICcuam9p bihtb2RpZmllZF9jaGFuZ2Vsb2dzKQorICAgICAgICBzZWxmLmNvbW1hbmQgPSAncGVybCBUb29s cy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yIC0tcHJpbnQtbG9nIHt9Jy5mb3JtYXQobW9kaWZp ZWRfY2hhbmdlbG9ncykKKyAgICAgICAgc2VsZi5jb21tYW5kICs9ICcgfCBnaXQgY29tbWl0IC0t YWxsIC1GIC0nCisgICAgICAgIHJldHVybiBzaGVsbC5TaGVsbENvbW1hbmQuc3RhcnQoc2VsZikK KworICAgIGRlZiBnZXRSZXN1bHRTdW1tYXJ5KHNlbGYpOgorICAgICAgICBpZiBzZWxmLmZhaWx1 cmVfbWVzc2FnZToKKyAgICAgICAgICAgIHJldHVybiB7dSdzdGVwJzogc2VsZi5mYWlsdXJlX21l c3NhZ2V9CisgICAgICAgIGlmIHNlbGYucmVzdWx0cyAhPSBTVUNDRVNTOgorICAgICAgICAgICAg cmV0dXJuIHt1J3N0ZXAnOiB1J0ZhaWxlZCB0byBjcmVhdGUgZ2l0IGNvbW1pdCd9CisgICAgICAg IHJldHVybiBzaGVsbC5TaGVsbENvbW1hbmQuZ2V0UmVzdWx0U3VtbWFyeShzZWxmKQpJbmRleDog VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVz dC5weQkocmV2aXNpb24gMjU3ODQyKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1 aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zNCwxNCArMzQsMTkgQEAg ZnJvbSB0d2lzdGVkLmludGVybmV0IGltcG9ydCBlcnJvciwgcmVhYwogZnJvbSB0d2lzdGVkLnB5 dGhvbiBpbXBvcnQgZmFpbHVyZSwgbG9nCiBmcm9tIHR3aXN0ZWQudHJpYWwgaW1wb3J0IHVuaXR0 ZXN0CiAKLWZyb20gc3RlcHMgaW1wb3J0IChBbmFseXplQVBJVGVzdHNSZXN1bHRzLCBBbmFseXpl Q29tcGlsZVdlYktpdFJlc3VsdHMsIEFuYWx5emVKU0NUZXN0c1Jlc3VsdHMsIEFuYWx5emVMYXlv dXRUZXN0c1Jlc3VsdHMsIEFwcGx5UGF0Y2gsIEFwcGx5V2F0Y2hMaXN0LCBBcmNoaXZlQnVpbHRQ cm9kdWN0LCBBcmNoaXZlVGVzdFJlc3VsdHMsCi0gICAgICAgICAgICAgICAgICAgQ2hlY2tPdXRT b3VyY2UsIENoZWNrT3V0U3BlY2lmaWNSZXZpc2lvbiwgQ2hlY2tQYXRjaFJlbGV2YW5jZSwgQ2hl Y2tTdHlsZSwgQ2xlYW5CdWlsZCwgQ2xlYW5VcEdpdEluZGV4TG9jaywgQ2xlYW5Xb3JraW5nRGly ZWN0b3J5LAotICAgICAgICAgICAgICAgICAgIENvbXBpbGVKU0MsIENvbXBpbGVKU0NUb1QsIENv bXBpbGVXZWJLaXQsIENvbXBpbGVXZWJLaXRUb1QsIENvbmZpZ3VyZUJ1aWxkLAotICAgICAgICAg ICAgICAgICAgIERvd25sb2FkQnVpbHRQcm9kdWN0LCBEb3dubG9hZEJ1aWx0UHJvZHVjdEZyb21N YXN0ZXIsIEV4dHJhY3RCdWlsdFByb2R1Y3QsIEV4dHJhY3RUZXN0UmVzdWx0cywgRmluZE1vZGlm aWVkQ2hhbmdlTG9ncywgSW5zdGFsbEd0a0RlcGVuZGVuY2llcywgSW5zdGFsbFdwZURlcGVuZGVu Y2llcywgS2lsbE9sZFByb2Nlc3NlcywKLSAgICAgICAgICAgICAgICAgICBQcmludENvbmZpZ3Vy YXRpb24sIFJlUnVuQVBJVGVzdHMsIFJlUnVuSmF2YVNjcmlwdENvcmVUZXN0cywgUmVSdW5XZWJL aXRQZXJsVGVzdHMsIFJlUnVuV2ViS2l0VGVzdHMsIFJ1bkFQSVRlc3RzLCBSdW5BUElUZXN0c1dp dGhvdXRQYXRjaCwKLSAgICAgICAgICAgICAgICAgICBSdW5CaW5kaW5nc1Rlc3RzLCBSdW5CdWls ZFdlYktpdE9yZ1VuaXRUZXN0cywgUnVuRVdTQnVpbGRib3RDaGVja0NvbmZpZywgUnVuRVdTVW5p dFRlc3RzLCBSdW5SZXN1bHRzZGJweVRlc3RzLCBSdW5KYXZhU2NyaXB0Q29yZVRlc3RzLCBSdW5K U0NUZXN0c1dpdGhvdXRQYXRjaCwgUnVuV2ViS2l0MVRlc3RzLAotICAgICAgICAgICAgICAgICAg IFJ1bldlYktpdFBlcmxUZXN0cywgUnVuV2ViS2l0UHlQeXRob24yVGVzdHMsIFJ1bldlYktpdFB5 UHl0aG9uM1Rlc3RzLCBSdW5XZWJLaXRUZXN0cywgUnVuV2ViS2l0VGVzdHNXaXRob3V0UGF0Y2gs IFRlc3RXaXRoRmFpbHVyZUNvdW50LCBUcmlnZ2VyLCBUcmFuc2ZlclRvUzMsIFVuQXBwbHlQYXRj aElmUmVxdWlyZWQsCi0gICAgICAgICAgICAgICAgICAgVXBkYXRlV29ya2luZ0RpcmVjdG9yeSwg VXBsb2FkQnVpbHRQcm9kdWN0LCBVcGxvYWRUZXN0UmVzdWx0cywgVmFsaWRhdGVQYXRjaCkKK2Zy b20gc3RlcHMgaW1wb3J0IChBbmFseXplQVBJVGVzdHNSZXN1bHRzLCBBbmFseXplQ29tcGlsZVdl YktpdFJlc3VsdHMsIEFuYWx5emVKU0NUZXN0c1Jlc3VsdHMsCisgICAgICAgICAgICAgICAgICAg QW5hbHl6ZUxheW91dFRlc3RzUmVzdWx0cywgQXBwbHlQYXRjaCwgQXBwbHlXYXRjaExpc3QsIEFy Y2hpdmVCdWlsdFByb2R1Y3QsIEFyY2hpdmVUZXN0UmVzdWx0cywKKyAgICAgICAgICAgICAgICAg ICBDaGVja091dFNvdXJjZSwgQ2hlY2tPdXRTcGVjaWZpY1JldmlzaW9uLCBDaGVja1BhdGNoUmVs ZXZhbmNlLCBDaGVja1N0eWxlLCBDbGVhbkJ1aWxkLAorICAgICAgICAgICAgICAgICAgIENsZWFu VXBHaXRJbmRleExvY2ssIENsZWFuV29ya2luZ0RpcmVjdG9yeSwgQ29tcGlsZUpTQywgQ29tcGls ZUpTQ1RvVCwgQ29tcGlsZVdlYktpdCwKKyAgICAgICAgICAgICAgICAgICBDb21waWxlV2ViS2l0 VG9ULCBDb25maWd1cmVCdWlsZCwgQ3JlYXRlTG9jYWxHSVRDb21taXQsCisgICAgICAgICAgICAg ICAgICAgRG93bmxvYWRCdWlsdFByb2R1Y3QsIERvd25sb2FkQnVpbHRQcm9kdWN0RnJvbU1hc3Rl ciwgRXh0cmFjdEJ1aWx0UHJvZHVjdCwgRXh0cmFjdFRlc3RSZXN1bHRzLAorICAgICAgICAgICAg ICAgICAgIEZpbmRNb2RpZmllZENoYW5nZUxvZ3MsIEluc3RhbGxHdGtEZXBlbmRlbmNpZXMsIElu c3RhbGxXcGVEZXBlbmRlbmNpZXMsIEtpbGxPbGRQcm9jZXNzZXMsCisgICAgICAgICAgICAgICAg ICAgUHJpbnRDb25maWd1cmF0aW9uLCBSZVJ1bkFQSVRlc3RzLCBSZVJ1bkphdmFTY3JpcHRDb3Jl VGVzdHMsIFJlUnVuV2ViS2l0UGVybFRlc3RzLCBSZVJ1bldlYktpdFRlc3RzLAorICAgICAgICAg ICAgICAgICAgIFJ1bkFQSVRlc3RzLCBSdW5BUElUZXN0c1dpdGhvdXRQYXRjaCwgUnVuQmluZGlu Z3NUZXN0cywgUnVuQnVpbGRXZWJLaXRPcmdVbml0VGVzdHMsCisgICAgICAgICAgICAgICAgICAg UnVuRVdTQnVpbGRib3RDaGVja0NvbmZpZywgUnVuRVdTVW5pdFRlc3RzLCBSdW5SZXN1bHRzZGJw eVRlc3RzLCBSdW5KYXZhU2NyaXB0Q29yZVRlc3RzLAorICAgICAgICAgICAgICAgICAgIFJ1bkpT Q1Rlc3RzV2l0aG91dFBhdGNoLCBSdW5XZWJLaXQxVGVzdHMsIFJ1bldlYktpdFBlcmxUZXN0cywg UnVuV2ViS2l0UHlQeXRob24yVGVzdHMsCisgICAgICAgICAgICAgICAgICAgUnVuV2ViS2l0UHlQ eXRob24zVGVzdHMsIFJ1bldlYktpdFRlc3RzLCBSdW5XZWJLaXRUZXN0c1dpdGhvdXRQYXRjaCwg VGVzdFdpdGhGYWlsdXJlQ291bnQsCisgICAgICAgICAgICAgICAgICAgVHJpZ2dlciwgVHJhbnNm ZXJUb1MzLCBVbkFwcGx5UGF0Y2hJZlJlcXVpcmVkLCBVcGRhdGVXb3JraW5nRGlyZWN0b3J5LCBV cGxvYWRCdWlsdFByb2R1Y3QsIFVwbG9hZFRlc3RSZXN1bHRzLCBWYWxpZGF0ZVBhdGNoKQogCiAj IFdvcmthcm91bmQgZm9yIGh0dHBzOi8vZ2l0aHViLmNvbS9idWlsZGJvdC9idWlsZGJvdC9pc3N1 ZXMvNDY2OQogZnJvbSBidWlsZGJvdC50ZXN0LmZha2UuZmFrZWJ1aWxkIGltcG9ydCBGYWtlQnVp bGQKQEAgLTMwNjAsNyArMzA2NSw2IEBAIE0JVG9vbHMvU2NyaXB0cy9ydW4tYXBpLXRlc3RzJycn KSArCiAKICAgICBkZWYgdGVzdF9mYWlsdXJlKHNlbGYpOgogICAgICAgICBzZWxmLnNldHVwU3Rl cChGaW5kTW9kaWZpZWRDaGFuZ2VMb2dzKCkpCi0gICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2J1 Z19pZCcsICcxMjM0JykKICAgICAgICAgc2VsZi5leHBlY3RSZW1vdGVDb21tYW5kcygKICAgICAg ICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywKICAgICAgICAgICAgICAgICAgICAg ICAgIHRpbWVvdXQ9MTgwLApAQCAtMzA3Myw1ICszMDc3LDQ2IEBAIE0JVG9vbHMvU2NyaXB0cy9y dW4tYXBpLXRlc3RzJycnKSArCiAgICAgICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQogCiAKK2Ns YXNzIFRlc3RDcmVhdGVMb2NhbEdJVENvbW1pdChCdWlsZFN0ZXBNaXhpbkFkZGl0aW9ucywgdW5p dHRlc3QuVGVzdENhc2UpOgorICAgIGRlZiBzZXRVcChzZWxmKToKKyAgICAgICAgc2VsZi5sb25n TWVzc2FnZSA9IFRydWUKKyAgICAgICAgcmV0dXJuIHNlbGYuc2V0VXBCdWlsZFN0ZXAoKQorCisg ICAgZGVmIHRlYXJEb3duKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi50ZWFyRG93bkJ1aWxk U3RlcCgpCisKKyAgICBkZWYgdGVzdF9zdWNjZXNzKHNlbGYpOgorICAgICAgICBzZWxmLnNldHVw U3RlcChDcmVhdGVMb2NhbEdJVENvbW1pdCgpKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdt b2RpZmllZF9jaGFuZ2Vsb2dzJywgWydUb29scy9TY3JpcHRzL0NoYW5nZUxvZycsICdTb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cnXSkKKyAgICAgICAgc2VsZi5leHBlY3RSZW1vdGVDb21tYW5kcygK KyAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywKKyAgICAgICAgICAgICAg ICAgICAgICAgIHRpbWVvdXQ9MzAwLAorICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJv bj1GYWxzZSwKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9J3BlcmwgVG9vbHMvU2Ny aXB0cy9jb21taXQtbG9nLWVkaXRvciAtLXByaW50LWxvZyBUb29scy9TY3JpcHRzL0NoYW5nZUxv ZyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgfCBnaXQgY29tbWl0IC0tYWxsIC1GIC0nKSArCisg ICAgICAgICAgICAwLAorICAgICAgICApCisgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1 bHQ9U1VDQ0VTUywgc3RhdGVfc3RyaW5nPSdDcmVhdGVkIGxvY2FsIGdpdCBjb21taXQnKQorICAg ICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKKworICAgIGRlZiB0ZXN0X2ZhaWx1cmVfbm9fY2hh bmdlbG9nKHNlbGYpOgorICAgICAgICBzZWxmLnNldHVwU3RlcChDcmVhdGVMb2NhbEdJVENvbW1p dCgpKQorICAgICAgICBzZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PUZBSUxVUkUsIHN0YXRlX3N0 cmluZz0nTm8gbW9kaWZpZWQgQ2hhbmdlTG9nIGZpbGUgZm91bmQnKQorICAgICAgICByZXR1cm4g c2VsZi5ydW5TdGVwKCkKKworICAgIGRlZiB0ZXN0X2ZhaWx1cmUoc2VsZik6CisgICAgICAgIHNl bGYuc2V0dXBTdGVwKENyZWF0ZUxvY2FsR0lUQ29tbWl0KCkpCisgICAgICAgIHNlbGYuc2V0UHJv cGVydHkoJ21vZGlmaWVkX2NoYW5nZWxvZ3MnLCBbJ1Rvb2xzL1NjcmlwdHMvQ2hhbmdlTG9nJ10p CisgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCisgICAgICAgICAgICBFeHBlY3RT aGVsbCh3b3JrZGlyPSd3a2RpcicsCisgICAgICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PTMw MCwKKyAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCisgICAgICAgICAg ICAgICAgICAgICAgICBjb21tYW5kPSdwZXJsIFRvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0 b3IgLS1wcmludC1sb2cgVG9vbHMvU2NyaXB0cy9DaGFuZ2VMb2cgfCBnaXQgY29tbWl0IC0tYWxs IC1GIC0nKSArCisgICAgICAgICAgICBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PSdV bmV4cGVjdGVkIGZhaWx1cmUnKSArCisgICAgICAgICAgICAyLAorICAgICAgICApCisgICAgICAg IHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9RkFJTFVSRSwgc3RhdGVfc3RyaW5nPSdGYWlsZWQg dG8gY3JlYXRlIGdpdCBjb21taXQnKQorICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKKwor CiBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAgIHVuaXR0ZXN0Lm1haW4oKQo=