32679 2009-12-17 14:44:46 -0800 commit-queue should check commit-queue+ again just before committing 2010-09-20 17:05:53 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 46138 1 eric webkit-unassigned abarth abecsi commit-queue ossy oldest_to_newest 172958 0 eric 2009-12-17 14:44:46 -0800 commit-queue should check commit-queue+ again just before committing Right now once you set commit-queue+ once the bot sees your cq+ (which could be immediately, or could be hours from now), the moment it starts the landing process, it can't be stopped, except by my intervention. We should make it check the bug to validate that the patch is still cq+ just before doing the actual commit. This makes it possible for people to cancel commits more reliably. 172959 1 eric 2009-12-17 14:50:05 -0800 It could also check to make sure the bots are still green just before committing. 262862 2 eric 2010-08-10 14:44:00 -0700 *** Bug 43810 has been marked as a duplicate of this bug. *** 281759 3 68125 eric 2010-09-20 12:53:11 -0700 Created attachment 68125 Patch 281763 4 68125 abarth 2010-09-20 13:00:17 -0700 Comment on attachment 68125 Patch great. :) 281785 5 68125 commit-queue 2010-09-20 13:49:33 -0700 Comment on attachment 68125 Patch Clearing flags on attachment: 68125 Committed r67880: <http://trac.webkit.org/changeset/67880> 281786 6 commit-queue 2010-09-20 13:49:39 -0700 All reviewed patches have been landed. Closing bug. 281793 7 68125 commit-queue 2010-09-20 13:53:46 -0700 Comment on attachment 68125 Patch Rejecting patch 68125 from commit-queue. Failed to run "[u'/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--force']" exit_code: 1 Last 500 characters of output: atching file WebKitTools/Scripts/webkitpy/tool/commands/queuestest.py Hunk #1 FAILED at 45. 1 out of 1 hunk FAILED -- saving rejects to file WebKitTools/Scripts/webkitpy/tool/commands/queuestest.py.rej patching file WebKitTools/Scripts/webkitpy/tool/mocktool.py Hunk #1 FAILED at 161. Hunk #2 FAILED at 170. Hunk #3 FAILED at 179. Hunk #4 FAILED at 188. Hunk #5 FAILED at 258. Hunk #6 FAILED at 281. 6 out of 6 hunks FAILED -- saving rejects to file WebKitTools/Scripts/webkitpy/tool/mocktool.py.rej Full output: http://queues.webkit.org/results/4099004 281802 8 eric 2010-09-20 14:05:38 -0700 The irony! 68125 2010-09-20 12:53:11 -0700 2010-09-20 13:53:46 -0700 Patch bug-32679-20100920125310.patch text/plain 21099 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0ODUwM2U0ZDBjZTRiN2ZkMjVmY2Y3NGI1OGMwYzdjZWFjMzYzYzRhLi42OWRmOGUw ZmUyYWMzZDc2ZGFhNzU1MDdkZDUyNTFkMDJlNTVmYTE5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAK KzIwMTAtMDktMjAgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNvbW1pdC1xdWV1ZSBzaG91bGQg Y2hlY2sgY29tbWl0LXF1ZXVlKyBhZ2FpbiBqdXN0IGJlZm9yZSBjb21taXR0aW5nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjY3OQorCisgICAgICAg IEFkZGVkIGEgX3JldmFsaWRhdGVfcGF0Y2ggY2hlY2ssIHJpZ2h0IGJlZm9yZSBsYW5kaW5nLgor CisgICAgICAgIFNpbmNlIF9yZXZhbGlkYXRlX3BhdGNoIHBhc3NlcyB0aGUgcGF0Y2hfaWQgZnJv bSB0aGUgd29yayBpdGVtCisgICAgICAgIGJhY2sgdG8gYnVnemlsbGEsIEkgaGFkIHRvIGZpeCBh bGwgb2YgdGhlIHByZXZpb3VzIHF1ZXVlIHRlc3RzIHRvCisgICAgICAgIHVzZSB2YWxpZCBhdHRh Y2htZW50IGlkcyAodGhhdCdzIHRoZSBtYWpvcml0eSBvZiB0aGlzIGNoYW5nZSkuCisKKyAgICAg ICAgSW4gb3JkZXIgdG8gdmFsaWRhdGUgdGhhdCB0aGUgYnVnIHdhcyBzdGlsbCBvcGVuLCBJIGhh ZCB0byB0ZWFjaAorICAgICAgICBidWd6aWxsYS5CdWcgYWJvdXQgb3Blbi9jbG9zZWQgc3RhdGVz LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhLnB5Ogor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0 ZW1fdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRz L3F1ZXVlcy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVl dWVzX3VuaXR0ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5k cy9xdWV1ZXN0ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9tb2NrdG9v bC5weToKKwogMjAxMC0wOS0xOSAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEFuZGVycyBDYXJsc3Nvbi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS5weSBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS5weQppbmRleCAyYjIyNThlOWZlZGNl NTFhMWM4NGEyODhjMTE3YzcyMzJhNjQzOGZlLi43ZTE3ZTNiOTFkMDBmMDY0YTQwZGI3ZDhkMmM5 NDA4ODc1ODc1YmY2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9uZXQvYnVnemlsbGEucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vbmV0L2J1Z3ppbGxhLnB5CkBAIC0xNzUsNiArMTc1LDIwIEBAIGNsYXNzIEJ1ZyhvYmpl Y3QpOgogICAgIGRlZiBpc191bmFzc2lnbmVkKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5h c3NpZ25lZF90b19lbWFpbCgpIGluIHNlbGYudW5hc3NpZ25lZF9lbWFpbHMKIAorICAgIGRlZiBz dGF0dXMoc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLmJ1Z19kaWN0aW9uYXJ5WyJidWdfc3Rh dHVzIl0KKworICAgICMgQnVnemlsbGEgaGFzIG1hbnkgc3RhdHVzIHN0YXRlcyB3ZSBkb24ndCBy ZWFsbHkgdXNlIGluIFdlYktpdDoKKyAgICAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3BhZ2Uu Y2dpP2lkPWZpZWxkcy5odG1sI3N0YXR1cworICAgIF9vcGVuX3N0YXRlcyA9IFsiVU5DT05GSVJN RUQiLCAiTkVXIiwgIkFTU0lHTkVEIiwgIlJFT1BFTkVEIl0KKyAgICBfY2xvc2VkX3N0YXRlcyA9 IFsiUkVTT0xWRUQiLCAiVkVSSUZJRUQiLCAiQ0xPU0VEIl0KKworICAgIGRlZiBpc19vcGVuKHNl bGYpOgorICAgICAgICByZXR1cm4gc2VsZi5zdGF0dXMoKSBpbiBzZWxmLl9vcGVuX3N0YXRlcwor CisgICAgZGVmIGlzX2Nsb3NlZChzZWxmKToKKyAgICAgICAgcmV0dXJuIG5vdCBzZWxmLmlzX29w ZW4oKQorCiAgICAgIyBSYXJlbHkgZG8gd2UgYWN0dWFsbHkgd2FudCBvYnNvbGV0ZSBhdHRhY2ht ZW50cwogICAgIGRlZiBhdHRhY2htZW50cyhzZWxmLCBpbmNsdWRlX29ic29sZXRlPUZhbHNlKToK ICAgICAgICAgYXR0YWNobWVudHMgPSBzZWxmLmJ1Z19kaWN0aW9uYXJ5WyJhdHRhY2htZW50cyJd CkBAIC0zNTcsMTUgKzM3MSwxNCBAQCBjbGFzcyBDb21taXR0ZXJWYWxpZGF0b3Iob2JqZWN0KToK ICAgICAgICAgICAgIHJldHVybiBGYWxzZQogICAgICAgICByZXR1cm4gVHJ1ZQogCisgICAgZGVm IF9yZWplY3RfcGF0Y2hfaWZfZmxhZ3NfYXJlX2ludmFsaWQoc2VsZiwgcGF0Y2gpOgorICAgICAg ICByZXR1cm4gKHNlbGYuX3ZhbGlkYXRlX3NldHRlcl9lbWFpbCgKKyAgICAgICAgICAgICAgICBw YXRjaCwgInJldmlld2VyIiwgc2VsZi5yZWplY3RfcGF0Y2hfZnJvbV9yZXZpZXdfcXVldWUpCisg ICAgICAgICAgICBhbmQgc2VsZi5fdmFsaWRhdGVfc2V0dGVyX2VtYWlsKAorICAgICAgICAgICAg ICAgIHBhdGNoLCAiY29tbWl0dGVyIiwgc2VsZi5yZWplY3RfcGF0Y2hfZnJvbV9jb21taXRfcXVl dWUpKQorCiAgICAgZGVmIHBhdGNoZXNfYWZ0ZXJfcmVqZWN0aW5nX2ludmFsaWRfY29tbWl0ZXJz X2FuZF9yZXZpZXdlcnMoc2VsZiwgcGF0Y2hlcyk6Ci0gICAgICAgIHZhbGlkYXRlZF9wYXRjaGVz ID0gW10KLSAgICAgICAgZm9yIHBhdGNoIGluIHBhdGNoZXM6Ci0gICAgICAgICAgICBpZiAoc2Vs Zi5fdmFsaWRhdGVfc2V0dGVyX2VtYWlsKAotICAgICAgICAgICAgICAgICAgICBwYXRjaCwgInJl dmlld2VyIiwgc2VsZi5yZWplY3RfcGF0Y2hfZnJvbV9yZXZpZXdfcXVldWUpCi0gICAgICAgICAg ICAgICAgYW5kIHNlbGYuX3ZhbGlkYXRlX3NldHRlcl9lbWFpbCgKLSAgICAgICAgICAgICAgICAg ICAgcGF0Y2gsICJjb21taXR0ZXIiLCBzZWxmLnJlamVjdF9wYXRjaF9mcm9tX2NvbW1pdF9xdWV1 ZSkpOgotICAgICAgICAgICAgICAgIHZhbGlkYXRlZF9wYXRjaGVzLmFwcGVuZChwYXRjaCkKLSAg ICAgICAgcmV0dXJuIHZhbGlkYXRlZF9wYXRjaGVzCisgICAgICAgIHJldHVybiBbcGF0Y2ggZm9y IHBhdGNoIGluIHBhdGNoZXMgaWYgc2VsZi5fcmVqZWN0X3BhdGNoX2lmX2ZsYWdzX2FyZV9pbnZh bGlkKHBhdGNoKV0KIAogICAgIGRlZiByZWplY3RfcGF0Y2hfZnJvbV9jb21taXRfcXVldWUoc2Vs ZiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGF0dGFjaG1lbnRfaWQs CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMv ZWFybHl3YXJuaW5nc3lzdGVtX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS90b29sL2NvbW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbV91bml0dGVzdC5weQppbmRleCBh MDExMzUxN2U4ODI2OGYyNDRmMzRjMmVkY2QzOGZjMDViZGRiNDU5Li4zYjBlYTQ3YjljOWE4NjFj ZDQ1MGEwMDQ2NzhhOThkMjhiNmUzOTQ2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZWFybHl3YXJuaW5nc3lzdGVtX3VuaXR0ZXN0LnB5Cisr KyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5p bmdzeXN0ZW1fdW5pdHRlc3QucHkKQEAgLTUwLDcgKzUwLDcgQEAgY2xhc3MgRWFybHlXYXJuaW5n U3l0ZW1UZXN0KFF1ZXVlc1Rlc3QpOgogICAgICAgICAgICAgImhhbmRsZV91bmV4cGVjdGVkX2Vy cm9yIjogIk1vY2sgZXJyb3IgbWVzc2FnZVxuIiwKICAgICAgICAgICAgICJuZXh0X3dvcmtfaXRl bSI6ICJNT0NLOiB1cGRhdGVfd29ya19pdGVtczogJShuYW1lKXMgWzEwM11cbiIgJSBzdHJpbmdf cmVwbGFjZW1udHMsCiAgICAgICAgICAgICAicHJvY2Vzc193b3JrX2l0ZW0iOiAiTU9DSzogdXBk YXRlX3N0YXR1czogJShuYW1lKXMgUGFzc1xuIiAlIHN0cmluZ19yZXBsYWNlbW50cywKLSAgICAg ICAgICAgICJoYW5kbGVfc2NyaXB0X2Vycm9yIjogIk1PQ0s6IHVwZGF0ZV9zdGF0dXM6ICUobmFt ZSlzIFNjcmlwdEVycm9yIGVycm9yIG1lc3NhZ2Vcbk1PQ0sgYnVnIGNvbW1lbnQ6IGJ1Z19pZD0z NDUsIGNjPSUod2F0Y2hlcnMpc1xuLS0tIEJlZ2luIGNvbW1lbnQgLS0tXFxBdHRhY2htZW50IDEy MzQgZGlkIG5vdCBidWlsZCBvbiAlKHBvcnQpczpcbkJ1aWxkIG91dHB1dDogaHR0cDovL2R1bW15 X3VybFxuLS0tIEVuZCBjb21tZW50IC0tLVxuXG4iICUgc3RyaW5nX3JlcGxhY2VtbnRzLAorICAg ICAgICAgICAgImhhbmRsZV9zY3JpcHRfZXJyb3IiOiAiTU9DSzogdXBkYXRlX3N0YXR1czogJShu YW1lKXMgU2NyaXB0RXJyb3IgZXJyb3IgbWVzc2FnZVxuTU9DSyBidWcgY29tbWVudDogYnVnX2lk PTE0MiwgY2M9JSh3YXRjaGVycylzXG4tLS0gQmVnaW4gY29tbWVudCAtLS1cXEF0dGFjaG1lbnQg MTk3IGRpZCBub3QgYnVpbGQgb24gJShwb3J0KXM6XG5CdWlsZCBvdXRwdXQ6IGh0dHA6Ly9kdW1t eV91cmxcbi0tLSBFbmQgY29tbWVudCAtLS1cblxuIiAlIHN0cmluZ19yZXBsYWNlbW50cywKICAg ICAgICAgfQogICAgICAgICByZXR1cm4gZXhwZWN0ZWRfc3RkZXJyCiAKZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHkgYi9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzLnB5CmluZGV4IDg5 OTI0MDdkN2JlZTJjMGU3NDRhOWY2ODJjZDVmODUwNDZjNDNlZTguLmJjOWVlNDI1ZmExMmQ2NDgy ZjQ5OTU3OTEyZDUyOTM1YzA2ODkzMDkgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXVlcy5weQpAQCAtMTE5LDggKzExOSw4IEBAIGNs YXNzIEFic3RyYWN0UXVldWUoQ29tbWFuZCwgUXVldWVFbmdpbmVEZWxlZ2F0ZSk6CiAgICAgIyBD b21tYW5kIG1ldGhvZHMKIAogICAgIGRlZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRv b2wsIGVuZ2luZT1RdWV1ZUVuZ2luZSk6Ci0gICAgICAgIHNlbGYub3B0aW9ucyA9IG9wdGlvbnMK LSAgICAgICAgc2VsZi50b29sID0gdG9vbAorICAgICAgICBzZWxmLm9wdGlvbnMgPSBvcHRpb25z ICAjIEZJWE1FOiBUaGlzIGNvZGUgaXMgd3JvbmcuICBDb21tYW5kLm9wdGlvbnMgaXMgYSBsaXN0 LCB0aGlzIGFzc3VtZXMgYW4gT3B0aW9ucyBlbGVtZW50IQorICAgICAgICBzZWxmLnRvb2wgPSB0 b29sICAjIEZJWE1FOiBUaGlzIGNvZGUgaXMgd3JvbmcgdG9vISAgQ29tbWFuZC5iaW5kX3RvX3Rv b2wgaGFuZGxlcyB0aGlzIQogICAgICAgICByZXR1cm4gZW5naW5lKHNlbGYubmFtZSwgc2VsZiwg c2VsZi50b29sLndha2V1cF9ldmVudCkucnVuKCkKIAogICAgIEBjbGFzc21ldGhvZApAQCAtMjcz LDYgKzI3MywxOSBAQCBjbGFzcyBDb21taXRRdWV1ZShBYnN0cmFjdFBhdGNoUXVldWUsIFN0ZXBT ZXF1ZW5jZUVycm9ySGFuZGxlcik6CiAgICAgICAgICAgICBzZWxmLl9kaWRfZmFpbChwYXRjaCkK ICAgICAgICAgICAgIHJhaXNlCiAKKyAgICBkZWYgX3JldmFsaWRhdGVfcGF0Y2goc2VsZiwgcGF0 Y2gpOgorICAgICAgICAjIEJ1Z3MgbWlnaHQgZ2V0IGNsb3NlZCwgb3IgcGF0Y2hlcyBtaWdodCBi ZSBvYnNvbGV0ZWQgb3Igci0nZCB3aGlsZSB0aGUKKyAgICAgICAgIyBjb21taXQtcXVldWUgaXMg cHJvY2Vzc2luZy4gIERvIG9uZSBsYXN0IG1pbnV0ZSBjaGVjayBiZWZvcmUgbGFuZGluZy4KKyAg ICAgICAgcGF0Y2ggPSBzZWxmLnRvb2wuYnVncy5mZXRjaF9hdHRhY2htZW50KHBhdGNoLmlkKCkp CisgICAgICAgIGlmIHBhdGNoLmlzX29ic29sZXRlKCk6CisgICAgICAgICAgICByZXR1cm4gTm9u ZQorICAgICAgICBpZiBwYXRjaC5idWcoKS5pc19jbG9zZWQoKToKKyAgICAgICAgICAgIHJldHVy biBOb25lCisgICAgICAgIGlmIG5vdCBwYXRjaC5jb21taXR0ZXIoKToKKyAgICAgICAgICAgIHJl dHVybiBOb25lCisgICAgICAgICMgUmV2aWV3ZXIgaXMgbm90IHJlcXVpcmVkLiAgTWlzaXNuZyBy ZXZpZXdlcnMgd2lsbCBiZSBjYXVnaHQgZHVyaW5nIHRoZSBDaGFuZ2VMb2cgY2hlY2sgZHVyaW5n IGxhbmRpbmcuCisgICAgICAgIHJldHVybiBwYXRjaAorCiAgICAgZGVmIF9sYW5kKHNlbGYsIHBh dGNoKToKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgYXJncyA9IFsKQEAgLTMwNyw2ICszMjAs MTEgQEAgY2xhc3MgQ29tbWl0UXVldWUoQWJzdHJhY3RQYXRjaFF1ZXVlLCBTdGVwU2VxdWVuY2VF cnJvckhhbmRsZXIpOgogICAgICAgICAgICAgIyB0byBidWlsZCBhbmQgdGVzdCBhZ2Fpbi4gSWYg aXQgZmFpbHMgYSBzZWNvbmQgdGltZSwgd2UncmUgcHJldHR5CiAgICAgICAgICAgICAjIHN1cmUg aXRzIGEgYmFkIHRlc3QgYW5kIHJlIGNhbiByZWplY3QgaXQgb3V0cmlnaHQuCiAgICAgICAgICAg ICBzZWxmLl9idWlsZF9hbmRfdGVzdF9wYXRjaChwYXRjaCkKKyAgICAgICAgIyBEbyBvbmUgbGFz dCBjaGVjayB0byBjYXRjaCBhbnkgYnVnIGNoYW5nZXMgKGNxLSwgY2xvc2VkLCByZXZpZXdlciBj aGFuZ2VkLCBldGMuKQorICAgICAgICAjIFRoaXMgaGVscHMgY2F0Y2ggcmFjZXMgYmV0d2VlbiB0 aGUgYm90cyBpZiBsb2NrcyBleHBpcmUuCisgICAgICAgIHBhdGNoID0gc2VsZi5fcmV2YWxpZGF0 ZV9wYXRjaChwYXRjaCkKKyAgICAgICAgaWYgbm90IHBhdGNoOgorICAgICAgICAgICAgcmV0dXJu IEZhbHNlCiAgICAgICAgIHNlbGYuX2xhbmQocGF0Y2gpCiAgICAgICAgIHJldHVybiBUcnVlCiAK ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9x dWV1ZXNfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29t bWFuZHMvcXVldWVzX3VuaXR0ZXN0LnB5CmluZGV4IDgxODA4YjYxMjVmMmFhNzlkZjAxMmNhMGFm ZDUzZWIzNDAxMGY1OTYuLjJkZWVlNzY3YTU5ZWIxZGI2OTk3N2QyOTYyOTBiMWQyN2Q0NzhhMjYg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9x dWV1ZXNfdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L2NvbW1hbmRzL3F1ZXVlc191bml0dGVzdC5weQpAQCAtMzQsNyArMzQsNyBAQCBmcm9tIHdlYmtp dHB5LmNvbW1vbi5zeXN0ZW0ub3V0cHV0Y2FwdHVyZSBpbXBvcnQgT3V0cHV0Q2FwdHVyZQogZnJv bSB3ZWJraXRweS50aGlyZHBhcnR5Lm1vY2sgaW1wb3J0IE1vY2sKIGZyb20gd2Via2l0cHkudG9v bC5jb21tYW5kcy5jb21tYW5kdGVzdCBpbXBvcnQgQ29tbWFuZHNUZXN0CiBmcm9tIHdlYmtpdHB5 LnRvb2wuY29tbWFuZHMucXVldWVzIGltcG9ydCAqCi1mcm9tIHdlYmtpdHB5LnRvb2wuY29tbWFu ZHMucXVldWVzdGVzdCBpbXBvcnQgUXVldWVzVGVzdAorZnJvbSB3ZWJraXRweS50b29sLmNvbW1h bmRzLnF1ZXVlc3Rlc3QgaW1wb3J0IFF1ZXVlc1Rlc3QsIE1vY2tQYXRjaAogZnJvbSB3ZWJraXRw eS50b29sLmNvbW1hbmRzLnN0ZXBzZXF1ZW5jZSBpbXBvcnQgU3RlcFNlcXVlbmNlCiBmcm9tIHdl YmtpdHB5LnRvb2wubW9ja3Rvb2wgaW1wb3J0IE1vY2tUb29sLCBNb2NrU0NNLCBNb2NrU3RhdHVz U2VydmVyCiAKQEAgLTQ3LDE2ICs0NywxMCBAQCBjbGFzcyBUZXN0UmV2aWV3UXVldWUoQWJzdHJh Y3RSZXZpZXdRdWV1ZSk6CiAgICAgbmFtZSA9ICJ0ZXN0LXJldmlldy1xdWV1ZSIKIAogCi1jbGFz cyBNb2NrUGF0Y2gob2JqZWN0KToKK2NsYXNzIE1vY2tSb2xsb3V0UGF0Y2goTW9ja1BhdGNoKToK ICAgICBkZWYgaXNfcm9sbG91dChzZWxmKToKICAgICAgICAgcmV0dXJuIFRydWUKIAotICAgIGRl ZiBidWdfaWQoc2VsZik6Ci0gICAgICAgIHJldHVybiAxMjM0NQotCi0gICAgZGVmIGlkKHNlbGYp OgotICAgICAgICByZXR1cm4gNzY1NDMKLQogCiBjbGFzcyBBYnN0cmFjdFF1ZXVlVGVzdChDb21t YW5kc1Rlc3QpOgogICAgIGRlZiBfYXNzZXJ0X2xvZ19wcm9ncmVzc19vdXRwdXQoc2VsZiwgcGF0 Y2hfaWRzLCBwcm9ncmVzc19vdXRwdXQpOgpAQCAtMTU4LDYgKzE1MiwyNSBAQCBjbGFzcyBBbHdh eXNDb21taXRRdWV1ZVRvb2wob2JqZWN0KToKICAgICAgICAgcmV0dXJuIENvbW1pdFF1ZXVlCiAK IAorY2xhc3MgU2Vjb25kVGhvdWdodHNDb21taXRRdWV1ZShDb21taXRRdWV1ZSk6CisgICAgZGVm IF9idWlsZF9hbmRfdGVzdF9wYXRjaChzZWxmLCBwYXRjaCwgZmlyc3RfcnVuPVRydWUpOgorICAg ICAgICBhdHRhY2htZW50X2RpY3Rpb25hcnkgPSB7CisgICAgICAgICAgICAiaWQiOiBwYXRjaC5p ZCgpLAorICAgICAgICAgICAgImJ1Z19pZCI6IHBhdGNoLmJ1Z19pZCgpLAorICAgICAgICAgICAg Im5hbWUiOiAiUmVqZWN0ZWQiLAorICAgICAgICAgICAgImlzX29ic29sZXRlIjogVHJ1ZSwKKyAg ICAgICAgICAgICJpc19wYXRjaCI6IEZhbHNlLAorICAgICAgICAgICAgInJldmlldyI6ICItIiwK KyAgICAgICAgICAgICJyZXZpZXdlcl9lbWFpbCI6ICJmb29AYmFyLmNvbSIsCisgICAgICAgICAg ICAiY29tbWl0LXF1ZXVlIjogIi0iLAorICAgICAgICAgICAgImNvbW1pdHRlcl9lbWFpbCI6ICJm b29AYmFyLmNvbSIsCisgICAgICAgICAgICAiYXR0YWNoZXJfZW1haWwiOiAiQ29udHJpYnV0ZXIx IiwKKyAgICAgICAgfQorICAgICAgICBwYXRjaCA9IEF0dGFjaG1lbnQoYXR0YWNobWVudF9kaWN0 aW9uYXJ5LCBOb25lKQorICAgICAgICBzZWxmLnRvb2wuYnVncy5zZXRfb3ZlcnJpZGVfcGF0Y2go cGF0Y2gpCisgICAgICAgIHJldHVybiBUcnVlCisKKwogY2xhc3MgQ29tbWl0UXVldWVUZXN0KFF1 ZXVlc1Rlc3QpOgogICAgIGRlZiB0ZXN0X2NvbW1pdF9xdWV1ZShzZWxmKToKICAgICAgICAgZXhw ZWN0ZWRfc3RkZXJyID0gewpAQCAtMTcxLDggKzE4NCw4IEBAIE1PQ0s6IHVwZGF0ZV93b3JrX2l0 ZW1zOiBjb21taXQtcXVldWUgWzEwNiwgMTk3XQogMiBwYXRjaGVzIGluIGNvbW1pdC1xdWV1ZSBb MTA2LCAxOTddCiAiIiIsCiAgICAgICAgICAgICAicHJvY2Vzc193b3JrX2l0ZW0iOiAiTU9DSzog dXBkYXRlX3N0YXR1czogY29tbWl0LXF1ZXVlIFBhc3NcbiIsCi0gICAgICAgICAgICAiaGFuZGxl X3VuZXhwZWN0ZWRfZXJyb3IiOiAiTU9DSyBzZXR0aW5nIGZsYWcgJ2NvbW1pdC1xdWV1ZScgdG8g Jy0nIG9uIGF0dGFjaG1lbnQgJzEyMzQnIHdpdGggY29tbWVudCAnUmVqZWN0aW5nIHBhdGNoIDEy MzQgZnJvbSBjb21taXQtcXVldWUuJyBhbmQgYWRkaXRpb25hbCBjb21tZW50ICdNb2NrIGVycm9y IG1lc3NhZ2UnXG4iLAotICAgICAgICAgICAgImhhbmRsZV9zY3JpcHRfZXJyb3IiOiAiTU9DSzog dXBkYXRlX3N0YXR1czogY29tbWl0LXF1ZXVlIFNjcmlwdEVycm9yIGVycm9yIG1lc3NhZ2Vcbk1P Q0sgc2V0dGluZyBmbGFnICdjb21taXQtcXVldWUnIHRvICctJyBvbiBhdHRhY2htZW50ICcxMjM0 JyB3aXRoIGNvbW1lbnQgJ1JlamVjdGluZyBwYXRjaCAxMjM0IGZyb20gY29tbWl0LXF1ZXVlLicg YW5kIGFkZGl0aW9uYWwgY29tbWVudCAnU2NyaXB0RXJyb3IgZXJyb3IgbWVzc2FnZSdcbiIsCisg ICAgICAgICAgICAiaGFuZGxlX3VuZXhwZWN0ZWRfZXJyb3IiOiAiTU9DSyBzZXR0aW5nIGZsYWcg J2NvbW1pdC1xdWV1ZScgdG8gJy0nIG9uIGF0dGFjaG1lbnQgJzE5Nycgd2l0aCBjb21tZW50ICdS ZWplY3RpbmcgcGF0Y2ggMTk3IGZyb20gY29tbWl0LXF1ZXVlLicgYW5kIGFkZGl0aW9uYWwgY29t bWVudCAnTW9jayBlcnJvciBtZXNzYWdlJ1xuIiwKKyAgICAgICAgICAgICJoYW5kbGVfc2NyaXB0 X2Vycm9yIjogIk1PQ0s6IHVwZGF0ZV9zdGF0dXM6IGNvbW1pdC1xdWV1ZSBTY3JpcHRFcnJvciBl cnJvciBtZXNzYWdlXG5NT0NLIHNldHRpbmcgZmxhZyAnY29tbWl0LXF1ZXVlJyB0byAnLScgb24g YXR0YWNobWVudCAnMTk3JyB3aXRoIGNvbW1lbnQgJ1JlamVjdGluZyBwYXRjaCAxOTcgZnJvbSBj b21taXQtcXVldWUuJyBhbmQgYWRkaXRpb25hbCBjb21tZW50ICdTY3JpcHRFcnJvciBlcnJvciBt ZXNzYWdlJ1xuIiwKICAgICAgICAgfQogICAgICAgICBzZWxmLmFzc2VydF9xdWV1ZV9vdXRwdXRz KENvbW1pdFF1ZXVlKCksIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCiAKQEAgLTE5 MywxNiArMjA2LDE2IEBAIE1PQ0sgc2V0dGluZyBmbGFnICdjb21taXQtcXVldWUnIHRvICctJyBv biBhdHRhY2htZW50ICcxMjgnIHdpdGggY29tbWVudCAnUmVqZWN0CiBNT0NLOiB1cGRhdGVfd29y a19pdGVtczogY29tbWl0LXF1ZXVlIFsxMDYsIDE5N10KIDIgcGF0Y2hlcyBpbiBjb21taXQtcXVl dWUgWzEwNiwgMTk3XQogIiIiLAotICAgICAgICAgICAgInByb2Nlc3Nfd29ya19pdGVtIjogIk1P Q0sgcnVuX2FuZF90aHJvd19pZl9mYWlsOiBbJ2VjaG8nLCAnLS1zdGF0dXMtaG9zdD1leGFtcGxl LmNvbScsICdidWlsZC1hbmQtdGVzdC1hdHRhY2htZW50JywgJy0tZm9yY2UtY2xlYW4nLCAnLS1i dWlsZCcsICctLW5vbi1pbnRlcmFjdGl2ZScsICctLWJ1aWxkLXN0eWxlPWJvdGgnLCAnLS1xdWll dCcsIDEyMzQsICctLXRlc3QnXVxuTU9DSyBydW5fYW5kX3Rocm93X2lmX2ZhaWw6IFsnZWNobycs ICctLXN0YXR1cy1ob3N0PWV4YW1wbGUuY29tJywgJ2xhbmQtYXR0YWNobWVudCcsICctLWZvcmNl LWNsZWFuJywgJy0tbm9uLWludGVyYWN0aXZlJywgJy0taWdub3JlLWJ1aWxkZXJzJywgJy0tcXVp ZXQnLCAnLS1wYXJlbnQtY29tbWFuZD1jb21taXQtcXVldWUnLCAxMjM0XVxuTU9DSzogdXBkYXRl X3N0YXR1czogY29tbWl0LXF1ZXVlIFBhc3NcbiIsCi0gICAgICAgICAgICAiaGFuZGxlX3VuZXhw ZWN0ZWRfZXJyb3IiOiAiTU9DSyBzZXR0aW5nIGZsYWcgJ2NvbW1pdC1xdWV1ZScgdG8gJy0nIG9u IGF0dGFjaG1lbnQgJzEyMzQnIHdpdGggY29tbWVudCAnUmVqZWN0aW5nIHBhdGNoIDEyMzQgZnJv bSBjb21taXQtcXVldWUuJyBhbmQgYWRkaXRpb25hbCBjb21tZW50ICdNb2NrIGVycm9yIG1lc3Nh Z2UnXG4iLAotICAgICAgICAgICAgImhhbmRsZV9zY3JpcHRfZXJyb3IiOiAiTU9DSzogdXBkYXRl X3N0YXR1czogY29tbWl0LXF1ZXVlIFNjcmlwdEVycm9yIGVycm9yIG1lc3NhZ2Vcbk1PQ0sgc2V0 dGluZyBmbGFnICdjb21taXQtcXVldWUnIHRvICctJyBvbiBhdHRhY2htZW50ICcxMjM0JyB3aXRo IGNvbW1lbnQgJ1JlamVjdGluZyBwYXRjaCAxMjM0IGZyb20gY29tbWl0LXF1ZXVlLicgYW5kIGFk ZGl0aW9uYWwgY29tbWVudCAnU2NyaXB0RXJyb3IgZXJyb3IgbWVzc2FnZSdcbiIsCisgICAgICAg ICAgICAicHJvY2Vzc193b3JrX2l0ZW0iOiAiTU9DSyBydW5fYW5kX3Rocm93X2lmX2ZhaWw6IFsn ZWNobycsICctLXN0YXR1cy1ob3N0PWV4YW1wbGUuY29tJywgJ2J1aWxkLWFuZC10ZXN0LWF0dGFj aG1lbnQnLCAnLS1mb3JjZS1jbGVhbicsICctLWJ1aWxkJywgJy0tbm9uLWludGVyYWN0aXZlJywg Jy0tYnVpbGQtc3R5bGU9Ym90aCcsICctLXF1aWV0JywgMTk3LCAnLS10ZXN0J11cbk1PQ0sgcnVu X2FuZF90aHJvd19pZl9mYWlsOiBbJ2VjaG8nLCAnLS1zdGF0dXMtaG9zdD1leGFtcGxlLmNvbScs ICdsYW5kLWF0dGFjaG1lbnQnLCAnLS1mb3JjZS1jbGVhbicsICctLW5vbi1pbnRlcmFjdGl2ZScs ICctLWlnbm9yZS1idWlsZGVycycsICctLXF1aWV0JywgJy0tcGFyZW50LWNvbW1hbmQ9Y29tbWl0 LXF1ZXVlJywgMTk3XVxuTU9DSzogdXBkYXRlX3N0YXR1czogY29tbWl0LXF1ZXVlIFBhc3NcbiIs CisgICAgICAgICAgICAiaGFuZGxlX3VuZXhwZWN0ZWRfZXJyb3IiOiAiTU9DSyBzZXR0aW5nIGZs YWcgJ2NvbW1pdC1xdWV1ZScgdG8gJy0nIG9uIGF0dGFjaG1lbnQgJzE5Nycgd2l0aCBjb21tZW50 ICdSZWplY3RpbmcgcGF0Y2ggMTk3IGZyb20gY29tbWl0LXF1ZXVlLicgYW5kIGFkZGl0aW9uYWwg Y29tbWVudCAnTW9jayBlcnJvciBtZXNzYWdlJ1xuIiwKKyAgICAgICAgICAgICJoYW5kbGVfc2Ny aXB0X2Vycm9yIjogIk1PQ0s6IHVwZGF0ZV9zdGF0dXM6IGNvbW1pdC1xdWV1ZSBTY3JpcHRFcnJv ciBlcnJvciBtZXNzYWdlXG5NT0NLIHNldHRpbmcgZmxhZyAnY29tbWl0LXF1ZXVlJyB0byAnLScg b24gYXR0YWNobWVudCAnMTk3JyB3aXRoIGNvbW1lbnQgJ1JlamVjdGluZyBwYXRjaCAxOTcgZnJv bSBjb21taXQtcXVldWUuJyBhbmQgYWRkaXRpb25hbCBjb21tZW50ICdTY3JpcHRFcnJvciBlcnJv ciBtZXNzYWdlJ1xuIiwKICAgICAgICAgfQogICAgICAgICBzZWxmLmFzc2VydF9xdWV1ZV9vdXRw dXRzKENvbW1pdFF1ZXVlKCksIHRvb2w9dG9vbCwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0 ZGVycikKIAogICAgIGRlZiB0ZXN0X3JvbGxvdXRfbGFuZHMoc2VsZik6CiAgICAgICAgIHRvb2wg PSBNb2NrVG9vbChsb2dfZXhlY3V0aXZlPVRydWUpCiAgICAgICAgIHRvb2wuYnVpbGRib3QubGln aHRfdHJlZV9vbl9maXJlKCkKLSAgICAgICAgcm9sbG91dF9wYXRjaCA9IE1vY2tQYXRjaCgpCisg ICAgICAgIHJvbGxvdXRfcGF0Y2ggPSBNb2NrUm9sbG91dFBhdGNoKCkKICAgICAgICAgZXhwZWN0 ZWRfc3RkZXJyID0gewogICAgICAgICAgICAgImJlZ2luX3dvcmtfcXVldWUiOiBzZWxmLl9kZWZh dWx0X2JlZ2luX3dvcmtfcXVldWVfc3RkZXJyKCJjb21taXQtcXVldWUiLCBNb2NrU0NNLmZha2Vf Y2hlY2tvdXRfcm9vdCksCiAgICAgICAgICAgICAic2hvdWxkX3Byb2NlZWRfd2l0aF93b3JrX2l0 ZW0iOiAiTU9DSzogdXBkYXRlX3N0YXR1czogY29tbWl0LXF1ZXVlIExhbmRpbmcgcm9sbG91dCBw YXRjaFxuIiwKQEAgLTIxNyw5ICsyMzAsOSBAQCBNT0NLIHNldHRpbmcgZmxhZyAnY29tbWl0LXF1 ZXVlJyB0byAnLScgb24gYXR0YWNobWVudCAnMTI4JyB3aXRoIGNvbW1lbnQgJ1JlamVjdAogTU9D SzogdXBkYXRlX3dvcmtfaXRlbXM6IGNvbW1pdC1xdWV1ZSBbMTA2LCAxOTddCiAyIHBhdGNoZXMg aW4gY29tbWl0LXF1ZXVlIFsxMDYsIDE5N10KICIiIiwKLSAgICAgICAgICAgICJwcm9jZXNzX3dv cmtfaXRlbSI6ICJNT0NLIHJ1bl9hbmRfdGhyb3dfaWZfZmFpbDogWydlY2hvJywgJy0tc3RhdHVz LWhvc3Q9ZXhhbXBsZS5jb20nLCAnYnVpbGQtYW5kLXRlc3QtYXR0YWNobWVudCcsICctLWZvcmNl LWNsZWFuJywgJy0tYnVpbGQnLCAnLS1ub24taW50ZXJhY3RpdmUnLCAnLS1idWlsZC1zdHlsZT1i b3RoJywgJy0tcXVpZXQnLCA3NjU0M11cbk1PQ0sgcnVuX2FuZF90aHJvd19pZl9mYWlsOiBbJ2Vj aG8nLCAnLS1zdGF0dXMtaG9zdD1leGFtcGxlLmNvbScsICdsYW5kLWF0dGFjaG1lbnQnLCAnLS1m b3JjZS1jbGVhbicsICctLW5vbi1pbnRlcmFjdGl2ZScsICctLWlnbm9yZS1idWlsZGVycycsICct LXF1aWV0JywgJy0tcGFyZW50LWNvbW1hbmQ9Y29tbWl0LXF1ZXVlJywgNzY1NDNdXG5NT0NLOiB1 cGRhdGVfc3RhdHVzOiBjb21taXQtcXVldWUgUGFzc1xuIiwKLSAgICAgICAgICAgICJoYW5kbGVf dW5leHBlY3RlZF9lcnJvciI6ICJNT0NLIHNldHRpbmcgZmxhZyAnY29tbWl0LXF1ZXVlJyB0byAn LScgb24gYXR0YWNobWVudCAnNzY1NDMnIHdpdGggY29tbWVudCAnUmVqZWN0aW5nIHBhdGNoIDc2 NTQzIGZyb20gY29tbWl0LXF1ZXVlLicgYW5kIGFkZGl0aW9uYWwgY29tbWVudCAnTW9jayBlcnJv ciBtZXNzYWdlJ1xuIiwKLSAgICAgICAgICAgICJoYW5kbGVfc2NyaXB0X2Vycm9yIjogIk1PQ0s6 IHVwZGF0ZV9zdGF0dXM6IGNvbW1pdC1xdWV1ZSBTY3JpcHRFcnJvciBlcnJvciBtZXNzYWdlXG5N T0NLIHNldHRpbmcgZmxhZyAnY29tbWl0LXF1ZXVlJyB0byAnLScgb24gYXR0YWNobWVudCAnMTIz NCcgd2l0aCBjb21tZW50ICdSZWplY3RpbmcgcGF0Y2ggMTIzNCBmcm9tIGNvbW1pdC1xdWV1ZS4n IGFuZCBhZGRpdGlvbmFsIGNvbW1lbnQgJ1NjcmlwdEVycm9yIGVycm9yIG1lc3NhZ2UnXG4iLAor ICAgICAgICAgICAgInByb2Nlc3Nfd29ya19pdGVtIjogIk1PQ0sgcnVuX2FuZF90aHJvd19pZl9m YWlsOiBbJ2VjaG8nLCAnLS1zdGF0dXMtaG9zdD1leGFtcGxlLmNvbScsICdidWlsZC1hbmQtdGVz dC1hdHRhY2htZW50JywgJy0tZm9yY2UtY2xlYW4nLCAnLS1idWlsZCcsICctLW5vbi1pbnRlcmFj dGl2ZScsICctLWJ1aWxkLXN0eWxlPWJvdGgnLCAnLS1xdWlldCcsIDE5N11cbk1PQ0sgcnVuX2Fu ZF90aHJvd19pZl9mYWlsOiBbJ2VjaG8nLCAnLS1zdGF0dXMtaG9zdD1leGFtcGxlLmNvbScsICds YW5kLWF0dGFjaG1lbnQnLCAnLS1mb3JjZS1jbGVhbicsICctLW5vbi1pbnRlcmFjdGl2ZScsICct LWlnbm9yZS1idWlsZGVycycsICctLXF1aWV0JywgJy0tcGFyZW50LWNvbW1hbmQ9Y29tbWl0LXF1 ZXVlJywgMTk3XVxuTU9DSzogdXBkYXRlX3N0YXR1czogY29tbWl0LXF1ZXVlIFBhc3NcbiIsCisg ICAgICAgICAgICAiaGFuZGxlX3VuZXhwZWN0ZWRfZXJyb3IiOiAiTU9DSyBzZXR0aW5nIGZsYWcg J2NvbW1pdC1xdWV1ZScgdG8gJy0nIG9uIGF0dGFjaG1lbnQgJzE5Nycgd2l0aCBjb21tZW50ICdS ZWplY3RpbmcgcGF0Y2ggMTk3IGZyb20gY29tbWl0LXF1ZXVlLicgYW5kIGFkZGl0aW9uYWwgY29t bWVudCAnTW9jayBlcnJvciBtZXNzYWdlJ1xuIiwKKyAgICAgICAgICAgICJoYW5kbGVfc2NyaXB0 X2Vycm9yIjogIk1PQ0s6IHVwZGF0ZV9zdGF0dXM6IGNvbW1pdC1xdWV1ZSBTY3JpcHRFcnJvciBl cnJvciBtZXNzYWdlXG5NT0NLIHNldHRpbmcgZmxhZyAnY29tbWl0LXF1ZXVlJyB0byAnLScgb24g YXR0YWNobWVudCAnMTk3JyB3aXRoIGNvbW1lbnQgJ1JlamVjdGluZyBwYXRjaCAxOTcgZnJvbSBj b21taXQtcXVldWUuJyBhbmQgYWRkaXRpb25hbCBjb21tZW50ICdTY3JpcHRFcnJvciBlcnJvciBt ZXNzYWdlJ1xuIiwKICAgICAgICAgfQogICAgICAgICBzZWxmLmFzc2VydF9xdWV1ZV9vdXRwdXRz KENvbW1pdFF1ZXVlKCksIHRvb2w9dG9vbCwgd29ya19pdGVtPXJvbGxvdXRfcGF0Y2gsIGV4cGVj dGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCiAKQEAgLTI2Niw2ICsyNzksMTEgQEAgTU9DSzog dXBkYXRlX3dvcmtfaXRlbXM6IGNvbW1pdC1xdWV1ZSBbMTA2LCAxOTddCiAgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWxzKG9wdGlvbnMuYnVpbGQsIEZhbHNlKQogICAgICAgICBzZWxmLmFzc2VydEVx dWFscyhvcHRpb25zLnRlc3QsIEZhbHNlKQogCisgICAgZGVmIHRlc3RfbWFudWFsX3JlamVjdF9k dXJpbmdfcHJvY2Vzc2luZyhzZWxmKToKKyAgICAgICAgcXVldWUgPSBTZWNvbmRUaG91Z2h0c0Nv bW1pdFF1ZXVlKCkKKyAgICAgICAgcXVldWUuYmluZF90b190b29sKE1vY2tUb29sKCkpCisgICAg ICAgIHF1ZXVlLnByb2Nlc3Nfd29ya19pdGVtKE1vY2tQYXRjaCgpKQorCiAKIGNsYXNzIFJpZXR2 ZWxkVXBsb2FkUXVldWVUZXN0KFF1ZXVlc1Rlc3QpOgogICAgIGRlZiB0ZXN0X3JpZXR2ZWxkX3Vw bG9hZF9xdWV1ZShzZWxmKToKQEAgLTI3Myw4ICsyOTEsOCBAQCBjbGFzcyBSaWV0dmVsZFVwbG9h ZFF1ZXVlVGVzdChRdWV1ZXNUZXN0KToKICAgICAgICAgICAgICJiZWdpbl93b3JrX3F1ZXVlIjog c2VsZi5fZGVmYXVsdF9iZWdpbl93b3JrX3F1ZXVlX3N0ZGVycigicmlldHZlbGQtdXBsb2FkLXF1 ZXVlIiwgTW9ja1NDTS5mYWtlX2NoZWNrb3V0X3Jvb3QpLAogICAgICAgICAgICAgInNob3VsZF9w cm9jZWVkX3dpdGhfd29ya19pdGVtIjogIk1PQ0s6IHVwZGF0ZV9zdGF0dXM6IHJpZXR2ZWxkLXVw bG9hZC1xdWV1ZSBVcGxvYWRpbmcgcGF0Y2hcbiIsCiAgICAgICAgICAgICAicHJvY2Vzc193b3Jr X2l0ZW0iOiAiTU9DSzogdXBkYXRlX3N0YXR1czogcmlldHZlbGQtdXBsb2FkLXF1ZXVlIFBhc3Nc biIsCi0gICAgICAgICAgICAiaGFuZGxlX3VuZXhwZWN0ZWRfZXJyb3IiOiAiTW9jayBlcnJvciBt ZXNzYWdlXG5NT0NLIHNldHRpbmcgZmxhZyAnaW4tcmlldHZlbGQnIHRvICctJyBvbiBhdHRhY2ht ZW50ICcxMjM0JyB3aXRoIGNvbW1lbnQgJ05vbmUnIGFuZCBhZGRpdGlvbmFsIGNvbW1lbnQgJ05v bmUnXG4iLAotICAgICAgICAgICAgImhhbmRsZV9zY3JpcHRfZXJyb3IiOiAiU2NyaXB0RXJyb3Ig ZXJyb3IgbWVzc2FnZVxuTU9DSzogdXBkYXRlX3N0YXR1czogcmlldHZlbGQtdXBsb2FkLXF1ZXVl IFNjcmlwdEVycm9yIGVycm9yIG1lc3NhZ2Vcbk1PQ0sgc2V0dGluZyBmbGFnICdpbi1yaWV0dmVs ZCcgdG8gJy0nIG9uIGF0dGFjaG1lbnQgJzEyMzQnIHdpdGggY29tbWVudCAnTm9uZScgYW5kIGFk ZGl0aW9uYWwgY29tbWVudCAnTm9uZSdcbiIsCisgICAgICAgICAgICAiaGFuZGxlX3VuZXhwZWN0 ZWRfZXJyb3IiOiAiTW9jayBlcnJvciBtZXNzYWdlXG5NT0NLIHNldHRpbmcgZmxhZyAnaW4tcmll dHZlbGQnIHRvICctJyBvbiBhdHRhY2htZW50ICcxOTcnIHdpdGggY29tbWVudCAnTm9uZScgYW5k IGFkZGl0aW9uYWwgY29tbWVudCAnTm9uZSdcbiIsCisgICAgICAgICAgICAiaGFuZGxlX3Njcmlw dF9lcnJvciI6ICJTY3JpcHRFcnJvciBlcnJvciBtZXNzYWdlXG5NT0NLOiB1cGRhdGVfc3RhdHVz OiByaWV0dmVsZC11cGxvYWQtcXVldWUgU2NyaXB0RXJyb3IgZXJyb3IgbWVzc2FnZVxuTU9DSyBz ZXR0aW5nIGZsYWcgJ2luLXJpZXR2ZWxkJyB0byAnLScgb24gYXR0YWNobWVudCAnMTk3JyB3aXRo IGNvbW1lbnQgJ05vbmUnIGFuZCBhZGRpdGlvbmFsIGNvbW1lbnQgJ05vbmUnXG4iLAogICAgICAg ICB9CiAgICAgICAgIHNlbGYuYXNzZXJ0X3F1ZXVlX291dHB1dHMoUmlldHZlbGRVcGxvYWRRdWV1 ZSgpLCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKQogCkBAIC0yODcsNyArMzA1LDcg QEAgY2xhc3MgU3R5bGVRdWV1ZVRlc3QoUXVldWVzVGVzdCk6CiAgICAgICAgICAgICAic2hvdWxk X3Byb2NlZWRfd2l0aF93b3JrX2l0ZW0iOiAiTU9DSzogdXBkYXRlX3N0YXR1czogc3R5bGUtcXVl dWUgQ2hlY2tpbmcgc3R5bGVcbiIsCiAgICAgICAgICAgICAicHJvY2Vzc193b3JrX2l0ZW0iOiAi TU9DSzogdXBkYXRlX3N0YXR1czogc3R5bGUtcXVldWUgUGFzc1xuIiwKICAgICAgICAgICAgICJo YW5kbGVfdW5leHBlY3RlZF9lcnJvciI6ICJNb2NrIGVycm9yIG1lc3NhZ2VcbiIsCi0gICAgICAg ICAgICAiaGFuZGxlX3NjcmlwdF9lcnJvciI6ICJNT0NLOiB1cGRhdGVfc3RhdHVzOiBzdHlsZS1x dWV1ZSBTY3JpcHRFcnJvciBlcnJvciBtZXNzYWdlXG5NT0NLIGJ1ZyBjb21tZW50OiBidWdfaWQ9 MzQ1LCBjYz1bXVxuLS0tIEJlZ2luIGNvbW1lbnQgLS0tXFxBdHRhY2htZW50IDEyMzQgZGlkIG5v dCBwYXNzIHN0eWxlLXF1ZXVlOlxuXG5TY3JpcHRFcnJvciBlcnJvciBtZXNzYWdlXG5cbklmIGFu eSBvZiB0aGVzZSBlcnJvcnMgYXJlIGZhbHNlIHBvc2l0aXZlcywgcGxlYXNlIGZpbGUgYSBidWcg YWdhaW5zdCBjaGVjay13ZWJraXQtc3R5bGUuXG4tLS0gRW5kIGNvbW1lbnQgLS0tXG5cbiIsCisg ICAgICAgICAgICAiaGFuZGxlX3NjcmlwdF9lcnJvciI6ICJNT0NLOiB1cGRhdGVfc3RhdHVzOiBz dHlsZS1xdWV1ZSBTY3JpcHRFcnJvciBlcnJvciBtZXNzYWdlXG5NT0NLIGJ1ZyBjb21tZW50OiBi dWdfaWQ9MTQyLCBjYz1bXVxuLS0tIEJlZ2luIGNvbW1lbnQgLS0tXFxBdHRhY2htZW50IDE5NyBk aWQgbm90IHBhc3Mgc3R5bGUtcXVldWU6XG5cblNjcmlwdEVycm9yIGVycm9yIG1lc3NhZ2Vcblxu SWYgYW55IG9mIHRoZXNlIGVycm9ycyBhcmUgZmFsc2UgcG9zaXRpdmVzLCBwbGVhc2UgZmlsZSBh IGJ1ZyBhZ2FpbnN0IGNoZWNrLXdlYmtpdC1zdHlsZS5cbi0tLSBFbmQgY29tbWVudCAtLS1cblxu IiwKICAgICAgICAgfQogICAgICAgICBleHBlY3RlZF9leGNlcHRpb25zID0gewogICAgICAgICAg ICAgImhhbmRsZV9zY3JpcHRfZXJyb3IiOiBTeXN0ZW1FeGl0LApkaWZmIC0tZ2l0IGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXVlc3Rlc3QucHkgYi9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzdGVzdC5weQppbmRl eCBkZjczZWMzNDJjZjc4N2I3YzlkOWY1ODc5ZDYwMTc2Nzk0ZjY2MWUyLi5hYTNjZWY0ODc3YmJl NGE3NjViZTBkYWY0MWZjMDJiZjIwOTc5Njg1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzdGVzdC5weQorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzdGVzdC5weQpAQCAtNDUsMTYg KzQ1LDIwIEBAIGNsYXNzIE1vY2tRdWV1ZUVuZ2luZShvYmplY3QpOgogCiBjbGFzcyBNb2NrUGF0 Y2goKToKICAgICBkZWYgaWQoc2VsZik6Ci0gICAgICAgIHJldHVybiAxMjM0CisgICAgICAgIHJl dHVybiAxOTcKIAogICAgIGRlZiBidWdfaWQoc2VsZik6Ci0gICAgICAgIHJldHVybiAzNDUKKyAg ICAgICAgcmV0dXJuIDE0MgorCisgICAgZGVmIGlzX3JvbGxvdXQoc2VsZik6CisgICAgICAgIHJl dHVybiBGYWxzZQogCiAKIGNsYXNzIFF1ZXVlc1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgorICAg ICMgSWRzIG1hdGNoIHBhdGNoMSBpbiBtb2NrdG9vbC5weQogICAgIG1vY2tfd29ya19pdGVtID0g QXR0YWNobWVudCh7Ci0gICAgICAgICJpZCI6IDEyMzQsCi0gICAgICAgICJidWdfaWQiOiAzNDUs CisgICAgICAgICJpZCI6IDE5NywKKyAgICAgICAgImJ1Z19pZCI6IDE0MiwKICAgICAgICAgIm5h bWUiOiAiUGF0Y2giLAogICAgICAgICAiYXR0YWNoZXJfZW1haWwiOiAiYWRhbUBleGFtcGxlLmNv bSIsCiAgICAgfSwgTm9uZSkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9tb2NrdG9vbC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9t b2NrdG9vbC5weQppbmRleCBlOWM4MTQ4NTA4NTY5NWM2NWYwNTA2NDQzNDZlZThiZDhiMmVkNjk5 Li44YTYxODhhNWQxMjZiYjQ5YjNmODEzYzhhMDg2MjdhYjQ5NzI3Y2U5IDEwMDY0NAotLS0gYS9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHkKKysrIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL21vY2t0b29sLnB5CkBAIC0xNjEsNiArMTYxLDcg QEAgX2J1ZzEgPSB7CiAgICAgICAgICAgICAgImludmFsaWQgY29tbWl0LXF1ZXVlIHNldHRlci4i LAogICAgICJhc3NpZ25lZF90b19lbWFpbCI6IF91bmFzc2lnbmVkX2VtYWlsLAogICAgICJhdHRh Y2htZW50cyI6IFtfcGF0Y2gxLCBfcGF0Y2gyXSwKKyAgICAiYnVnX3N0YXR1cyI6ICJVTkNPTkZJ Uk1FRCIsCiB9CiAKIApAQCAtMTY5LDYgKzE3MCw3IEBAIF9idWcyID0gewogICAgICJ0aXRsZSI6 ICJCdWcgd2l0aCBhIHBhdGNoIG5lZWRpbmcgcmV2aWV3LiIsCiAgICAgImFzc2lnbmVkX3RvX2Vt YWlsIjogImZvb0Bmb28uY29tIiwKICAgICAiYXR0YWNobWVudHMiOiBbX3BhdGNoM10sCisgICAg ImJ1Z19zdGF0dXMiOiAiQVNTSUdORUQiLAogfQogCiAKQEAgLTE3Nyw2ICsxNzksNyBAQCBfYnVn MyA9IHsKICAgICAidGl0bGUiOiAiVGhlIHRoaXJkIGJ1ZyIsCiAgICAgImFzc2lnbmVkX3RvX2Vt YWlsIjogX3VuYXNzaWduZWRfZW1haWwsCiAgICAgImF0dGFjaG1lbnRzIjogW19wYXRjaDddLAor ICAgICJidWdfc3RhdHVzIjogIk5FVyIsCiB9CiAKIApAQCAtMTg1LDYgKzE4OCw3IEBAIF9idWc0 ID0gewogICAgICJ0aXRsZSI6ICJUaGUgZm91cnRoIGJ1ZyIsCiAgICAgImFzc2lnbmVkX3RvX2Vt YWlsIjogImZvb0Bmb28uY29tIiwKICAgICAiYXR0YWNobWVudHMiOiBbX3BhdGNoNCwgX3BhdGNo NSwgX3BhdGNoNl0sCisgICAgImJ1Z19zdGF0dXMiOiAiUkVPUEVORUQiLAogfQogCiAKQEAgLTI1 NCw4ICsyNTgsOCBAQCBjbGFzcyBNb2NrQnVnemlsbGEoTW9jayk6CiAgICAgZGVmIF9faW5pdF9f KHNlbGYpOgogICAgICAgICBNb2NrLl9faW5pdF9fKHNlbGYpCiAgICAgICAgIHNlbGYucXVlcmll cyA9IE1vY2tCdWd6aWxsYVF1ZXJpZXMoc2VsZikKLSAgICAgICAgc2VsZi5jb21taXR0ZXJzID0g Q29tbWl0dGVyTGlzdChyZXZpZXdlcnM9W1Jldmlld2VyKCJGb28gQmFyIiwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJmb29AYmFy LmNvbSIpXSkKKyAgICAgICAgc2VsZi5jb21taXR0ZXJzID0gQ29tbWl0dGVyTGlzdChyZXZpZXdl cnM9W1Jldmlld2VyKCJGb28gQmFyIiwgImZvb0BiYXIuY29tIildKQorICAgICAgICBzZWxmLl9v dmVycmlkZV9wYXRjaCA9IE5vbmUKIAogICAgIGRlZiBjcmVhdGVfYnVnKHNlbGYsCiAgICAgICAg ICAgICAgICAgICAgYnVnX3RpdGxlLApAQCAtMjc3LDcgKzI4MSwxMyBAQCBjbGFzcyBNb2NrQnVn emlsbGEoTW9jayk6CiAgICAgZGVmIGZldGNoX2J1ZyhzZWxmLCBidWdfaWQpOgogICAgICAgICBy ZXR1cm4gQnVnKHNlbGYuYnVnX2NhY2hlLmdldChidWdfaWQpLCBzZWxmKQogCisgICAgZGVmIHNl dF9vdmVycmlkZV9wYXRjaChzZWxmLCBwYXRjaCk6CisgICAgICAgIHNlbGYuX292ZXJyaWRlX3Bh dGNoID0gcGF0Y2gKKwogICAgIGRlZiBmZXRjaF9hdHRhY2htZW50KHNlbGYsIGF0dGFjaG1lbnRf aWQpOgorICAgICAgICBpZiBzZWxmLl9vdmVycmlkZV9wYXRjaDoKKyAgICAgICAgICAgIHJldHVy biBzZWxmLl9vdmVycmlkZV9wYXRjaAorCiAgICAgICAgICMgVGhpcyBjb3VsZCBiZSBjaGFuZ2Vk IHRvIC5nZXQoKSBpZiB3ZSB3aXNoIHRvIGFsbG93IGZhaWxlZCBsb29rdXBzLgogICAgICAgICBh dHRhY2htZW50X2RpY3Rpb25hcnkgPSBzZWxmLmF0dGFjaG1lbnRfY2FjaGVbYXR0YWNobWVudF9p ZF0KICAgICAgICAgYnVnID0gc2VsZi5mZXRjaF9idWcoYXR0YWNobWVudF9kaWN0aW9uYXJ5WyJi dWdfaWQiXSkK