203263 2019-10-22 12:47:23 -0700 [ews] Download the build archive from master when download from S3 fails 2021-01-25 10:18:50 -0800 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=197949 https://bugs.webkit.org/show_bug.cgi?id=203246 https://bugs.webkit.org/show_bug.cgi?id=220932 InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap jbedard webkit-bug-importer oldest_to_newest 1582494 0 aakash_jain 2019-10-22 12:47:23 -0700 [ews] Download the build archive from master when download from S3 fails. This would act as a fallback option when S3 is having problems (like it is having currently). 1582495 1 381585 aakash_jain 2019-10-22 12:55:30 -0700 Created attachment 381585 Patch 1582501 2 381585 jbedard 2019-10-22 13:04:53 -0700 Comment on attachment 381585 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=381585&action=review > Tools/BuildSlaveSupport/ews-build/steps.py:1313 > + if rc == FAILURE: Should this be rc != SUCCESS? > Tools/BuildSlaveSupport/ews-build/steps.py:1321 > + WithProperties(EWS_URL + 'ews-archives.webkit.org/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(patch_id)s.zip')] This looks wrong. It would resolve to 'https://ews-build.webkit.org/ews-archives.webkit.org/....' 1582508 3 381585 aakash_jain 2019-10-22 13:23:33 -0700 Comment on attachment 381585 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=381585&action=review >> Tools/BuildSlaveSupport/ews-build/steps.py:1313 >> + if rc == FAILURE: > > Should this be rc != SUCCESS? This is fine, we don't want to add that step in case of WARNINGS, SKIPPED or EXCEPTION. We use similar logic at other places as well, e.g.: https://trac.webkit.org/browser/webkit/trunk/Tools/BuildSlaveSupport/ews-build/steps.py#L108 >> Tools/BuildSlaveSupport/ews-build/steps.py:1321 >> + WithProperties(EWS_URL + 'ews-archives.webkit.org/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(patch_id)s.zip')] > > This looks wrong. It would resolve to 'https://ews-build.webkit.org/ews-archives.webkit.org/....' And that's why we have code-reviews. Thanks for noticing. Fixed in updated patch. 1582510 4 381587 aakash_jain 2019-10-22 13:23:44 -0700 Created attachment 381587 Patch 1582513 5 aakash_jain 2019-10-22 13:27:03 -0700 Sample run: https://ews-build.webkit-uat.org/#/builders/4/builds/12 1582526 6 aakash_jain 2019-10-22 13:40:09 -0700 Committed r251450: <https://trac.webkit.org/changeset/251450> 1582530 7 webkit-bug-importer 2019-10-22 13:41:18 -0700 <rdar://problem/56513673> 1582670 8 aakash_jain 2019-10-22 17:08:16 -0700 Deployed in production few hours back. Example of situation where this change helped: https://ews-build.webkit.org/#/builders/14/builds/5251 381585 2019-10-22 12:55:30 -0700 2019-10-22 13:23:41 -0700 Patch bug-203263-20191022155529.patch text/plain 6807 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MTQ0MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDE5LTEwLTIyICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBEb3dubG9hZCB0aGUgYnVpbGQgYXJjaGl2ZSBmcm9tIG1hc3Rl ciB3aGVuIGRvd25sb2FkIGZyb20gUzMgZmFpbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzI2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBz LnB5OgorICAgICAgICAoRG93bmxvYWRCdWlsdFByb2R1Y3QuZXZhbHVhdGVDb21tYW5kKToKKyAg ICAgICAgKERvd25sb2FkQnVpbHRQcm9kdWN0RnJvbU1hc3Rlcik6IEJ1aWxkIHN0ZXAgdG8gZG93 bmxvYWQgdGhlIGFyY2hpdmUgZnJvbSBidWlsZCBtYXN0ZXIuCisgICAgICAgIChEb3dubG9hZEJ1 aWx0UHJvZHVjdEZyb21NYXN0ZXIuZ2V0UmVzdWx0U3VtbWFyeSk6IEFkZGVkIGN1c3RvbSBmYWls dXJlIG1lc3NhZ2UuCisgICAgICAgIChEb3dubG9hZEJ1aWx0UHJvZHVjdEZyb21NYXN0ZXIuZXZh bHVhdGVDb21tYW5kKTogT3ZlcnJpZGVkIHRvIGVuc3VyZSBpdCBkb2Vzbid0IHVzZSB0aGlzIG1l dGhvZCBmcm9tIGJhc2UKKyAgICAgICAgY2xhc3MgRG93bmxvYWRCdWlsdFByb2R1Y3QuCisgICAg ICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5OiBBZGRl ZCB1bml0LXRlc3RzLgorCiAyMDE5LTEwLTIyICB5b3Vlbm4gZmFibGV0ICA8eW91ZW5uQGFwcGxl LmNvbT4KIAogICAgICAgICBSZW1vdmUgbWF5SGF2ZVNlcnZpY2VXb3JrZXJSZWdpc3RlcmVkRm9y T3JpZ2luCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5 CShyZXZpc2lvbiAyNTE0NDMpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQv c3RlcHMucHkJKHdvcmtpbmcgY29weSkKQEAgLTM2LDYgKzM2LDcgQEAgaW1wb3J0IHJlcXVlc3Rz CiAKIEJVR19TRVJWRVJfVVJMID0gJ2h0dHBzOi8vYnVncy53ZWJraXQub3JnLycKIFMzVVJMID0g J2h0dHBzOi8vczMtdXMtd2VzdC0yLmFtYXpvbmF3cy5jb20vJworRVdTX1VSTCA9ICdodHRwczov L2V3cy1idWlsZC53ZWJraXQub3JnLycKIFdpdGhQcm9wZXJ0aWVzID0gcHJvcGVydGllcy5XaXRo UHJvcGVydGllcwogSW50ZXJwb2xhdGUgPSBwcm9wZXJ0aWVzLkludGVycG9sYXRlCiAKQEAgLTEy OTcsOCArMTI5OCw3IEBAIGNsYXNzIERvd25sb2FkQnVpbHRQcm9kdWN0KHNoZWxsLlNoZWxsQ28K ICAgICBuYW1lID0gJ2Rvd25sb2FkLWJ1aWx0LXByb2R1Y3QnCiAgICAgZGVzY3JpcHRpb24gPSBb J2Rvd25sb2FkaW5nIGJ1aWx0IHByb2R1Y3QnXQogICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsnRG93 bmxvYWRlZCBidWlsdCBwcm9kdWN0J10KLSAgICBoYWx0T25GYWlsdXJlID0gVHJ1ZQotICAgIGZs dW5rT25GYWlsdXJlID0gVHJ1ZQorICAgIGZsdW5rT25GYWlsdXJlID0gRmFsc2UKIAogICAgIGRl ZiBnZXRSZXN1bHRTdW1tYXJ5KHNlbGYpOgogICAgICAgICBpZiBzZWxmLnJlc3VsdHMgIT0gU1VD Q0VTUzoKQEAgLTEzMDgsNiArMTMwOCwyOCBAQCBjbGFzcyBEb3dubG9hZEJ1aWx0UHJvZHVjdChz aGVsbC5TaGVsbENvCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsICoqa3dhcmdzKToKICAgICAgICAg c3VwZXIoRG93bmxvYWRCdWlsdFByb2R1Y3QsIHNlbGYpLl9faW5pdF9fKGxvZ0Vudmlyb249RmFs c2UsICoqa3dhcmdzKQogCisgICAgZGVmIGV2YWx1YXRlQ29tbWFuZChzZWxmLCBjbWQpOgorICAg ICAgICByYyA9IHNoZWxsLlNoZWxsQ29tbWFuZC5ldmFsdWF0ZUNvbW1hbmQoc2VsZiwgY21kKQor ICAgICAgICBpZiByYyA9PSBGQUlMVVJFOgorICAgICAgICAgICAgc2VsZi5idWlsZC5hZGRTdGVw c0FmdGVyQ3VycmVudFN0ZXAoW0Rvd25sb2FkQnVpbHRQcm9kdWN0RnJvbU1hc3RlcigpXSkKKyAg ICAgICAgcmV0dXJuIHJjCisKKworY2xhc3MgRG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVy KERvd25sb2FkQnVpbHRQcm9kdWN0KToKKyAgICBjb21tYW5kID0gWydweXRob24nLCAnVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvZG93bmxvYWQtYnVpbHQtcHJvZHVjdCcsCisgICAgICAgIFdpdGhQ cm9wZXJ0aWVzKCctLSUoY29uZmlndXJhdGlvbilzJyksCisgICAgICAgIFdpdGhQcm9wZXJ0aWVz KEVXU19VUkwgKyAnZXdzLWFyY2hpdmVzLndlYmtpdC5vcmcvJShmdWxsUGxhdGZvcm0pcy0lKGFy Y2hpdGVjdHVyZSlzLSUoY29uZmlndXJhdGlvbilzLyUocGF0Y2hfaWQpcy56aXAnKV0KKyAgICBo YWx0T25GYWlsdXJlID0gVHJ1ZQorICAgIGZsdW5rT25GYWlsdXJlID0gVHJ1ZQorCisgICAgZGVm IGdldFJlc3VsdFN1bW1hcnkoc2VsZik6CisgICAgICAgIGlmIHNlbGYucmVzdWx0cyAhPSBTVUND RVNTOgorICAgICAgICAgICAgcmV0dXJuIHt1J3N0ZXAnOiB1J0ZhaWxlZCB0byBkb3dubG9hZCBi dWlsdCBwcm9kdWN0IGZyb20gYnVpbGQgbWFzdGVyJ30KKyAgICAgICAgcmV0dXJuIHNoZWxsLlNo ZWxsQ29tbWFuZC5nZXRSZXN1bHRTdW1tYXJ5KHNlbGYpCisKKyAgICBkZWYgZXZhbHVhdGVDb21t YW5kKHNlbGYsIGNtZCk6CisgICAgICAgIHJldHVybiBzaGVsbC5TaGVsbENvbW1hbmQuZXZhbHVh dGVDb21tYW5kKHNlbGYsIGNtZCkKKwogCiBjbGFzcyBFeHRyYWN0QnVpbHRQcm9kdWN0KHNoZWxs LlNoZWxsQ29tbWFuZCk6CiAgICAgY29tbWFuZCA9IFsncHl0aG9uJywgJ1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZScsCkluZGV4OiBUb29scy9CdWlsZFNsYXZl U3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAy NTE0NDMpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRl c3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTM3LDcgKzM3LDcgQEAgZnJvbSB0d2lzdGVkLnRyaWFs IGltcG9ydCB1bml0dGVzdAogZnJvbSBzdGVwcyBpbXBvcnQgKEFuYWx5emVBUElUZXN0c1Jlc3Vs dHMsIEFuYWx5emVDb21waWxlV2ViS2l0UmVzdWx0cywgQW5hbHl6ZUxheW91dFRlc3RzUmVzdWx0 cywgQXBwbHlQYXRjaCwgQXBwbHlXYXRjaExpc3QsIEFyY2hpdmVCdWlsdFByb2R1Y3QsIEFyY2hp dmVUZXN0UmVzdWx0cywKICAgICAgICAgICAgICAgICAgICBDaGVja091dFNvdXJjZSwgQ2hlY2tP dXRTcGVjaWZpY1JldmlzaW9uLCBDaGVja1BhdGNoUmVsZXZhbmNlLCBDaGVja1N0eWxlLCBDbGVh bkJ1aWxkLCBDbGVhblVwR2l0SW5kZXhMb2NrLCBDbGVhbldvcmtpbmdEaXJlY3RvcnksCiAgICAg ICAgICAgICAgICAgICAgQ29tcGlsZUpTQywgQ29tcGlsZUpTQ1RvVCwgQ29tcGlsZVdlYktpdCwg Q29tcGlsZVdlYktpdFRvVCwgQ29uZmlndXJlQnVpbGQsCi0gICAgICAgICAgICAgICAgICAgRG93 bmxvYWRCdWlsdFByb2R1Y3QsIEV4dHJhY3RCdWlsdFByb2R1Y3QsIEV4dHJhY3RUZXN0UmVzdWx0 cywgSW5zdGFsbEd0a0RlcGVuZGVuY2llcywgSW5zdGFsbFdwZURlcGVuZGVuY2llcywgS2lsbE9s ZFByb2Nlc3NlcywKKyAgICAgICAgICAgICAgICAgICBEb3dubG9hZEJ1aWx0UHJvZHVjdCwgRG93 bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVyLCBFeHRyYWN0QnVpbHRQcm9kdWN0LCBFeHRyYWN0 VGVzdFJlc3VsdHMsIEluc3RhbGxHdGtEZXBlbmRlbmNpZXMsIEluc3RhbGxXcGVEZXBlbmRlbmNp ZXMsIEtpbGxPbGRQcm9jZXNzZXMsCiAgICAgICAgICAgICAgICAgICAgUHJpbnRDb25maWd1cmF0 aW9uLCBSZVJ1bkFQSVRlc3RzLCBSZVJ1bkphdmFTY3JpcHRDb3JlVGVzdHMsIFJlUnVuV2ViS2l0 VGVzdHMsIFJ1bkFQSVRlc3RzLCBSdW5BUElUZXN0c1dpdGhvdXRQYXRjaCwKICAgICAgICAgICAg ICAgICAgICBSdW5CaW5kaW5nc1Rlc3RzLCBSdW5CdWlsZFdlYktpdE9yZ1VuaXRUZXN0cywgUnVu RVdTQnVpbGRib3RDaGVja0NvbmZpZywgUnVuRVdTVW5pdFRlc3RzLCBSdW5KYXZhU2NyaXB0Q29y ZVRlc3RzLCBSdW5KYXZhU2NyaXB0Q29yZVRlc3RzVG9ULCBSdW5XZWJLaXQxVGVzdHMsCiAgICAg ICAgICAgICAgICAgICAgUnVuV2ViS2l0UGVybFRlc3RzLCBSdW5XZWJLaXRQeVRlc3RzLCBSdW5X ZWJLaXRUZXN0cywgVGVzdFdpdGhGYWlsdXJlQ291bnQsIFRyaWdnZXIsIFRyYW5zZmVyVG9TMywg VW5BcHBseVBhdGNoSWZSZXF1aXJlZCwKQEAgLTE3MjAsNiArMTcyMCw0OCBAQCBjbGFzcyBUZXN0 RG93bmxvYWRCdWlsdFByb2R1Y3QoQnVpbGRTdGVwCiAgICAgICAgIHJldHVybiBzZWxmLnJ1blN0 ZXAoKQogCiAKK2NsYXNzIFRlc3REb3dubG9hZEJ1aWx0UHJvZHVjdEZyb21NYXN0ZXIoQnVpbGRT dGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToKKyAgICBkZWYgc2V0VXAoc2Vs Zik6CisgICAgICAgIHNlbGYubG9uZ01lc3NhZ2UgPSBUcnVlCisgICAgICAgIHJldHVybiBzZWxm LnNldFVwQnVpbGRTdGVwKCkKKworICAgIGRlZiB0ZWFyRG93bihzZWxmKToKKyAgICAgICAgcmV0 dXJuIHNlbGYudGVhckRvd25CdWlsZFN0ZXAoKQorCisgICAgZGVmIHRlc3Rfc3VjY2VzcyhzZWxm KToKKyAgICAgICAgc2VsZi5zZXR1cFN0ZXAoRG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVy KCkpCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScsICdpb3Mtc2ltdWxh dG9yLTEyJykKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnY29uZmlndXJhdGlvbicsICdyZWxl YXNlJykKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnYXJjaGl0ZWN0dXJlJywgJ3g4Nl82NCcp CisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3BhdGNoX2lkJywgJzEyMzQnKQorICAgICAgICBz ZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAorICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rp cj0nd2tkaXInLAorICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKKyAg ICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydweXRob24nLCAnVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvZG93bmxvYWQtYnVpbHQtcHJvZHVjdCcsICctLXJlbGVhc2UnLCAnaHR0cHM6Ly9l d3MtYnVpbGQud2Via2l0Lm9yZy9ld3MtYXJjaGl2ZXMud2Via2l0Lm9yZy9pb3Mtc2ltdWxhdG9y LTEyLXg4Nl82NC1yZWxlYXNlLzEyMzQuemlwJ10sCisgICAgICAgICAgICAgICAgICAgICAgICAp CisgICAgICAgICAgICArIDAsCisgICAgICAgICkKKyAgICAgICAgc2VsZi5leHBlY3RPdXRjb21l KHJlc3VsdD1TVUNDRVNTLCBzdGF0ZV9zdHJpbmc9J0Rvd25sb2FkZWQgYnVpbHQgcHJvZHVjdCcp CisgICAgICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQorCisgICAgZGVmIHRlc3RfZmFpbHVyZShz ZWxmKToKKyAgICAgICAgc2VsZi5zZXR1cFN0ZXAoRG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFz dGVyKCkpCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScsICdtYWMtc2ll cnJhJykKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnY29uZmlndXJhdGlvbicsICdkZWJ1Zycp CisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2FyY2hpdGVjdHVyZScsICd4ODZfNjQnKQorICAg ICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaF9pZCcsICcxMjM0NTYnKQorICAgICAgICBzZWxm LmV4cGVjdFJlbW90ZUNvbW1hbmRzKAorICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0n d2tkaXInLAorICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKKyAgICAg ICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydweXRob24nLCAnVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvZG93bmxvYWQtYnVpbHQtcHJvZHVjdCcsICctLWRlYnVnJywgJ2h0dHBzOi8vZXdzLWJ1 aWxkLndlYmtpdC5vcmcvZXdzLWFyY2hpdmVzLndlYmtpdC5vcmcvbWFjLXNpZXJyYS14ODZfNjQt ZGVidWcvMTIzNDU2LnppcCddLAorICAgICAgICAgICAgICAgICAgICAgICAgKQorICAgICAgICAg ICAgKyBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PSdVbmV4cGVjdGVkIGZhaWx1cmUu JykKKyAgICAgICAgICAgICsgMiwKKyAgICAgICAgKQorICAgICAgICBzZWxmLmV4cGVjdE91dGNv bWUocmVzdWx0PUZBSUxVUkUsIHN0YXRlX3N0cmluZz0nRmFpbGVkIHRvIGRvd25sb2FkIGJ1aWx0 IHByb2R1Y3QgZnJvbSBidWlsZCBtYXN0ZXInKQorICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVw KCkKKworCiBjbGFzcyBUZXN0RXh0cmFjdEJ1aWx0UHJvZHVjdChCdWlsZFN0ZXBNaXhpbkFkZGl0 aW9ucywgdW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiBzZXRVcChzZWxmKToKICAgICAgICAg c2VsZi5sb25nTWVzc2FnZSA9IFRydWUK 381587 2019-10-22 13:23:44 -0700 2019-10-22 13:35:41 -0700 Patch bug-203263-20191022162343.patch text/plain 6762 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MTQ0MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDE5LTEwLTIyICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBEb3dubG9hZCB0aGUgYnVpbGQgYXJjaGl2ZSBmcm9tIG1hc3Rl ciB3aGVuIGRvd25sb2FkIGZyb20gUzMgZmFpbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzI2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBz LnB5OgorICAgICAgICAoRG93bmxvYWRCdWlsdFByb2R1Y3QuZXZhbHVhdGVDb21tYW5kKToKKyAg ICAgICAgKERvd25sb2FkQnVpbHRQcm9kdWN0RnJvbU1hc3Rlcik6IEJ1aWxkIHN0ZXAgdG8gZG93 bmxvYWQgdGhlIGFyY2hpdmUgZnJvbSBidWlsZCBtYXN0ZXIuCisgICAgICAgIChEb3dubG9hZEJ1 aWx0UHJvZHVjdEZyb21NYXN0ZXIuZ2V0UmVzdWx0U3VtbWFyeSk6IEFkZGVkIGN1c3RvbSBmYWls dXJlIG1lc3NhZ2UuCisgICAgICAgIChEb3dubG9hZEJ1aWx0UHJvZHVjdEZyb21NYXN0ZXIuZXZh bHVhdGVDb21tYW5kKTogT3ZlcnJpZGVkIHRvIGVuc3VyZSBpdCBkb2Vzbid0IHVzZSB0aGlzIG1l dGhvZCBmcm9tIGJhc2UKKyAgICAgICAgY2xhc3MgRG93bmxvYWRCdWlsdFByb2R1Y3QuCisgICAg ICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5OiBBZGRl ZCB1bml0LXRlc3RzLgorCiAyMDE5LTEwLTIyICB5b3Vlbm4gZmFibGV0ICA8eW91ZW5uQGFwcGxl LmNvbT4KIAogICAgICAgICBSZW1vdmUgbWF5SGF2ZVNlcnZpY2VXb3JrZXJSZWdpc3RlcmVkRm9y T3JpZ2luCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5 CShyZXZpc2lvbiAyNTE0NDMpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQv c3RlcHMucHkJKHdvcmtpbmcgY29weSkKQEAgLTM2LDYgKzM2LDcgQEAgaW1wb3J0IHJlcXVlc3Rz CiAKIEJVR19TRVJWRVJfVVJMID0gJ2h0dHBzOi8vYnVncy53ZWJraXQub3JnLycKIFMzVVJMID0g J2h0dHBzOi8vczMtdXMtd2VzdC0yLmFtYXpvbmF3cy5jb20vJworRVdTX1VSTCA9ICdodHRwczov L2V3cy1idWlsZC53ZWJraXQub3JnLycKIFdpdGhQcm9wZXJ0aWVzID0gcHJvcGVydGllcy5XaXRo UHJvcGVydGllcwogSW50ZXJwb2xhdGUgPSBwcm9wZXJ0aWVzLkludGVycG9sYXRlCiAKQEAgLTEy OTcsOCArMTI5OCw3IEBAIGNsYXNzIERvd25sb2FkQnVpbHRQcm9kdWN0KHNoZWxsLlNoZWxsQ28K ICAgICBuYW1lID0gJ2Rvd25sb2FkLWJ1aWx0LXByb2R1Y3QnCiAgICAgZGVzY3JpcHRpb24gPSBb J2Rvd25sb2FkaW5nIGJ1aWx0IHByb2R1Y3QnXQogICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsnRG93 bmxvYWRlZCBidWlsdCBwcm9kdWN0J10KLSAgICBoYWx0T25GYWlsdXJlID0gVHJ1ZQotICAgIGZs dW5rT25GYWlsdXJlID0gVHJ1ZQorICAgIGZsdW5rT25GYWlsdXJlID0gRmFsc2UKIAogICAgIGRl ZiBnZXRSZXN1bHRTdW1tYXJ5KHNlbGYpOgogICAgICAgICBpZiBzZWxmLnJlc3VsdHMgIT0gU1VD Q0VTUzoKQEAgLTEzMDgsNiArMTMwOCwyOCBAQCBjbGFzcyBEb3dubG9hZEJ1aWx0UHJvZHVjdChz aGVsbC5TaGVsbENvCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsICoqa3dhcmdzKToKICAgICAgICAg c3VwZXIoRG93bmxvYWRCdWlsdFByb2R1Y3QsIHNlbGYpLl9faW5pdF9fKGxvZ0Vudmlyb249RmFs c2UsICoqa3dhcmdzKQogCisgICAgZGVmIGV2YWx1YXRlQ29tbWFuZChzZWxmLCBjbWQpOgorICAg ICAgICByYyA9IHNoZWxsLlNoZWxsQ29tbWFuZC5ldmFsdWF0ZUNvbW1hbmQoc2VsZiwgY21kKQor ICAgICAgICBpZiByYyA9PSBGQUlMVVJFOgorICAgICAgICAgICAgc2VsZi5idWlsZC5hZGRTdGVw c0FmdGVyQ3VycmVudFN0ZXAoW0Rvd25sb2FkQnVpbHRQcm9kdWN0RnJvbU1hc3RlcigpXSkKKyAg ICAgICAgcmV0dXJuIHJjCisKKworY2xhc3MgRG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVy KERvd25sb2FkQnVpbHRQcm9kdWN0KToKKyAgICBjb21tYW5kID0gWydweXRob24nLCAnVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvZG93bmxvYWQtYnVpbHQtcHJvZHVjdCcsCisgICAgICAgIFdpdGhQ cm9wZXJ0aWVzKCctLSUoY29uZmlndXJhdGlvbilzJyksCisgICAgICAgIFdpdGhQcm9wZXJ0aWVz KEVXU19VUkwgKyAnYXJjaGl2ZXMvJShmdWxsUGxhdGZvcm0pcy0lKGFyY2hpdGVjdHVyZSlzLSUo Y29uZmlndXJhdGlvbilzLyUocGF0Y2hfaWQpcy56aXAnKV0KKyAgICBoYWx0T25GYWlsdXJlID0g VHJ1ZQorICAgIGZsdW5rT25GYWlsdXJlID0gVHJ1ZQorCisgICAgZGVmIGdldFJlc3VsdFN1bW1h cnkoc2VsZik6CisgICAgICAgIGlmIHNlbGYucmVzdWx0cyAhPSBTVUNDRVNTOgorICAgICAgICAg ICAgcmV0dXJuIHt1J3N0ZXAnOiB1J0ZhaWxlZCB0byBkb3dubG9hZCBidWlsdCBwcm9kdWN0IGZy b20gYnVpbGQgbWFzdGVyJ30KKyAgICAgICAgcmV0dXJuIHNoZWxsLlNoZWxsQ29tbWFuZC5nZXRS ZXN1bHRTdW1tYXJ5KHNlbGYpCisKKyAgICBkZWYgZXZhbHVhdGVDb21tYW5kKHNlbGYsIGNtZCk6 CisgICAgICAgIHJldHVybiBzaGVsbC5TaGVsbENvbW1hbmQuZXZhbHVhdGVDb21tYW5kKHNlbGYs IGNtZCkKKwogCiBjbGFzcyBFeHRyYWN0QnVpbHRQcm9kdWN0KHNoZWxsLlNoZWxsQ29tbWFuZCk6 CiAgICAgY29tbWFuZCA9IFsncHl0aG9uJywgJ1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWx0 LXByb2R1Y3QtYXJjaGl2ZScsCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVp bGQvc3RlcHNfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNTE0NDMpCisrKyBUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkJKHdvcmtpbmcg Y29weSkKQEAgLTM3LDcgKzM3LDcgQEAgZnJvbSB0d2lzdGVkLnRyaWFsIGltcG9ydCB1bml0dGVz dAogZnJvbSBzdGVwcyBpbXBvcnQgKEFuYWx5emVBUElUZXN0c1Jlc3VsdHMsIEFuYWx5emVDb21w aWxlV2ViS2l0UmVzdWx0cywgQW5hbHl6ZUxheW91dFRlc3RzUmVzdWx0cywgQXBwbHlQYXRjaCwg QXBwbHlXYXRjaExpc3QsIEFyY2hpdmVCdWlsdFByb2R1Y3QsIEFyY2hpdmVUZXN0UmVzdWx0cywK ICAgICAgICAgICAgICAgICAgICBDaGVja091dFNvdXJjZSwgQ2hlY2tPdXRTcGVjaWZpY1Jldmlz aW9uLCBDaGVja1BhdGNoUmVsZXZhbmNlLCBDaGVja1N0eWxlLCBDbGVhbkJ1aWxkLCBDbGVhblVw R2l0SW5kZXhMb2NrLCBDbGVhbldvcmtpbmdEaXJlY3RvcnksCiAgICAgICAgICAgICAgICAgICAg Q29tcGlsZUpTQywgQ29tcGlsZUpTQ1RvVCwgQ29tcGlsZVdlYktpdCwgQ29tcGlsZVdlYktpdFRv VCwgQ29uZmlndXJlQnVpbGQsCi0gICAgICAgICAgICAgICAgICAgRG93bmxvYWRCdWlsdFByb2R1 Y3QsIEV4dHJhY3RCdWlsdFByb2R1Y3QsIEV4dHJhY3RUZXN0UmVzdWx0cywgSW5zdGFsbEd0a0Rl cGVuZGVuY2llcywgSW5zdGFsbFdwZURlcGVuZGVuY2llcywgS2lsbE9sZFByb2Nlc3NlcywKKyAg ICAgICAgICAgICAgICAgICBEb3dubG9hZEJ1aWx0UHJvZHVjdCwgRG93bmxvYWRCdWlsdFByb2R1 Y3RGcm9tTWFzdGVyLCBFeHRyYWN0QnVpbHRQcm9kdWN0LCBFeHRyYWN0VGVzdFJlc3VsdHMsIElu c3RhbGxHdGtEZXBlbmRlbmNpZXMsIEluc3RhbGxXcGVEZXBlbmRlbmNpZXMsIEtpbGxPbGRQcm9j ZXNzZXMsCiAgICAgICAgICAgICAgICAgICAgUHJpbnRDb25maWd1cmF0aW9uLCBSZVJ1bkFQSVRl c3RzLCBSZVJ1bkphdmFTY3JpcHRDb3JlVGVzdHMsIFJlUnVuV2ViS2l0VGVzdHMsIFJ1bkFQSVRl c3RzLCBSdW5BUElUZXN0c1dpdGhvdXRQYXRjaCwKICAgICAgICAgICAgICAgICAgICBSdW5CaW5k aW5nc1Rlc3RzLCBSdW5CdWlsZFdlYktpdE9yZ1VuaXRUZXN0cywgUnVuRVdTQnVpbGRib3RDaGVj a0NvbmZpZywgUnVuRVdTVW5pdFRlc3RzLCBSdW5KYXZhU2NyaXB0Q29yZVRlc3RzLCBSdW5KYXZh U2NyaXB0Q29yZVRlc3RzVG9ULCBSdW5XZWJLaXQxVGVzdHMsCiAgICAgICAgICAgICAgICAgICAg UnVuV2ViS2l0UGVybFRlc3RzLCBSdW5XZWJLaXRQeVRlc3RzLCBSdW5XZWJLaXRUZXN0cywgVGVz dFdpdGhGYWlsdXJlQ291bnQsIFRyaWdnZXIsIFRyYW5zZmVyVG9TMywgVW5BcHBseVBhdGNoSWZS ZXF1aXJlZCwKQEAgLTE3MjAsNiArMTcyMCw0OCBAQCBjbGFzcyBUZXN0RG93bmxvYWRCdWlsdFBy b2R1Y3QoQnVpbGRTdGVwCiAgICAgICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQogCiAKK2NsYXNz IFRlc3REb3dubG9hZEJ1aWx0UHJvZHVjdEZyb21NYXN0ZXIoQnVpbGRTdGVwTWl4aW5BZGRpdGlv bnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToKKyAgICBkZWYgc2V0VXAoc2VsZik6CisgICAgICAgIHNl bGYubG9uZ01lc3NhZ2UgPSBUcnVlCisgICAgICAgIHJldHVybiBzZWxmLnNldFVwQnVpbGRTdGVw KCkKKworICAgIGRlZiB0ZWFyRG93bihzZWxmKToKKyAgICAgICAgcmV0dXJuIHNlbGYudGVhckRv d25CdWlsZFN0ZXAoKQorCisgICAgZGVmIHRlc3Rfc3VjY2VzcyhzZWxmKToKKyAgICAgICAgc2Vs Zi5zZXR1cFN0ZXAoRG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVyKCkpCisgICAgICAgIHNl bGYuc2V0UHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScsICdpb3Mtc2ltdWxhdG9yLTEyJykKKyAgICAg ICAgc2VsZi5zZXRQcm9wZXJ0eSgnY29uZmlndXJhdGlvbicsICdyZWxlYXNlJykKKyAgICAgICAg c2VsZi5zZXRQcm9wZXJ0eSgnYXJjaGl0ZWN0dXJlJywgJ3g4Nl82NCcpCisgICAgICAgIHNlbGYu c2V0UHJvcGVydHkoJ3BhdGNoX2lkJywgJzEyMzQnKQorICAgICAgICBzZWxmLmV4cGVjdFJlbW90 ZUNvbW1hbmRzKAorICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAorICAg ICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKKyAgICAgICAgICAgICAgICAg ICAgICAgIGNvbW1hbmQ9WydweXRob24nLCAnVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZG93bmxv YWQtYnVpbHQtcHJvZHVjdCcsICctLXJlbGVhc2UnLCAnaHR0cHM6Ly9ld3MtYnVpbGQud2Via2l0 Lm9yZy9hcmNoaXZlcy9pb3Mtc2ltdWxhdG9yLTEyLXg4Nl82NC1yZWxlYXNlLzEyMzQuemlwJ10s CisgICAgICAgICAgICAgICAgICAgICAgICApCisgICAgICAgICAgICArIDAsCisgICAgICAgICkK KyAgICAgICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1TVUNDRVNTLCBzdGF0ZV9zdHJpbmc9 J0Rvd25sb2FkZWQgYnVpbHQgcHJvZHVjdCcpCisgICAgICAgIHJldHVybiBzZWxmLnJ1blN0ZXAo KQorCisgICAgZGVmIHRlc3RfZmFpbHVyZShzZWxmKToKKyAgICAgICAgc2VsZi5zZXR1cFN0ZXAo RG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVyKCkpCisgICAgICAgIHNlbGYuc2V0UHJvcGVy dHkoJ2Z1bGxQbGF0Zm9ybScsICdtYWMtc2llcnJhJykKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0 eSgnY29uZmlndXJhdGlvbicsICdkZWJ1ZycpCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2Fy Y2hpdGVjdHVyZScsICd4ODZfNjQnKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaF9p ZCcsICcxMjM0NTYnKQorICAgICAgICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAorICAgICAg ICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAorICAgICAgICAgICAgICAgICAgICAg ICAgbG9nRW52aXJvbj1GYWxzZSwKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9Wydw eXRob24nLCAnVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZG93bmxvYWQtYnVpbHQtcHJvZHVjdCcs ICctLWRlYnVnJywgJ2h0dHBzOi8vZXdzLWJ1aWxkLndlYmtpdC5vcmcvYXJjaGl2ZXMvbWFjLXNp ZXJyYS14ODZfNjQtZGVidWcvMTIzNDU2LnppcCddLAorICAgICAgICAgICAgICAgICAgICAgICAg KQorICAgICAgICAgICAgKyBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PSdVbmV4cGVj dGVkIGZhaWx1cmUuJykKKyAgICAgICAgICAgICsgMiwKKyAgICAgICAgKQorICAgICAgICBzZWxm LmV4cGVjdE91dGNvbWUocmVzdWx0PUZBSUxVUkUsIHN0YXRlX3N0cmluZz0nRmFpbGVkIHRvIGRv d25sb2FkIGJ1aWx0IHByb2R1Y3QgZnJvbSBidWlsZCBtYXN0ZXInKQorICAgICAgICByZXR1cm4g c2VsZi5ydW5TdGVwKCkKKworCiBjbGFzcyBUZXN0RXh0cmFjdEJ1aWx0UHJvZHVjdChCdWlsZFN0 ZXBNaXhpbkFkZGl0aW9ucywgdW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiBzZXRVcChzZWxm KToKICAgICAgICAgc2VsZi5sb25nTWVzc2FnZSA9IFRydWUK