215174 2020-08-05 10:44:07 -0700 EWS emails about build failure should include relevant error logs 2020-09-15 09:52:02 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=203418 https://bugs.webkit.org/show_bug.cgi?id=215264 https://bugs.webkit.org/show_bug.cgi?id=215330 https://bugs.webkit.org/show_bug.cgi?id=216566 InRadar P2 Normal --- 215220 1 aakash_jain aakash_jain ap jbedard rackler ryanhaddad webkit-bug-importer oldest_to_newest 1677976 0 aakash_jain 2020-08-05 10:44:07 -0700 EWS emails about build failure should include relevant error logs. It would make it easier to quickly identify the issue from the email itself. These logs will be filtered/shortened version of error logs which are displayed in Buildbot build (which were added in Bug 203418). Currently these emails are enabled only for bot-watchers, but when we will enable them for engineers, having relevant error logs in email would be useful. 1677979 1 406012 aakash_jain 2020-08-05 10:49:27 -0700 Created attachment 406012 Patch 1677984 2 aakash_jain 2020-08-05 11:02:55 -0700 Tested in https://ews-build.webkit-uat.org/#/builders/33/builds/274 1677990 3 406012 jbedard 2020-08-05 11:18:53 -0700 Comment on attachment 406012 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=406012&action=review > Tools/BuildSlaveSupport/ews-build/steps.py:-1398 > - return defer.succeed(None) Was this line removed intentionally? > Tools/BuildSlaveSupport/ews-build/steps.py:1408 > + def getResults(self, name): What is the return value of this function? I ask because it looks like @defer.inlineCallbacks is overriding that. > Tools/BuildSlaveSupport/ews-build/steps.py:1411 > + defer.returnValue(None) This looks like an early exit, but I'm not familiar with this 'defer' idiom, do we not need to return so we exit early? 1678035 4 406012 aakash_jain 2020-08-05 12:41:11 -0700 Comment on attachment 406012 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=406012&action=review >> Tools/BuildSlaveSupport/ews-build/steps.py:-1398 >> - return defer.succeed(None) > > Was this line removed intentionally? Yes, it was moved. This line belonged to start() method earlier, and now also it belongs to start() method. >> Tools/BuildSlaveSupport/ews-build/steps.py:1411 >> + defer.returnValue(None) > > This looks like an early exit, but I'm not familiar with this 'defer' idiom, do we not need to return so we exit early? Yes. Also this method is mostly copied from AnalyzeAPITestsResults::getTestsResults() 1678037 5 406026 aakash_jain 2020-08-05 12:43:47 -0700 Created attachment 406026 Patch 1678060 6 ews-feeder 2020-08-05 13:41:36 -0700 Committed r265302: <https://trac.webkit.org/changeset/265302> All reviewed patches have been landed. Closing bug and clearing flags on attachment 406026. 1678061 7 webkit-bug-importer 2020-08-05 13:42:18 -0700 <rdar://problem/66591524> 406012 2020-08-05 10:49:27 -0700 2020-08-05 12:43:43 -0700 Patch bug-215174-20200805134926.patch text/plain 5155 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTI5MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIwLTA4LTA1ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBFV1MgZW1haWxzIGFib3V0IGJ1aWxkIGZhaWx1cmUgc2hvdWxkIGluY2x1 ZGUgcmVsZXZhbnQgZXJyb3IgbG9ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE1MTc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHk6Cisg ICAgICAgIChBbmFseXplQ29tcGlsZVdlYktpdFJlc3VsdHMuc3RhcnQpOgorICAgICAgICAoQW5h bHl6ZUNvbXBpbGVXZWJLaXRSZXN1bHRzKToKKyAgICAgICAgKEFuYWx5emVDb21waWxlV2ViS2l0 UmVzdWx0cy5nZXRSZXN1bHRzKTogTWV0aG9kIHRvIHJlYWQgdGhlIGxvZ3MgZnJvbSBwcmV2aW91 cyBidWlsZCBzdGVwLgorICAgICAgICAoQW5hbHl6ZUNvbXBpbGVXZWJLaXRSZXN1bHRzLmFuYWx5 emVSZXN1bHRzKTogTWFkZSBhIHNlcGFyYXRlIG1ldGhvZCBjYWxsZWQgdXNpbmcgZGVmZXJyZWQg YWZ0ZXIgcmVhZGluZyB0aGUgbG9ncyBmcm9tIHByZXZpb3VzIHN0ZXBzLgorICAgICAgICAoQW5h bHl6ZUNvbXBpbGVXZWJLaXRSZXN1bHRzLmdldEJ1aWxkU3RlcEJ5TmFtZSk6IE1ldGhvZCB0byBn ZXQgc3RlcCBvYmplY3QgZnJvbSBzdGVwIG5hbWUuCisgICAgICAgIChBbmFseXplQ29tcGlsZVdl YktpdFJlc3VsdHMuZmlsdGVyX2xvZ3NfY29udGFpbmluZ19lcnJvcik6IEZpbHRlciB0aGUgbG9n cyB0byBpbmNsdWRlIGluIGVtYWlsLgorICAgICAgICAoQW5hbHl6ZUNvbXBpbGVXZWJLaXRSZXN1 bHRzLnNlbmRfZW1haWxfZm9yX3ByZWV4aXN0aW5nX2J1aWxkX2ZhaWx1cmUpOiBSZW5hbWVkIGZy b20gc2VuZF9lbWFpbF9mb3JfYnVpbGRfZmFpbHVyZS4gQWRkZWQgCisgICAgICAgIHJlbGV2YW50 IGVycm9yIGxvZ3MgaW4gZW1haWwuCisKIDIwMjAtMDgtMDUgIFNpaHVpIExpdSAgPHNpaHVpX2xp dUBhcHBlLmNvbT4KIAogICAgICAgICBUZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlciBzaG91bGQg b2JzZXJ2ZSBuZXdseSBpbnNlcnRlZCBvciBkaXNwbGF5ZWQgdGV4dApJbmRleDogVG9vbHMvQnVp bGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQkocmV2aXNpb24gMjY1MjkyKQorKysg VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CSh3b3JraW5nIGNvcHkp CkBAIC0xMzcwLDYgKzEzNzAsMTUgQEAgY2xhc3MgQW5hbHl6ZUNvbXBpbGVXZWJLaXRSZXN1bHRz KGJ1aWxkcwogICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsnYW5hbHl6ZS1jb21waWxlLXdlYmtpdC1y ZXN1bHRzJ10KIAogICAgIGRlZiBzdGFydChzZWxmKToKKyAgICAgICAgc2VsZi5lcnJvcl9sb2dz ID0ge30KKyAgICAgICAgc2VsZi5jb21waWxlX3dlYmtpdF9zdGVwID0gQ29tcGlsZVdlYktpdC5u YW1lCisgICAgICAgIGlmIHNlbGYuZ2V0UHJvcGVydHkoJ2dyb3VwJykgPT0gJ2pzYyc6CisgICAg ICAgICAgICBzZWxmLmNvbXBpbGVfd2Via2l0X3N0ZXAgPSBDb21waWxlSlNDLm5hbWUKKyAgICAg ICAgZCA9IHNlbGYuZ2V0UmVzdWx0cyhzZWxmLmNvbXBpbGVfd2Via2l0X3N0ZXApCisgICAgICAg IGQuYWRkQ2FsbGJhY2sobGFtYmRhIHJlczogc2VsZi5hbmFseXplUmVzdWx0cygpKQorICAgICAg ICByZXR1cm4gZGVmZXIuc3VjY2VlZChOb25lKQorCisgICAgZGVmIGFuYWx5emVSZXN1bHRzKHNl bGYpOgogICAgICAgICBjb21waWxlX3dpdGhvdXRfcGF0Y2hfc3RlcCA9IENvbXBpbGVXZWJLaXRX aXRob3V0UGF0Y2gubmFtZQogICAgICAgICBpZiBzZWxmLmdldFByb3BlcnR5KCdncm91cCcpID09 ICdqc2MnOgogICAgICAgICAgICAgY29tcGlsZV93aXRob3V0X3BhdGNoX3N0ZXAgPSBDb21waWxl SlNDV2l0aG91dFBhdGNoLm5hbWUKQEAgLTEzNzksNyArMTM4OCw3IEBAIGNsYXNzIEFuYWx5emVD b21waWxlV2ViS2l0UmVzdWx0cyhidWlsZHMKICAgICAgICAgICAgIHNlbGYuZmluaXNoZWQoRkFJ TFVSRSkKICAgICAgICAgICAgIG1lc3NhZ2UgPSAnVW5hYmxlIHRvIGJ1aWxkIFdlYktpdCB3aXRo b3V0IHBhdGNoLCByZXRyeWluZyBidWlsZCcKICAgICAgICAgICAgIHNlbGYuZGVzY3JpcHRpb25E b25lID0gbWVzc2FnZQotICAgICAgICAgICAgc2VsZi5zZW5kX2VtYWlsX2Zvcl9idWlsZF9mYWls dXJlKCkKKyAgICAgICAgICAgIHNlbGYuc2VuZF9lbWFpbF9mb3JfcHJlZXhpc3RpbmdfYnVpbGRf ZmFpbHVyZSgpCiAgICAgICAgICAgICBzZWxmLmJ1aWxkLmJ1aWxkRmluaXNoZWQoW21lc3NhZ2Vd LCBSRVRSWSkKICAgICAgICAgICAgIHJldHVybiBkZWZlci5zdWNjZWVkKE5vbmUpCiAKQEAgLTEz OTUsMjEgKzE0MDQsNTUgQEAgY2xhc3MgQW5hbHl6ZUNvbXBpbGVXZWJLaXRSZXN1bHRzKGJ1aWxk cwogICAgICAgICBlbHNlOgogICAgICAgICAgICAgc2VsZi5idWlsZC5idWlsZEZpbmlzaGVkKFtt ZXNzYWdlXSwgRkFJTFVSRSkKIAotICAgICAgICByZXR1cm4gZGVmZXIuc3VjY2VlZChOb25lKQor ICAgIEBkZWZlci5pbmxpbmVDYWxsYmFja3MKKyAgICBkZWYgZ2V0UmVzdWx0cyhzZWxmLCBuYW1l KToKKyAgICAgICAgc3RlcCA9IHNlbGYuZ2V0QnVpbGRTdGVwQnlOYW1lKG5hbWUpCisgICAgICAg IGlmIG5vdCBzdGVwOgorICAgICAgICAgICAgZGVmZXIucmV0dXJuVmFsdWUoTm9uZSkKKworICAg ICAgICBsb2dzID0geWllbGQgc2VsZi5tYXN0ZXIuZGIubG9ncy5nZXRMb2dzKHN0ZXAuc3RlcGlk KQorICAgICAgICBsb2cgPSBuZXh0KChsb2cgZm9yIGxvZyBpbiBsb2dzIGlmIGxvZ1snbmFtZSdd ID09IHUnZXJyb3JzJyksIE5vbmUpCisgICAgICAgIGlmIG5vdCBsb2c6CisgICAgICAgICAgICBk ZWZlci5yZXR1cm5WYWx1ZShOb25lKQorCisgICAgICAgIGxhc3RsaW5lID0gaW50KG1heCgwLCBs b2dbJ251bV9saW5lcyddIC0gMSkpCisgICAgICAgIGxvZ0xpbmVzID0geWllbGQgc2VsZi5tYXN0 ZXIuZGIubG9ncy5nZXRMb2dMaW5lcyhsb2dbJ2lkJ10sIDAsIGxhc3RsaW5lKQorICAgICAgICBp ZiBsb2dbJ3R5cGUnXSA9PSAncyc6CisgICAgICAgICAgICBsb2dMaW5lcyA9ICdcbicuam9pbihb bGluZVsxOl0gZm9yIGxpbmUgaW4gbG9nTGluZXMuc3BsaXRsaW5lcygpXSkKKworICAgICAgICBz ZWxmLmVycm9yX2xvZ3NbbmFtZV0gPSBsb2dMaW5lcwogCiAgICAgZGVmIGdldFN0ZXBSZXN1bHQo c2VsZiwgc3RlcF9uYW1lKToKICAgICAgICAgZm9yIHN0ZXAgaW4gc2VsZi5idWlsZC5leGVjdXRl ZFN0ZXBzOgogICAgICAgICAgICAgaWYgc3RlcC5uYW1lID09IHN0ZXBfbmFtZToKICAgICAgICAg ICAgICAgICByZXR1cm4gc3RlcC5yZXN1bHRzCiAKLSAgICBkZWYgc2VuZF9lbWFpbF9mb3JfYnVp bGRfZmFpbHVyZShzZWxmKToKKyAgICBkZWYgZ2V0QnVpbGRTdGVwQnlOYW1lKHNlbGYsIHN0ZXBf bmFtZSk6CisgICAgICAgIGZvciBzdGVwIGluIHNlbGYuYnVpbGQuZXhlY3V0ZWRTdGVwczoKKyAg ICAgICAgICAgIGlmIHN0ZXAubmFtZSA9PSBzdGVwX25hbWU6CisgICAgICAgICAgICAgICAgcmV0 dXJuIHN0ZXAKKyAgICAgICAgcmV0dXJuIE5vbmUKKworICAgIGRlZiBmaWx0ZXJfbG9nc19jb250 YWluaW5nX2Vycm9yKHNlbGYsIGxvZ3MsIG1heF9udW1fbGluZXM9MTApOgorICAgICAgICBpZiBu b3QgbG9nczoKKyAgICAgICAgICAgIHJldHVybiBOb25lCisgICAgICAgIGZpbHRlcmVkX2xvZ3Mg PSBbXQorICAgICAgICBmb3IgbGluZSBpbiBsb2dzLnNwbGl0bGluZXMoKToKKyAgICAgICAgICAg IGlmICdycm9yOicgaW4gbGluZToKKyAgICAgICAgICAgICAgICBmaWx0ZXJlZF9sb2dzLmFwcGVu ZChsaW5lKQorICAgICAgICByZXR1cm4gJ1xuJy5qb2luKGZpbHRlcmVkX2xvZ3NbOm1heF9udW1f bGluZXNdKQorCisgICAgZGVmIHNlbmRfZW1haWxfZm9yX3ByZWV4aXN0aW5nX2J1aWxkX2ZhaWx1 cmUoc2VsZik6CiAgICAgICAgIHRyeToKICAgICAgICAgICAgIGJ1aWxkZXJfbmFtZSA9IHNlbGYu Z2V0UHJvcGVydHkoJ2J1aWxkZXJuYW1lJywgJycpCiAgICAgICAgICAgICB3b3JrZXJfbmFtZSA9 IHNlbGYuZ2V0UHJvcGVydHkoJ3dvcmtlcm5hbWUnLCAnJykKICAgICAgICAgICAgIGJ1aWxkX3Vy bCA9ICd7fSMvYnVpbGRlcnMve30vYnVpbGRzL3t9Jy5mb3JtYXQoc2VsZi5tYXN0ZXIuY29uZmln LmJ1aWxkYm90VVJMLCBzZWxmLmJ1aWxkLl9idWlsZGVyaWQsIHNlbGYuYnVpbGQubnVtYmVyKQor ICAgICAgICAgICAgbG9ncyA9IHNlbGYuZmlsdGVyX2xvZ3NfY29udGFpbmluZ19lcnJvcihzZWxm LmVycm9yX2xvZ3MuZ2V0KHNlbGYuY29tcGlsZV93ZWJraXRfc3RlcCkpCiAKICAgICAgICAgICAg IGVtYWlsX3N1YmplY3QgPSAnQnVpbGQgZmFpbHVyZSBvbiB0cnVuayBvbiB7fScuZm9ybWF0KGJ1 aWxkZXJfbmFtZSkKICAgICAgICAgICAgIGVtYWlsX3RleHQgPSAnRmFpbGVkIHRvIGJ1aWxkIFdl YktpdCB3aXRob3V0IHBhdGNoIGluIHt9XG5cbkJ1aWxkZXI6IHt9XG5cbldvcmtlcjoge30nLmZv cm1hdChidWlsZF91cmwsIGJ1aWxkZXJfbmFtZSwgd29ya2VyX25hbWUpCisgICAgICAgICAgICBp ZiBsb2dzOgorICAgICAgICAgICAgICAgIGVtYWlsX3RleHQgKz0gJ1xuXG5FcnJvciBsaW5lczpc blxue30nLmZvcm1hdChsb2dzKQogICAgICAgICAgICAgc2VuZF9lbWFpbF90b19ib3Rfd2F0Y2hl cnMoZW1haWxfc3ViamVjdCwgZW1haWxfdGV4dCkKICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBh cyBlOgogICAgICAgICAgICAgcHJpbnQoJ0Vycm9yIGluIHNlbmRpbmcgZW1haWwgZm9yIGJ1aWxk IGZhaWx1cmU6IHt9Jy5mb3JtYXQoZSkpCg== 406026 2020-08-05 12:43:47 -0700 2020-08-05 13:41:37 -0700 Patch bug-215174-20200805154346.patch text/plain 7090 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTI5MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIwLTA4LTA1ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBFV1MgZW1haWxzIGFib3V0IGJ1aWxkIGZhaWx1cmUgc2hvdWxkIGluY2x1 ZGUgcmVsZXZhbnQgZXJyb3IgbG9ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE1MTc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHk6Cisg ICAgICAgIChBbmFseXplQ29tcGlsZVdlYktpdFJlc3VsdHMuc3RhcnQpOgorICAgICAgICAoQW5h bHl6ZUNvbXBpbGVXZWJLaXRSZXN1bHRzKToKKyAgICAgICAgKEFuYWx5emVDb21waWxlV2ViS2l0 UmVzdWx0cy5nZXRSZXN1bHRzKTogTWV0aG9kIHRvIHJlYWQgdGhlIGxvZ3MgZnJvbSBwcmV2aW91 cyBidWlsZCBzdGVwLgorICAgICAgICAoQW5hbHl6ZUNvbXBpbGVXZWJLaXRSZXN1bHRzLmFuYWx5 emVSZXN1bHRzKTogTWFkZSBhIHNlcGFyYXRlIG1ldGhvZCBjYWxsZWQgdXNpbmcgZGVmZXJyZWQg YWZ0ZXIgcmVhZGluZyB0aGUgbG9ncyBmcm9tIHByZXZpb3VzIHN0ZXBzLgorICAgICAgICAoQW5h bHl6ZUNvbXBpbGVXZWJLaXRSZXN1bHRzLmdldEJ1aWxkU3RlcEJ5TmFtZSk6IE1ldGhvZCB0byBn ZXQgc3RlcCBvYmplY3QgZnJvbSBzdGVwIG5hbWUuCisgICAgICAgIChBbmFseXplQ29tcGlsZVdl YktpdFJlc3VsdHMuZmlsdGVyX2xvZ3NfY29udGFpbmluZ19lcnJvcik6IEZpbHRlciB0aGUgbG9n cyB0byBpbmNsdWRlIGluIGVtYWlsLgorICAgICAgICAoQW5hbHl6ZUNvbXBpbGVXZWJLaXRSZXN1 bHRzLnNlbmRfZW1haWxfZm9yX3ByZWV4aXN0aW5nX2J1aWxkX2ZhaWx1cmUpOiBSZW5hbWVkIGZy b20gc2VuZF9lbWFpbF9mb3JfYnVpbGRfZmFpbHVyZS4gQWRkZWQgCisgICAgICAgIHJlbGV2YW50 IGVycm9yIGxvZ3MgaW4gZW1haWwuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1 aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5OiBBZGRlZCB1bml0LXRlc3RzLgorCiAyMDIwLTA4LTA1ICBT aWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwZS5jb20+CiAKICAgICAgICAgVGV4dE1hbmlwdWxhdGlv bkNvbnRyb2xsZXIgc2hvdWxkIG9ic2VydmUgbmV3bHkgaW5zZXJ0ZWQgb3IgZGlzcGxheWVkIHRl eHQKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJKHJl dmlzaW9uIDI2NTI5MikKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVw cy5weQkod29ya2luZyBjb3B5KQpAQCAtMTM3MCw2ICsxMzcwLDE1IEBAIGNsYXNzIEFuYWx5emVD b21waWxlV2ViS2l0UmVzdWx0cyhidWlsZHMKICAgICBkZXNjcmlwdGlvbkRvbmUgPSBbJ2FuYWx5 emUtY29tcGlsZS13ZWJraXQtcmVzdWx0cyddCiAKICAgICBkZWYgc3RhcnQoc2VsZik6CisgICAg ICAgIHNlbGYuZXJyb3JfbG9ncyA9IHt9CisgICAgICAgIHNlbGYuY29tcGlsZV93ZWJraXRfc3Rl cCA9IENvbXBpbGVXZWJLaXQubmFtZQorICAgICAgICBpZiBzZWxmLmdldFByb3BlcnR5KCdncm91 cCcpID09ICdqc2MnOgorICAgICAgICAgICAgc2VsZi5jb21waWxlX3dlYmtpdF9zdGVwID0gQ29t cGlsZUpTQy5uYW1lCisgICAgICAgIGQgPSBzZWxmLmdldFJlc3VsdHMoc2VsZi5jb21waWxlX3dl YmtpdF9zdGVwKQorICAgICAgICBkLmFkZENhbGxiYWNrKGxhbWJkYSByZXM6IHNlbGYuYW5hbHl6 ZVJlc3VsdHMoKSkKKyAgICAgICAgcmV0dXJuIGRlZmVyLnN1Y2NlZWQoTm9uZSkKKworICAgIGRl ZiBhbmFseXplUmVzdWx0cyhzZWxmKToKICAgICAgICAgY29tcGlsZV93aXRob3V0X3BhdGNoX3N0 ZXAgPSBDb21waWxlV2ViS2l0V2l0aG91dFBhdGNoLm5hbWUKICAgICAgICAgaWYgc2VsZi5nZXRQ cm9wZXJ0eSgnZ3JvdXAnKSA9PSAnanNjJzoKICAgICAgICAgICAgIGNvbXBpbGVfd2l0aG91dF9w YXRjaF9zdGVwID0gQ29tcGlsZUpTQ1dpdGhvdXRQYXRjaC5uYW1lCkBAIC0xMzc5LDcgKzEzODgs NyBAQCBjbGFzcyBBbmFseXplQ29tcGlsZVdlYktpdFJlc3VsdHMoYnVpbGRzCiAgICAgICAgICAg ICBzZWxmLmZpbmlzaGVkKEZBSUxVUkUpCiAgICAgICAgICAgICBtZXNzYWdlID0gJ1VuYWJsZSB0 byBidWlsZCBXZWJLaXQgd2l0aG91dCBwYXRjaCwgcmV0cnlpbmcgYnVpbGQnCiAgICAgICAgICAg ICBzZWxmLmRlc2NyaXB0aW9uRG9uZSA9IG1lc3NhZ2UKLSAgICAgICAgICAgIHNlbGYuc2VuZF9l bWFpbF9mb3JfYnVpbGRfZmFpbHVyZSgpCisgICAgICAgICAgICBzZWxmLnNlbmRfZW1haWxfZm9y X3ByZWV4aXN0aW5nX2J1aWxkX2ZhaWx1cmUoKQogICAgICAgICAgICAgc2VsZi5idWlsZC5idWls ZEZpbmlzaGVkKFttZXNzYWdlXSwgUkVUUlkpCiAgICAgICAgICAgICByZXR1cm4gZGVmZXIuc3Vj Y2VlZChOb25lKQogCkBAIC0xMzk1LDIxICsxNDA0LDU1IEBAIGNsYXNzIEFuYWx5emVDb21waWxl V2ViS2l0UmVzdWx0cyhidWlsZHMKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHNlbGYuYnVp bGQuYnVpbGRGaW5pc2hlZChbbWVzc2FnZV0sIEZBSUxVUkUpCiAKLSAgICAgICAgcmV0dXJuIGRl ZmVyLnN1Y2NlZWQoTm9uZSkKKyAgICBAZGVmZXIuaW5saW5lQ2FsbGJhY2tzCisgICAgZGVmIGdl dFJlc3VsdHMoc2VsZiwgbmFtZSk6CisgICAgICAgIHN0ZXAgPSBzZWxmLmdldEJ1aWxkU3RlcEJ5 TmFtZShuYW1lKQorICAgICAgICBpZiBub3Qgc3RlcDoKKyAgICAgICAgICAgIGRlZmVyLnJldHVy blZhbHVlKE5vbmUpCisKKyAgICAgICAgbG9ncyA9IHlpZWxkIHNlbGYubWFzdGVyLmRiLmxvZ3Mu Z2V0TG9ncyhzdGVwLnN0ZXBpZCkKKyAgICAgICAgbG9nID0gbmV4dCgobG9nIGZvciBsb2cgaW4g bG9ncyBpZiBsb2dbJ25hbWUnXSA9PSB1J2Vycm9ycycpLCBOb25lKQorICAgICAgICBpZiBub3Qg bG9nOgorICAgICAgICAgICAgZGVmZXIucmV0dXJuVmFsdWUoTm9uZSkKKworICAgICAgICBsYXN0 bGluZSA9IGludChtYXgoMCwgbG9nWydudW1fbGluZXMnXSAtIDEpKQorICAgICAgICBsb2dMaW5l cyA9IHlpZWxkIHNlbGYubWFzdGVyLmRiLmxvZ3MuZ2V0TG9nTGluZXMobG9nWydpZCddLCAwLCBs YXN0bGluZSkKKyAgICAgICAgaWYgbG9nWyd0eXBlJ10gPT0gJ3MnOgorICAgICAgICAgICAgbG9n TGluZXMgPSAnXG4nLmpvaW4oW2xpbmVbMTpdIGZvciBsaW5lIGluIGxvZ0xpbmVzLnNwbGl0bGlu ZXMoKV0pCisKKyAgICAgICAgc2VsZi5lcnJvcl9sb2dzW25hbWVdID0gbG9nTGluZXMKIAogICAg IGRlZiBnZXRTdGVwUmVzdWx0KHNlbGYsIHN0ZXBfbmFtZSk6CiAgICAgICAgIGZvciBzdGVwIGlu IHNlbGYuYnVpbGQuZXhlY3V0ZWRTdGVwczoKICAgICAgICAgICAgIGlmIHN0ZXAubmFtZSA9PSBz dGVwX25hbWU6CiAgICAgICAgICAgICAgICAgcmV0dXJuIHN0ZXAucmVzdWx0cwogCi0gICAgZGVm IHNlbmRfZW1haWxfZm9yX2J1aWxkX2ZhaWx1cmUoc2VsZik6CisgICAgZGVmIGdldEJ1aWxkU3Rl cEJ5TmFtZShzZWxmLCBzdGVwX25hbWUpOgorICAgICAgICBmb3Igc3RlcCBpbiBzZWxmLmJ1aWxk LmV4ZWN1dGVkU3RlcHM6CisgICAgICAgICAgICBpZiBzdGVwLm5hbWUgPT0gc3RlcF9uYW1lOgor ICAgICAgICAgICAgICAgIHJldHVybiBzdGVwCisgICAgICAgIHJldHVybiBOb25lCisKKyAgICBk ZWYgZmlsdGVyX2xvZ3NfY29udGFpbmluZ19lcnJvcihzZWxmLCBsb2dzLCBtYXhfbnVtX2xpbmVz PTEwKToKKyAgICAgICAgaWYgbm90IGxvZ3M6CisgICAgICAgICAgICByZXR1cm4gTm9uZQorICAg ICAgICBmaWx0ZXJlZF9sb2dzID0gW10KKyAgICAgICAgZm9yIGxpbmUgaW4gbG9ncy5zcGxpdGxp bmVzKCk6CisgICAgICAgICAgICBpZiAncnJvcjonIGluIGxpbmU6CisgICAgICAgICAgICAgICAg ZmlsdGVyZWRfbG9ncy5hcHBlbmQobGluZSkKKyAgICAgICAgcmV0dXJuICdcbicuam9pbihmaWx0 ZXJlZF9sb2dzWzptYXhfbnVtX2xpbmVzXSkKKworICAgIGRlZiBzZW5kX2VtYWlsX2Zvcl9wcmVl eGlzdGluZ19idWlsZF9mYWlsdXJlKHNlbGYpOgogICAgICAgICB0cnk6CiAgICAgICAgICAgICBi dWlsZGVyX25hbWUgPSBzZWxmLmdldFByb3BlcnR5KCdidWlsZGVybmFtZScsICcnKQogICAgICAg ICAgICAgd29ya2VyX25hbWUgPSBzZWxmLmdldFByb3BlcnR5KCd3b3JrZXJuYW1lJywgJycpCiAg ICAgICAgICAgICBidWlsZF91cmwgPSAne30jL2J1aWxkZXJzL3t9L2J1aWxkcy97fScuZm9ybWF0 KHNlbGYubWFzdGVyLmNvbmZpZy5idWlsZGJvdFVSTCwgc2VsZi5idWlsZC5fYnVpbGRlcmlkLCBz ZWxmLmJ1aWxkLm51bWJlcikKKyAgICAgICAgICAgIGxvZ3MgPSBzZWxmLmZpbHRlcl9sb2dzX2Nv bnRhaW5pbmdfZXJyb3Ioc2VsZi5lcnJvcl9sb2dzLmdldChzZWxmLmNvbXBpbGVfd2Via2l0X3N0 ZXApKQogCiAgICAgICAgICAgICBlbWFpbF9zdWJqZWN0ID0gJ0J1aWxkIGZhaWx1cmUgb24gdHJ1 bmsgb24ge30nLmZvcm1hdChidWlsZGVyX25hbWUpCiAgICAgICAgICAgICBlbWFpbF90ZXh0ID0g J0ZhaWxlZCB0byBidWlsZCBXZWJLaXQgd2l0aG91dCBwYXRjaCBpbiB7fVxuXG5CdWlsZGVyOiB7 fVxuXG5Xb3JrZXI6IHt9Jy5mb3JtYXQoYnVpbGRfdXJsLCBidWlsZGVyX25hbWUsIHdvcmtlcl9u YW1lKQorICAgICAgICAgICAgaWYgbG9nczoKKyAgICAgICAgICAgICAgICBlbWFpbF90ZXh0ICs9 ICdcblxuRXJyb3IgbGluZXM6XG5cbnt9Jy5mb3JtYXQobG9ncykKICAgICAgICAgICAgIHNlbmRf ZW1haWxfdG9fYm90X3dhdGNoZXJzKGVtYWlsX3N1YmplY3QsIGVtYWlsX3RleHQpCiAgICAgICAg IGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKICAgICAgICAgICAgIHByaW50KCdFcnJvciBpbiBzZW5k aW5nIGVtYWlsIGZvciBidWlsZCBmYWlsdXJlOiB7fScuZm9ybWF0KGUpKQpJbmRleDogVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQko cmV2aXNpb24gMjY1MjkyKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0 ZXBzX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMTA4LDYgKzExMDgsMjQgQEAgY2xh c3MgVGVzdEFuYWx5emVDb21waWxlV2ViS2l0UmVzdWx0cyhCdQogICAgICAgICBzZWxmLmV4cGVj dE91dGNvbWUocmVzdWx0PUZBSUxVUkUsIHN0YXRlX3N0cmluZz0nVW5hYmxlIHRvIGJ1aWxkIFdl YktpdCB3aXRob3V0IHBhdGNoLCByZXRyeWluZyBidWlsZCAoZmFpbHVyZSknKQogICAgICAgICBy ZXR1cm4gc2VsZi5ydW5TdGVwKCkKIAorICAgIGRlZiB0ZXN0X2ZpbHRlcl9sb2dzX2NvbnRhaW5p bmdfZXJyb3Ioc2VsZik6CisgICAgICAgIGxvZ3MgPSAnSW4gZmlsZSBpbmNsdWRlZCBmcm9tIFdl YkNvcmUvdW5pZmllZC1zb3VyY2VzL1VuaWZpZWRTb3VyY2UyNjMuY3BwOjQ6XG5JbWFnZUJ1ZmZl cklPU3VyZmFjZUJhY2tlbmQuY3BwOjEwODozMDogZXJyb3I6IGRlZmluaXRpb24gb2YgaW1wbGlj aXRseSBkZWNsYXJlZCBkZXN0cnVjdG9yJworICAgICAgICBleHBlY3RlZF9vdXRwdXQgPSAnSW1h Z2VCdWZmZXJJT1N1cmZhY2VCYWNrZW5kLmNwcDoxMDg6MzA6IGVycm9yOiBkZWZpbml0aW9uIG9m IGltcGxpY2l0bHkgZGVjbGFyZWQgZGVzdHJ1Y3RvcicKKyAgICAgICAgb3V0cHV0ID0gQW5hbHl6 ZUNvbXBpbGVXZWJLaXRSZXN1bHRzKCkuZmlsdGVyX2xvZ3NfY29udGFpbmluZ19lcnJvcihsb2dz KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGV4cGVjdGVkX291dHB1dCwgb3V0cHV0KQorCisg ICAgZGVmIHRlc3RfZmlsdGVyX2xvZ3NfY29udGFpbmluZ19lcnJvcl93aXRoX3Rvb19tYW55X2Vy cm9ycyhzZWxmKToKKyAgICAgICAgbG9ncyA9ICdFcnJvcjoxXG5FcnJvcjoyXG5lcnJvcjozXG5l cnJvcjo0XG5lcnJvcjo1XG5yYW5kb20tc3RyaW5nXG5lcnJvcjo2XG5lcnJvcjo3XG5lcnJvcjhc bmVycm9yOjlcbmVycm9yOjEwXG5lcnJvcjoxMVxuZXJyb3I6MTJcbmVycm9yOjEzJworICAgICAg ICBleHBlY3RlZF9vdXRwdXQgPSAnRXJyb3I6MVxuRXJyb3I6MlxuZXJyb3I6M1xuZXJyb3I6NFxu ZXJyb3I6NVxuZXJyb3I6NlxuZXJyb3I6N1xuZXJyb3I6OVxuZXJyb3I6MTBcbmVycm9yOjExJwor ICAgICAgICBvdXRwdXQgPSBBbmFseXplQ29tcGlsZVdlYktpdFJlc3VsdHMoKS5maWx0ZXJfbG9n c19jb250YWluaW5nX2Vycm9yKGxvZ3MpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZXhwZWN0 ZWRfb3V0cHV0LCBvdXRwdXQpCisKKyAgICBkZWYgdGVzdF9maWx0ZXJfbG9nc19jb250YWluaW5n X2Vycm9yX3dpdGhfbm9fZXJyb3Ioc2VsZik6CisgICAgICAgIGxvZ3MgPSAnQ29tcGlsZUMgL1Zv bHVtZXMvRGF0YS93b3JrZXIvbWFjT1MtTW9qYXZlLVJlbGVhc2UtQnVpbGQtRVdTJworICAgICAg ICBleHBlY3RlZF9vdXRwdXQgPSAnJworICAgICAgICBvdXRwdXQgPSBBbmFseXplQ29tcGlsZVdl YktpdFJlc3VsdHMoKS5maWx0ZXJfbG9nc19jb250YWluaW5nX2Vycm9yKGxvZ3MpCisgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoZXhwZWN0ZWRfb3V0cHV0LCBvdXRwdXQpCisKIAogY2xhc3MgVGVz dENvbXBpbGVKU0MoQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToK ICAgICBkZWYgc2V0VXAoc2VsZik6Cg==