167152 2017-01-17 20:28:16 -0800 'buildbot-syncer.js' should be able to determine force build argument from a list of possible repositories. 2017-01-18 19:20:54 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dewei_zhu webkit-unassigned commit-queue dewei_zhu rniwa oldest_to_newest 1267664 0 dewei_zhu 2017-01-17 20:28:16 -0800 'buildbot-syncer.js' should be able to determine force build argument from a list of possible repositories. 1267665 1 299115 dewei_zhu 2017-01-17 20:28:59 -0800 Created attachment 299115 Patch 1267667 2 299115 rniwa 2017-01-17 20:46:35 -0800 Comment on attachment 299115 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=299115&action=review r=me assuming all the issues below are addressed. > Websites/perf.webkit.org/tools/js/buildbot-syncer.js:231 > + for (let rootCandidate of value['rootCandidates']) { > + if(!(rootCandidate in repositoryByName)) > + continue; We should just use filter instead. e.g. const filteredOptions = value['rootOptions'].filter((option) => option in repositoryByName); and then check that the filtered result is of length 1. > Websites/perf.webkit.org/tools/js/buildbot-syncer.js:394 > + case 'rootCandidates': //fallthrough Nit: Capitalize f and there should be a space between // and f. > Websites/perf.webkit.org/unit-tests/buildbot-syncer-tests.js:19 > + 'opensource': {'rootCandidates': ['WebKit-SVN', 'WebKit-Git']}, I don't think the term "candidate" makes sense given we're picking one of them. How about 'rootOptions' or 'rootChoices'? > Websites/perf.webkit.org/unit-tests/resources/mock-v3-models.js:21 > + MockModels.opensourceRepository = Repository.ensureSingleton(17, {name: 'WebKit-Git'}); I don't think we want to call this opensourceRepository. Probably something like webkitGit? 1267983 3 299214 dewei_zhu 2017-01-18 18:43:23 -0800 Created attachment 299214 Patch for landing 1267991 4 299214 commit-queue 2017-01-18 19:20:49 -0800 Comment on attachment 299214 Patch for landing Clearing flags on attachment: 299214 Committed r210909: <http://trac.webkit.org/changeset/210909> 1267992 5 commit-queue 2017-01-18 19:20:54 -0800 All reviewed patches have been landed. Closing bug. 299115 2017-01-17 20:28:59 -0800 2017-01-18 18:43:18 -0800 Patch bug-167152-20170117202710.patch text/plain 9622 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwODQxCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCAxMDEzMDc1NzhmNjg1ZGYzODZhZDhiZjdkMWY5YTQ3MzI0MmY4ZmJiLi5kMmUwNTUzMjUz ZjdmMzUwMjY1MzRhMjcxNTkyZjQwYTYzNmU0YzZlIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxNy0wMS0xNyAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICAnYnVpbGRib3Qtc3luY2VyLmpzJyBzaG91bGQgYmUgYWJs ZSB0byBkZXRlcm1pbmUgZm9yY2UgYnVpbGQgYXJndW1lbnQgZnJvbSBhIGxpc3Qgb2YgcG9zc2li bGUgcmVwb3NpdG9yaWVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY3MTUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkICdyb290Q2FuZGlkYXRlcycga2V5IHdoaWNoIG1hcHMgdG8gYSBsaXN0IG9m IHBvc3NpYmxlIHJlcG9zaXRvcmllcy4KKyAgICAgICAgRm9yIGEgYnVpbGQgcmVxdWVzdCwgb25s eSBvbmUgb2YgdGhlIHJlcG9zaXRvcmllcyBpbiB0aGUgbGlzdCBpcyB2YWxpZC4KKworICAgICAg ICAqIHRvb2xzL2pzL2J1aWxkYm90LXN5bmNlci5qczoKKyAgICAgICAgKEJ1aWxkYm90U3luY2Vy LnByb3RvdHlwZS5fcHJvcGVydGllc0ZvckJ1aWxkUmVxdWVzdCk6CisgICAgICAgIChCdWlsZGJv dFN5bmNlci5fdmFsaWRhdGVBbmRNZXJnZVByb3BlcnRpZXMpOgorICAgICAgICAoQnVpbGRib3RT eW5jZXIpOgorICAgICAgICAqIHVuaXQtdGVzdHMvYnVpbGRib3Qtc3luY2VyLXRlc3RzLmpzOgor ICAgICAgICAoc2FtcGxlaU9TQ29uZmlnKToKKyAgICAgICAgKHNhbXBsZWlPU0NvbmZpZ1dpdGhF eHBhbnNpb25zKToKKyAgICAgICAgKGNyZWF0ZVNhbXBsZUJ1aWxkUmVxdWVzdCk6CisgICAgICAg IChQcm9taXNlLnJlc29sdmUudGhlbik6CisgICAgICAgICogdW5pdC10ZXN0cy9yZXNvdXJjZXMv bW9jay12My1tb2RlbHMuanM6CisgICAgICAgIChNb2NrTW9kZWxzLmluamVjdCk6CisKIDIwMTct MDEtMTUgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWRkIHRo ZSBidWlsZCBmaXggZm9yIGJyb3dzZXJzIHRoYXQgZG9uJ3QgeWV0IHN1cHBvcnQgY3VzdG9tIGVs ZW1lbnRzIFNQSS4KZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9q cy9idWlsZGJvdC1zeW5jZXIuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvanMv YnVpbGRib3Qtc3luY2VyLmpzCmluZGV4IGFmNjBkZWEyMTQ2NjNjMGMwNWI1YmZlYThkOGNlN2Mz YzY3ZGE2ZWEuLmZkZGNkYjNiMGUyZjYzNTlmYWIyZGMyMDM1ZGQzMjk5OTkwZGJjNzUgMTAwNjQ0 Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9qcy9idWlsZGJvdC1zeW5jZXIu anMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xzL2pzL2J1aWxkYm90LXN5bmNl ci5qcwpAQCAtMjIyLDkgKzIyMiwxOSBAQCBjbGFzcyBCdWlsZGJvdFN5bmNlciB7CiAgICAgICAg ICAgICBlbHNlIGlmICgncm9vdCcgaW4gdmFsdWUpIHsKICAgICAgICAgICAgICAgICBsZXQgcmVw b3NpdG9yeU5hbWUgPSB2YWx1ZVsncm9vdCddOwogICAgICAgICAgICAgICAgIGxldCByZXBvc2l0 b3J5ID0gcmVwb3NpdG9yeUJ5TmFtZVtyZXBvc2l0b3J5TmFtZV07Ci0gICAgICAgICAgICAgICAg YXNzZXJ0KHJlcG9zaXRvcnksICciJHtyZXBvc2l0b3J5TmFtZX0iIG11c3QgYmUgc3BlY2lmaWVk Jyk7CisgICAgICAgICAgICAgICAgYXNzZXJ0KHJlcG9zaXRvcnksIGAiJHtyZXBvc2l0b3J5TmFt ZX0iIG11c3QgYmUgc3BlY2lmaWVkYCk7CiAgICAgICAgICAgICAgICAgcHJvcGVydGllc1trZXld ID0gcm9vdFNldC5yZXZpc2lvbkZvclJlcG9zaXRvcnkocmVwb3NpdG9yeSk7Ci0gICAgICAgICAg ICB9IGVsc2UgaWYgKCdyb290c0V4Y2x1ZGluZycgaW4gdmFsdWUpIHsKKyAgICAgICAgICAgIH0g ZWxzZSBpZiAoJ3Jvb3RDYW5kaWRhdGVzJyBpbiB2YWx1ZSkgeworICAgICAgICAgICAgICAgIGxl dCB2YWxpZENhbmRpZGF0ZUNvdW50ID0gMDsKKyAgICAgICAgICAgICAgICBmb3IgKGxldCByb290 Q2FuZGlkYXRlIG9mIHZhbHVlWydyb290Q2FuZGlkYXRlcyddKSB7CisgICAgICAgICAgICAgICAg ICAgIGlmKCEocm9vdENhbmRpZGF0ZSBpbiByZXBvc2l0b3J5QnlOYW1lKSkKKyAgICAgICAgICAg ICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0aWVzW2tl eV0gPSByb290U2V0LnJldmlzaW9uRm9yUmVwb3NpdG9yeShyZXBvc2l0b3J5QnlOYW1lW3Jvb3RD YW5kaWRhdGVdKTsKKyAgICAgICAgICAgICAgICAgICAgdmFsaWRDYW5kaWRhdGVDb3VudCArPSAx OworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwodmFsaWRD YW5kaWRhdGVDb3VudCwgMSwgYFRoZXJlIHNob3VsZCBiZSBleGFjdGx5IG9uZSB2YWxpZCByb290 IGFtb25nICIke3ZhbHVlWydyb290Q2FuZGlkYXRlcyddfSIuYCk7CisgICAgICAgICAgICB9Cisg ICAgICAgICAgICBlbHNlIGlmICgncm9vdHNFeGNsdWRpbmcnIGluIHZhbHVlKSB7CiAgICAgICAg ICAgICAgICAgbGV0IHJldmlzaW9uU2V0ID0gdGhpcy5fcmV2aXNpb25TZXRGcm9tUm9vdFNldFdp dGhFeGNsdXNpb25MaXN0KHJvb3RTZXQsIHZhbHVlWydyb290c0V4Y2x1ZGluZyddKTsKICAgICAg ICAgICAgICAgICBwcm9wZXJ0aWVzW2tleV0gPSBKU09OLnN0cmluZ2lmeShyZXZpc2lvblNldCk7 CiAgICAgICAgICAgICB9CkBAIC0zNzMsNyArMzgzLDcgQEAgY2xhc3MgQnVpbGRib3RTeW5jZXIg ewogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQogICAgICAgICAgICAg YXNzZXJ0LmVxdWFsKHR5cGVvZih2YWx1ZSksICdvYmplY3QnLCAnQSBhcmd1bWVudCB2YWx1ZSBt dXN0IGJlIGVpdGhlciBhIHN0cmluZyBvciBhIGRpY3Rpb25hcnknKTsKLSAgICAgICAgICAgICAg ICAKKwogICAgICAgICAgICAgbGV0IGtleXMgPSBPYmplY3Qua2V5cyh2YWx1ZSk7CiAgICAgICAg ICAgICBhc3NlcnQuZXF1YWwoa2V5cy5sZW5ndGgsIDEsICdhcmd1bWVudHMgdmFsdWUgY2Fubm90 IGNvbnRhaW4gbW9yZSB0aGFuIG9uZSBrZXknKTsKICAgICAgICAgICAgIGxldCBuYW1lZFZhbHVl ID0gdmFsdWVba2V5c1swXV07CkBAIC0zODEsMTAgKzM5MSwxMSBAQCBjbGFzcyBCdWlsZGJvdFN5 bmNlciB7CiAgICAgICAgICAgICBjYXNlICdyb290JzoKICAgICAgICAgICAgICAgICBhc3NlcnQu ZXF1YWwodHlwZW9mKG5hbWVkVmFsdWUpLCAnc3RyaW5nJywgJ3Jvb3QgbmFtZSBtdXN0IGJlIGEg c3RyaW5nJyk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlICdyb290 Q2FuZGlkYXRlcyc6IC8vZmFsbHRocm91Z2gKICAgICAgICAgICAgIGNhc2UgJ3Jvb3RzRXhjbHVk aW5nJzoKLSAgICAgICAgICAgICAgICBhc3NlcnQobmFtZWRWYWx1ZSBpbnN0YW5jZW9mIEFycmF5 LCAncm9vdHNFeGNsdWRpbmcgbXVzdCBzcGVjaWZ5IGFuIGFycmF5Jyk7CisgICAgICAgICAgICAg ICAgYXNzZXJ0KG5hbWVkVmFsdWUgaW5zdGFuY2VvZiBBcnJheSwgYCR7a2V5c1swXX0gbXVzdCBz cGVjaWZ5IGFuIGFycmF5YCk7CiAgICAgICAgICAgICAgICAgZm9yIChsZXQgZXhjbHVkZWRSb290 TmFtZSBvZiBuYW1lZFZhbHVlKQotICAgICAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwodHlw ZW9mKGV4Y2x1ZGVkUm9vdE5hbWUpLCAnc3RyaW5nJywgJ3Jvb3RzRXhjbHVkaW5nIG11c3Qgc3Bl Y2lmeSBhbiBhcnJheSBvZiBzdHJpbmdzJyk7CisgICAgICAgICAgICAgICAgICAgIGFzc2VydC5l cXVhbCh0eXBlb2YoZXhjbHVkZWRSb290TmFtZSksICdzdHJpbmcnLCBgJHtrZXlzWzBdfSBtdXN0 IHNwZWNpZnkgYW4gYXJyYXkgb2Ygc3RyaW5nc2ApOwogICAgICAgICAgICAgICAgIG5hbWVkVmFs dWUgPSBuYW1lZFZhbHVlLnNsaWNlKCk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg ICAgICBkZWZhdWx0OgpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3VuaXQt dGVzdHMvYnVpbGRib3Qtc3luY2VyLXRlc3RzLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3Jn L3VuaXQtdGVzdHMvYnVpbGRib3Qtc3luY2VyLXRlc3RzLmpzCmluZGV4IGI0NWE1Yjc4MzNmODQ3 YmJiOTBhNDM0MGUwMTJkYzRhNDI4MzUxODYuLjZlMzExMzYzNjk1ZGFiOGU5NzBmYjBlODA0ZTlm ODQ2YWE0ZmRkNzAgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy91bml0LXRl c3RzL2J1aWxkYm90LXN5bmNlci10ZXN0cy5qcworKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5v cmcvdW5pdC10ZXN0cy9idWlsZGJvdC1zeW5jZXItdGVzdHMuanMKQEAgLTE2LDYgKzE2LDcgQEAg ZnVuY3Rpb24gc2FtcGxlaU9TQ29uZmlnKCkKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAg ICAnYXJndW1lbnRzJzogewogICAgICAgICAgICAgICAgICAgICAnZGVzaXJlZF9pbWFnZSc6IHsn cm9vdCc6ICdpT1MnfSwKKyAgICAgICAgICAgICAgICAgICAgJ29wZW5zb3VyY2UnOiB7J3Jvb3RD YW5kaWRhdGVzJzogWydXZWJLaXQtU1ZOJywgJ1dlYktpdC1HaXQnXX0sCiAgICAgICAgICAgICAg ICAgICAgICdyb290c19kaWN0Jzogeydyb290c0V4Y2x1ZGluZyc6IFsnaU9TJ119CiAgICAgICAg ICAgICAgICAgfSwKICAgICAgICAgICAgICAgICAnc2xhdmVBcmd1bWVudCc6ICdzbGF2ZW5hbWUn LApAQCAtMTA3LDcgKzEwOCw2IEBAIGZ1bmN0aW9uIHNhbXBsZWlPU0NvbmZpZ1dpdGhFeHBhbnNp b25zKCkKICAgICAgICAgICAgIH0sCiAgICAgICAgIF0KICAgICB9Ci0gICAgCiB9CiAKIGxldCBz YW1wbGVSb290U2V0RGF0YSA9IHsKQEAgLTEyMiw3ICsxMjIsMTMgQEAgbGV0IHNhbXBsZVJvb3RT ZXREYXRhID0gewogICAgICAgICAndGltZSc6IDE0NTY5MzE4NzQwMDAsCiAgICAgICAgICdyZXBv c2l0b3J5JzogJ1NoYXJlZCcsCiAgICAgICAgICdyZXZpc2lvbic6ICc4MDIyOScsCi0gICAgfQor ICAgIH0sCisgICAgJ1dlYktpdC1HaXQnOiB7CisgICAgICAgICJpZCI6IjExMTIzOSIsCisgICAg ICAgICJ0aW1lIjoxNDU2OTMxODc0MDAwLAorICAgICAgICAicmVwb3NpdG9yeSI6IldlYktpdC1H aXQiLAorICAgICAgICAicmV2aXNpb24iOiI5YWJjZGVmIiwKKyAgICB9LAogfTsKIAogZnVuY3Rp b24gc21hbGxDb25maWd1cmF0aW9uKCkKQEAgLTIwNCw2ICsyMTAsNyBAQCBmdW5jdGlvbiBjcmVh dGVTYW1wbGVCdWlsZFJlcXVlc3QocGxhdGZvcm0sIHRlc3QpCiAgICAgbGV0IHJvb3RTZXQgPSBS b290U2V0LmVuc3VyZVNpbmdsZXRvbignNDE5NycsIHtyb290czogWwogICAgICAgICB7J2lkJzog JzExMTEyNycsICd0aW1lJzogMTQ1Njk1NTgwNzMzNCwgJ3JlcG9zaXRvcnknOiBNb2NrTW9kZWxz LndlYmtpdCwgJ3JldmlzaW9uJzogJzE5NzQ2Myd9LAogICAgICAgICB7J2lkJzogJzExMTIzNycs ICd0aW1lJzogMTQ1NjkzMTg3NDAwMCwgJ3JlcG9zaXRvcnknOiBNb2NrTW9kZWxzLnNoYXJlZFJl cG9zaXRvcnksICdyZXZpc2lvbic6ICc4MDIyOSd9LAorICAgICAgICB7J2lkJzogJzExMTIzOScs ICd0aW1lJzogMTQ1NjkzMTg3NDAwMCwgJ3JlcG9zaXRvcnknOiBNb2NrTW9kZWxzLm9wZW5zb3Vy Y2VSZXBvc2l0b3J5LCAncmV2aXNpb24nOiAnOWFiY2RlZid9LAogICAgICAgICB7J2lkJzogJzg4 OTMwJywgJ3RpbWUnOiAwLCAncmVwb3NpdG9yeSc6IE1vY2tNb2RlbHMuaW9zLCAncmV2aXNpb24n OiAnMTNBNDUyJ30sCiAgICAgXX0pOwogCkBAIC01NjQsNyArNTcxLDcgQEAgZGVzY3JpYmUoJ0J1 aWxkYm90U3luY2VyJywgZnVuY3Rpb24gKCkgewogICAgICAgICBpdCgnc2hvdWxkIGluY2x1ZGUg YWxsIHByb3BlcnRpZXMgc3BlY2lmaWVkIGluIGEgZ2l2ZW4gY29uZmlndXJhdGlvbicsIGZ1bmN0 aW9uICgpIHsKICAgICAgICAgICAgIGxldCBzeW5jZXJzID0gQnVpbGRib3RTeW5jZXIuX2xvYWRD b25maWcoUmVtb3RlQVBJLCBzYW1wbGVpT1NDb25maWcoKSk7CiAgICAgICAgICAgICBsZXQgcHJv cGVydGllcyA9IHN5bmNlcnNbMF0uX3Byb3BlcnRpZXNGb3JCdWlsZFJlcXVlc3QoY3JlYXRlU2Ft cGxlQnVpbGRSZXF1ZXN0KE1vY2tNb2RlbHMuaXBob25lLCBNb2NrTW9kZWxzLnNwZWVkb21ldGVy KSk7Ci0gICAgICAgICAgICBhc3NlcnQuZGVlcEVxdWFsKE9iamVjdC5rZXlzKHByb3BlcnRpZXMp LCBbJ2Rlc2lyZWRfaW1hZ2UnLCAncm9vdHNfZGljdCcsICd0ZXN0X25hbWUnLCAnZm9yY2VzY2hl ZHVsZXInLCAnYnVpbGRfcmVxdWVzdF9pZCddKTsKKyAgICAgICAgICAgIGFzc2VydC5kZWVwRXF1 YWwoT2JqZWN0LmtleXMocHJvcGVydGllcyksIFsnZGVzaXJlZF9pbWFnZScsICdvcGVuc291cmNl JywgJ3Jvb3RzX2RpY3QnLCAndGVzdF9uYW1lJywgJ2ZvcmNlc2NoZWR1bGVyJywgJ2J1aWxkX3Jl cXVlc3RfaWQnXSk7CiAgICAgICAgIH0pOwogCiAgICAgICAgIGl0KCdzaG91bGQgcHJlc2VydmUg bm9uLXBhcmFtZXRyaWMgcHJvcGVydHkgdmFsdWVzJywgZnVuY3Rpb24gKCkgewpAQCAtNTg0LDYg KzU5MSwxMiBAQCBkZXNjcmliZSgnQnVpbGRib3RTeW5jZXInLCBmdW5jdGlvbiAoKSB7CiAgICAg ICAgICAgICBhc3NlcnQuZXF1YWwocHJvcGVydGllc1snZGVzaXJlZF9pbWFnZSddLCAnMTNBNDUy Jyk7CiAgICAgICAgIH0pOwogCisgICAgICAgIGl0KCdzaG91bGQgcmVzb2x2ZSAicm9vdENhbmRp ZGF0ZXMiJywgZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgbGV0IHN5bmNlcnMgPSBCdWlsZGJv dFN5bmNlci5fbG9hZENvbmZpZyhSZW1vdGVBUEksIHNhbXBsZWlPU0NvbmZpZygpKTsKKyAgICAg ICAgICAgIGxldCBwcm9wZXJ0aWVzID0gc3luY2Vyc1swXS5fcHJvcGVydGllc0ZvckJ1aWxkUmVx dWVzdChjcmVhdGVTYW1wbGVCdWlsZFJlcXVlc3QoTW9ja01vZGVscy5pcGhvbmUsIE1vY2tNb2Rl bHMuc3BlZWRvbWV0ZXIpKTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChwcm9wZXJ0aWVzWydy b290c19kaWN0J10sIEpTT04uc3RyaW5naWZ5KHNhbXBsZVJvb3RTZXREYXRhKSk7CisgICAgICAg IH0pOworCiAgICAgICAgIGl0KCdzaG91bGQgcmVzb2x2ZSAicm9vdHNFeGNsdWRpbmciJywgZnVu Y3Rpb24gKCkgewogICAgICAgICAgICAgbGV0IHN5bmNlcnMgPSBCdWlsZGJvdFN5bmNlci5fbG9h ZENvbmZpZyhSZW1vdGVBUEksIHNhbXBsZWlPU0NvbmZpZygpKTsKICAgICAgICAgICAgIGxldCBw cm9wZXJ0aWVzID0gc3luY2Vyc1swXS5fcHJvcGVydGllc0ZvckJ1aWxkUmVxdWVzdChjcmVhdGVT YW1wbGVCdWlsZFJlcXVlc3QoTW9ja01vZGVscy5pcGhvbmUsIE1vY2tNb2RlbHMuc3BlZWRvbWV0 ZXIpKTsKQEAgLTg5Miw5ICs5MDUsMTEgQEAgZGVzY3JpYmUoJ0J1aWxkYm90U3luY2VyJywgZnVu Y3Rpb24gKCkgewogICAgICAgICAgICAgICAgIGFzc2VydC5kZWVwRXF1YWwocmVxdWVzdHNbMF0u ZGF0YSwgewogICAgICAgICAgICAgICAgICAgICAnYnVpbGRfcmVxdWVzdF9pZCc6ICcxNjczMy0n ICsgTW9ja01vZGVscy5pcGhvbmUuaWQoKSwKICAgICAgICAgICAgICAgICAgICAgJ2Rlc2lyZWRf aW1hZ2UnOiAnMTNBNDUyJywKKyAgICAgICAgICAgICAgICAgICAgIm9wZW5zb3VyY2UiOiAiOWFi Y2RlZiIsCiAgICAgICAgICAgICAgICAgICAgICdmb3JjZXNjaGVkdWxlcic6ICdBQlRlc3QtaVBo b25lLVJ1bkJlbmNobWFyay1UZXN0cy1Gb3JjZVNjaGVkdWxlcicsCiAgICAgICAgICAgICAgICAg ICAgICdyb290c19kaWN0JzogJ3siV2ViS2l0Ijp7ImlkIjoiMTExMTI3IiwidGltZSI6MTQ1Njk1 NTgwNzMzNCwicmVwb3NpdG9yeSI6IldlYktpdCIsInJldmlzaW9uIjoiMTk3NDYzIn0sJwotICAg ICAgICAgICAgICAgICAgICAgICAgKyAnIlNoYXJlZCI6eyJpZCI6IjExMTIzNyIsInRpbWUiOjE0 NTY5MzE4NzQwMDAsInJlcG9zaXRvcnkiOiJTaGFyZWQiLCJyZXZpc2lvbiI6IjgwMjI5In19JywK KyAgICAgICAgICAgICAgICAgICAgICAgICsgJyJTaGFyZWQiOnsiaWQiOiIxMTEyMzciLCJ0aW1l IjoxNDU2OTMxODc0MDAwLCJyZXBvc2l0b3J5IjoiU2hhcmVkIiwicmV2aXNpb24iOiI4MDIyOSJ9 LCcKKyAgICAgICAgICAgICAgICAgICAgICAgICsgJyJXZWJLaXQtR2l0Ijp7ImlkIjoiMTExMjM5 IiwidGltZSI6MTQ1NjkzMTg3NDAwMCwicmVwb3NpdG9yeSI6IldlYktpdC1HaXQiLCJyZXZpc2lv biI6IjlhYmNkZWYifX0nLAogICAgICAgICAgICAgICAgICAgICAnc2xhdmVuYW1lJzogJ3NvbWUt c2xhdmUnLAogICAgICAgICAgICAgICAgICAgICAndGVzdF9uYW1lJzogJ3NwZWVkb21ldGVyJwog ICAgICAgICAgICAgICAgIH0pOwpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3Jn L3VuaXQtdGVzdHMvcmVzb3VyY2VzL21vY2stdjMtbW9kZWxzLmpzIGIvV2Vic2l0ZXMvcGVyZi53 ZWJraXQub3JnL3VuaXQtdGVzdHMvcmVzb3VyY2VzL21vY2stdjMtbW9kZWxzLmpzCmluZGV4IDc5 NWVlMWQ4MzZjNTJjZGRiMzgwYzFkZmU1MmRjMDRhMDAyODNmYWMuLmQxMDkxMTdlMzRlMzMxYzAx NWQ5ZTQ4Y2VkOTIwNzBmMTZjOTU1ZGYgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy91bml0LXRlc3RzL3Jlc291cmNlcy9tb2NrLXYzLW1vZGVscy5qcworKysgYi9XZWJzaXRl cy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9yZXNvdXJjZXMvbW9jay12My1tb2RlbHMuanMK QEAgLTE4LDYgKzE4LDcgQEAgdmFyIE1vY2tNb2RlbHMgPSB7CiAgICAgICAgICAgICBNb2NrTW9k ZWxzLmlvcyA9IFJlcG9zaXRvcnkuZW5zdXJlU2luZ2xldG9uKDIyLCB7bmFtZTogJ2lPUyd9KTsK ICAgICAgICAgICAgIE1vY2tNb2RlbHMud2Via2l0ID0gUmVwb3NpdG9yeS5lbnN1cmVTaW5nbGV0 b24oMTEsIHtuYW1lOiAnV2ViS2l0JywgdXJsOiAnaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFu Z2VzZXQvJDEnfSk7CiAgICAgICAgICAgICBNb2NrTW9kZWxzLnNoYXJlZFJlcG9zaXRvcnkgPSBS ZXBvc2l0b3J5LmVuc3VyZVNpbmdsZXRvbigxNiwge25hbWU6ICdTaGFyZWQnfSk7CisgICAgICAg ICAgICBNb2NrTW9kZWxzLm9wZW5zb3VyY2VSZXBvc2l0b3J5ID0gUmVwb3NpdG9yeS5lbnN1cmVT aW5nbGV0b24oMTcsIHtuYW1lOiAnV2ViS2l0LUdpdCd9KTsKICAgICAgICAgICAgIE1vY2tNb2Rl bHMuYnVpbGRlciA9IG5ldyBCdWlsZGVyKDE3Niwge25hbWU6ICdXZWJLaXQgUGVyZiBCdWlsZGVy JywgYnVpbGRVcmw6ICdodHRwOi8vYnVpbGQud2Via2l0Lm9yZy9idWlsZGVycy8kYnVpbGRlck5h bWUvJGJ1aWxkTnVtYmVyJ30pOwogCiAgICAgICAgICAgICBNb2NrTW9kZWxzLnNvbWVUZXN0ID0g VGVzdC5lbnN1cmVTaW5nbGV0b24oMSwge25hbWU6ICdTb21lIHRlc3QnfSk7Cg== 299214 2017-01-18 18:43:23 -0800 2017-01-18 19:20:49 -0800 Patch for landing bug-167152-20170118184133.patch text/plain 10943 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwOTAzCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA0Y2EwYzA5YTgwYjY1MDAyMTNhN2E3NjRhY2M0NjlmZjE2YTI2MDBlLi4yMmQyM2U5YzY1 YjI1NzQwMzYyZThjMWNhMjUwZTU3OGVjMDQzN2FmIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxNy0wMS0xNyAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICAnYnVpbGRib3Qtc3luY2VyLmpzJyBzaG91bGQgYmUgYWJs ZSB0byBkZXRlcm1pbmUgZm9yY2UgYnVpbGQgYXJndW1lbnQgZnJvbSBhIGxpc3Qgb2YgcG9zc2li bGUgcmVwb3NpdG9yaWVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY3MTUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgorCisg ICAgICAgIEFkZCAncm9vdE9wdGlvbnMnIGtleSB3aGljaCBtYXBzIHRvIGEgbGlzdCBvZiBwb3Nz aWJsZSByZXBvc2l0b3JpZXMuCisgICAgICAgIEZvciBhIGJ1aWxkIHJlcXVlc3QsIG9ubHkgb25l IG9mIHRoZSByZXBvc2l0b3JpZXMgaW4gdGhlIGxpc3QgaXMgdmFsaWQuCisKKyAgICAgICAgKiB0 b29scy9qcy9idWlsZGJvdC1zeW5jZXIuanM6CisgICAgICAgIChCdWlsZGJvdFN5bmNlci5wcm90 b3R5cGUuX3Byb3BlcnRpZXNGb3JCdWlsZFJlcXVlc3QpOgorICAgICAgICAoQnVpbGRib3RTeW5j ZXIuX3ZhbGlkYXRlQW5kTWVyZ2VQcm9wZXJ0aWVzKToKKyAgICAgICAgKEJ1aWxkYm90U3luY2Vy KToKKyAgICAgICAgKiB1bml0LXRlc3RzL2J1aWxkYm90LXN5bmNlci10ZXN0cy5qczoKKyAgICAg ICAgKHNhbXBsZWlPU0NvbmZpZyk6CisgICAgICAgIChzYW1wbGVpT1NDb25maWdXaXRoRXhwYW5z aW9ucyk6CisgICAgICAgIChjcmVhdGVTYW1wbGVCdWlsZFJlcXVlc3QpOgorICAgICAgICAoUHJv bWlzZS5yZXNvbHZlLnRoZW4pOgorICAgICAgICAqIHVuaXQtdGVzdHMvcmVzb3VyY2VzL21vY2st djMtbW9kZWxzLmpzOgorICAgICAgICAoTW9ja01vZGVscy5pbmplY3QpOgorCiAyMDE3LTAxLTE3 ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIE1ha2UgY2FsbHMg dG8gcmVuZGVyKCkgZnVuY3Rpb25zIGFzeW5jCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvdG9vbHMvanMvYnVpbGRib3Qtc3luY2VyLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJr aXQub3JnL3Rvb2xzL2pzL2J1aWxkYm90LXN5bmNlci5qcwppbmRleCBhZjYwZGVhMjE0NjYzYzBj MDViNWJmZWE4ZDhjZTdjM2M2N2RhNmVhLi44OGFlZDA1YWI4ODVhMTFhOTg3YTk3YzQyZTFkZTZm YTZkYmIwZGEzIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvanMv YnVpbGRib3Qtc3luY2VyLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9q cy9idWlsZGJvdC1zeW5jZXIuanMKQEAgLTIyMiw5ICsyMjIsMTQgQEAgY2xhc3MgQnVpbGRib3RT eW5jZXIgewogICAgICAgICAgICAgZWxzZSBpZiAoJ3Jvb3QnIGluIHZhbHVlKSB7CiAgICAgICAg ICAgICAgICAgbGV0IHJlcG9zaXRvcnlOYW1lID0gdmFsdWVbJ3Jvb3QnXTsKICAgICAgICAgICAg ICAgICBsZXQgcmVwb3NpdG9yeSA9IHJlcG9zaXRvcnlCeU5hbWVbcmVwb3NpdG9yeU5hbWVdOwot ICAgICAgICAgICAgICAgIGFzc2VydChyZXBvc2l0b3J5LCAnIiR7cmVwb3NpdG9yeU5hbWV9IiBt dXN0IGJlIHNwZWNpZmllZCcpOworICAgICAgICAgICAgICAgIGFzc2VydChyZXBvc2l0b3J5LCBg IiR7cmVwb3NpdG9yeU5hbWV9IiBtdXN0IGJlIHNwZWNpZmllZGApOwogICAgICAgICAgICAgICAg IHByb3BlcnRpZXNba2V5XSA9IHJvb3RTZXQucmV2aXNpb25Gb3JSZXBvc2l0b3J5KHJlcG9zaXRv cnkpOwotICAgICAgICAgICAgfSBlbHNlIGlmICgncm9vdHNFeGNsdWRpbmcnIGluIHZhbHVlKSB7 CisgICAgICAgICAgICB9IGVsc2UgaWYgKCdyb290T3B0aW9ucycgaW4gdmFsdWUpIHsKKyAgICAg ICAgICAgICAgICBjb25zdCBmaWx0ZXJlZE9wdGlvbnMgPSB2YWx1ZVsncm9vdE9wdGlvbnMnXS5m aWx0ZXIoKG9wdGlvbikgPT4gb3B0aW9uIGluIHJlcG9zaXRvcnlCeU5hbWUpOworICAgICAgICAg ICAgICAgIGFzc2VydC5lcXVhbChmaWx0ZXJlZE9wdGlvbnMubGVuZ3RoLCAxLCBgVGhlcmUgc2hv dWxkIGJlIGV4YWN0bHkgb25lIHZhbGlkIHJvb3QgYW1vbmcgIiR7dmFsdWVbJ3Jvb3RPcHRpb25z J119Ii5gKTsKKyAgICAgICAgICAgICAgICBwcm9wZXJ0aWVzW2tleV0gPSByb290U2V0LnJldmlz aW9uRm9yUmVwb3NpdG9yeShyZXBvc2l0b3J5QnlOYW1lW2ZpbHRlcmVkT3B0aW9uc1swXV0pOwor ICAgICAgICAgICAgfQorICAgICAgICAgICAgZWxzZSBpZiAoJ3Jvb3RzRXhjbHVkaW5nJyBpbiB2 YWx1ZSkgewogICAgICAgICAgICAgICAgIGxldCByZXZpc2lvblNldCA9IHRoaXMuX3JldmlzaW9u U2V0RnJvbVJvb3RTZXRXaXRoRXhjbHVzaW9uTGlzdChyb290U2V0LCB2YWx1ZVsncm9vdHNFeGNs dWRpbmcnXSk7CiAgICAgICAgICAgICAgICAgcHJvcGVydGllc1trZXldID0gSlNPTi5zdHJpbmdp ZnkocmV2aXNpb25TZXQpOwogICAgICAgICAgICAgfQpAQCAtMzM0LDI1ICszMzksMjUgQEAgY2xh c3MgQnVpbGRib3RTeW5jZXIgewogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAg ICAgICBzd2l0Y2ggKG5hbWUpIHsKLSAgICAgICAgICAgIGNhc2UgJ3Byb3BlcnRpZXMnOiAvLyBm YWxsdGhyb3VnaAorICAgICAgICAgICAgY2FzZSAncHJvcGVydGllcyc6IC8vIEZhbGx0aHJvdWdo CiAgICAgICAgICAgICBjYXNlICdhcmd1bWVudHMnOgogICAgICAgICAgICAgICAgIGFzc2VydC5l cXVhbCh0eXBlb2YodmFsdWUpLCAnb2JqZWN0JywgJ2FyZ3VtZW50cyBzaG91bGQgYmUgYSBkaWN0 aW9uYXJ5Jyk7CiAgICAgICAgICAgICAgICAgaWYgKCFjb25maWdbJ3Byb3BlcnRpZXMnXSkKICAg ICAgICAgICAgICAgICAgICAgY29uZmlnWydwcm9wZXJ0aWVzJ10gPSB7fTsKICAgICAgICAgICAg ICAgICB0aGlzLl92YWxpZGF0ZUFuZE1lcmdlUHJvcGVydGllcyhjb25maWdbJ3Byb3BlcnRpZXMn XSwgdmFsdWUpOwogICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSAndGVz dCc6IC8vIGZhbGx0aHJvdWdoCi0gICAgICAgICAgICBjYXNlICdzbGF2ZUxpc3QnOiAvLyBmYWxs dGhyb3VnaAorICAgICAgICAgICAgY2FzZSAndGVzdCc6IC8vIEZhbGx0aHJvdWdoCisgICAgICAg ICAgICBjYXNlICdzbGF2ZUxpc3QnOiAvLyBGYWxsdGhyb3VnaAogICAgICAgICAgICAgY2FzZSAn cGxhdGZvcm1zJzoKICAgICAgICAgICAgIGNhc2UgJ3R5cGVzJzoKICAgICAgICAgICAgICAgICBh c3NlcnQodmFsdWUgaW5zdGFuY2VvZiBBcnJheSwgYCR7bmFtZX0gc2hvdWxkIGJlIGFuIGFycmF5 YCk7CiAgICAgICAgICAgICAgICAgYXNzZXJ0KHZhbHVlLmV2ZXJ5KGZ1bmN0aW9uIChwYXJ0KSB7 IHJldHVybiB0eXBlb2YgcGFydCA9PSAnc3RyaW5nJzsgfSksIGAke25hbWV9IHNob3VsZCBiZSBh biBhcnJheSBvZiBzdHJpbmdzYCk7CiAgICAgICAgICAgICAgICAgY29uZmlnW25hbWVdID0gdmFs dWUuc2xpY2UoKTsKICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgJ3R5 cGUnOiAvLyBmYWxsdGhyb3VnaAotICAgICAgICAgICAgY2FzZSAnYnVpbGRlcic6IC8vIGZhbGx0 aHJvdWdoCi0gICAgICAgICAgICBjYXNlICdwbGF0Zm9ybSc6IC8vIGZhbGx0aHJvdWdoCi0gICAg ICAgICAgICBjYXNlICdzbGF2ZUFyZ3VtZW50JzogLy8gZmFsbHRocm91Z2gKKyAgICAgICAgICAg IGNhc2UgJ3R5cGUnOiAvLyBGYWxsdGhyb3VnaAorICAgICAgICAgICAgY2FzZSAnYnVpbGRlcic6 IC8vIEZhbGx0aHJvdWdoCisgICAgICAgICAgICBjYXNlICdwbGF0Zm9ybSc6IC8vIEZhbGx0aHJv dWdoCisgICAgICAgICAgICBjYXNlICdzbGF2ZUFyZ3VtZW50JzogLy8gRmFsbHRocm91Z2gKICAg ICAgICAgICAgIGNhc2UgJ2J1aWxkUmVxdWVzdEFyZ3VtZW50JzoKICAgICAgICAgICAgICAgICBh c3NlcnQuZXF1YWwodHlwZW9mKHZhbHVlKSwgJ3N0cmluZycsIGAke25hbWV9IHNob3VsZCBiZSBv ZiBzdHJpbmcgdHlwZWApOwogICAgICAgICAgICAgICAgIGNvbmZpZ1tuYW1lXSA9IHZhbHVlOwpA QCAtMzczLDcgKzM3OCw3IEBAIGNsYXNzIEJ1aWxkYm90U3luY2VyIHsKICAgICAgICAgICAgICAg ICBjb250aW51ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGFzc2VydC5lcXVhbCh0eXBl b2YodmFsdWUpLCAnb2JqZWN0JywgJ0EgYXJndW1lbnQgdmFsdWUgbXVzdCBiZSBlaXRoZXIgYSBz dHJpbmcgb3IgYSBkaWN0aW9uYXJ5Jyk7Ci0gICAgICAgICAgICAgICAgCisKICAgICAgICAgICAg IGxldCBrZXlzID0gT2JqZWN0LmtleXModmFsdWUpOwogICAgICAgICAgICAgYXNzZXJ0LmVxdWFs KGtleXMubGVuZ3RoLCAxLCAnYXJndW1lbnRzIHZhbHVlIGNhbm5vdCBjb250YWluIG1vcmUgdGhh biBvbmUga2V5Jyk7CiAgICAgICAgICAgICBsZXQgbmFtZWRWYWx1ZSA9IHZhbHVlW2tleXNbMF1d OwpAQCAtMzgxLDEwICszODYsMTEgQEAgY2xhc3MgQnVpbGRib3RTeW5jZXIgewogICAgICAgICAg ICAgY2FzZSAncm9vdCc6CiAgICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHR5cGVvZihuYW1l ZFZhbHVlKSwgJ3N0cmluZycsICdyb290IG5hbWUgbXVzdCBiZSBhIHN0cmluZycpOwogICAgICAg ICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSAncm9vdE9wdGlvbnMnOiAvLyBGYWxs dGhyb3VnaAogICAgICAgICAgICAgY2FzZSAncm9vdHNFeGNsdWRpbmcnOgotICAgICAgICAgICAg ICAgIGFzc2VydChuYW1lZFZhbHVlIGluc3RhbmNlb2YgQXJyYXksICdyb290c0V4Y2x1ZGluZyBt dXN0IHNwZWNpZnkgYW4gYXJyYXknKTsKKyAgICAgICAgICAgICAgICBhc3NlcnQobmFtZWRWYWx1 ZSBpbnN0YW5jZW9mIEFycmF5LCBgJHtrZXlzWzBdfSBtdXN0IHNwZWNpZnkgYW4gYXJyYXlgKTsK ICAgICAgICAgICAgICAgICBmb3IgKGxldCBleGNsdWRlZFJvb3ROYW1lIG9mIG5hbWVkVmFsdWUp Ci0gICAgICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbCh0eXBlb2YoZXhjbHVkZWRSb290TmFt ZSksICdzdHJpbmcnLCAncm9vdHNFeGNsdWRpbmcgbXVzdCBzcGVjaWZ5IGFuIGFycmF5IG9mIHN0 cmluZ3MnKTsKKyAgICAgICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHR5cGVvZihleGNsdWRl ZFJvb3ROYW1lKSwgJ3N0cmluZycsIGAke2tleXNbMF19IG11c3Qgc3BlY2lmeSBhbiBhcnJheSBv ZiBzdHJpbmdzYCk7CiAgICAgICAgICAgICAgICAgbmFtZWRWYWx1ZSA9IG5hbWVkVmFsdWUuc2xp Y2UoKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGRlZmF1bHQ6CmRpZmYg LS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9idWlsZGJvdC1zeW5j ZXItdGVzdHMuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9idWlsZGJv dC1zeW5jZXItdGVzdHMuanMKaW5kZXggYjQ1YTViNzgzM2Y4NDdiYmI5MGE0MzQwZTAxMmRjNGE0 MjgzNTE4Ni4uYmNmN2RjNGFkNzNjMjYzMjE5OGJlZTZhNzEwZmE1M2FlNGJhZDY4ZiAxMDA2NDQK LS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3VuaXQtdGVzdHMvYnVpbGRib3Qtc3luY2Vy LXRlc3RzLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy91bml0LXRlc3RzL2J1aWxk Ym90LXN5bmNlci10ZXN0cy5qcwpAQCAtMTYsNiArMTYsNyBAQCBmdW5jdGlvbiBzYW1wbGVpT1ND b25maWcoKQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICdhcmd1bWVudHMnOiB7CiAg ICAgICAgICAgICAgICAgICAgICdkZXNpcmVkX2ltYWdlJzogeydyb290JzogJ2lPUyd9LAorICAg ICAgICAgICAgICAgICAgICAnb3BlbnNvdXJjZSc6IHsncm9vdE9wdGlvbnMnOiBbJ1dlYktpdC1T Vk4nLCAnV2ViS2l0LUdpdCddfSwKICAgICAgICAgICAgICAgICAgICAgJ3Jvb3RzX2RpY3QnOiB7 J3Jvb3RzRXhjbHVkaW5nJzogWydpT1MnXX0KICAgICAgICAgICAgICAgICB9LAogICAgICAgICAg ICAgICAgICdzbGF2ZUFyZ3VtZW50JzogJ3NsYXZlbmFtZScsCkBAIC0xMDcsNyArMTA4LDYgQEAg ZnVuY3Rpb24gc2FtcGxlaU9TQ29uZmlnV2l0aEV4cGFuc2lvbnMoKQogICAgICAgICAgICAgfSwK ICAgICAgICAgXQogICAgIH0KLSAgICAKIH0KIAogbGV0IHNhbXBsZVJvb3RTZXREYXRhID0gewpA QCAtMTIyLDcgKzEyMiwxMyBAQCBsZXQgc2FtcGxlUm9vdFNldERhdGEgPSB7CiAgICAgICAgICd0 aW1lJzogMTQ1NjkzMTg3NDAwMCwKICAgICAgICAgJ3JlcG9zaXRvcnknOiAnU2hhcmVkJywKICAg ICAgICAgJ3JldmlzaW9uJzogJzgwMjI5JywKLSAgICB9CisgICAgfSwKKyAgICAnV2ViS2l0LUdp dCc6IHsKKyAgICAgICAgImlkIjoiMTExMjM5IiwKKyAgICAgICAgInRpbWUiOjE0NTY5MzE4NzQw MDAsCisgICAgICAgICJyZXBvc2l0b3J5IjoiV2ViS2l0LUdpdCIsCisgICAgICAgICJyZXZpc2lv biI6IjlhYmNkZWYiLAorICAgIH0sCiB9OwogCiBmdW5jdGlvbiBzbWFsbENvbmZpZ3VyYXRpb24o KQpAQCAtMjA0LDYgKzIxMCw3IEBAIGZ1bmN0aW9uIGNyZWF0ZVNhbXBsZUJ1aWxkUmVxdWVzdChw bGF0Zm9ybSwgdGVzdCkKICAgICBsZXQgcm9vdFNldCA9IFJvb3RTZXQuZW5zdXJlU2luZ2xldG9u KCc0MTk3Jywge3Jvb3RzOiBbCiAgICAgICAgIHsnaWQnOiAnMTExMTI3JywgJ3RpbWUnOiAxNDU2 OTU1ODA3MzM0LCAncmVwb3NpdG9yeSc6IE1vY2tNb2RlbHMud2Via2l0LCAncmV2aXNpb24nOiAn MTk3NDYzJ30sCiAgICAgICAgIHsnaWQnOiAnMTExMjM3JywgJ3RpbWUnOiAxNDU2OTMxODc0MDAw LCAncmVwb3NpdG9yeSc6IE1vY2tNb2RlbHMuc2hhcmVkUmVwb3NpdG9yeSwgJ3JldmlzaW9uJzog JzgwMjI5J30sCisgICAgICAgIHsnaWQnOiAnMTExMjM5JywgJ3RpbWUnOiAxNDU2OTMxODc0MDAw LCAncmVwb3NpdG9yeSc6IE1vY2tNb2RlbHMud2Via2l0R2l0LCAncmV2aXNpb24nOiAnOWFiY2Rl Zid9LAogICAgICAgICB7J2lkJzogJzg4OTMwJywgJ3RpbWUnOiAwLCAncmVwb3NpdG9yeSc6IE1v Y2tNb2RlbHMuaW9zLCAncmV2aXNpb24nOiAnMTNBNDUyJ30sCiAgICAgXX0pOwogCkBAIC01NjQs NyArNTcxLDcgQEAgZGVzY3JpYmUoJ0J1aWxkYm90U3luY2VyJywgZnVuY3Rpb24gKCkgewogICAg ICAgICBpdCgnc2hvdWxkIGluY2x1ZGUgYWxsIHByb3BlcnRpZXMgc3BlY2lmaWVkIGluIGEgZ2l2 ZW4gY29uZmlndXJhdGlvbicsIGZ1bmN0aW9uICgpIHsKICAgICAgICAgICAgIGxldCBzeW5jZXJz ID0gQnVpbGRib3RTeW5jZXIuX2xvYWRDb25maWcoUmVtb3RlQVBJLCBzYW1wbGVpT1NDb25maWco KSk7CiAgICAgICAgICAgICBsZXQgcHJvcGVydGllcyA9IHN5bmNlcnNbMF0uX3Byb3BlcnRpZXNG b3JCdWlsZFJlcXVlc3QoY3JlYXRlU2FtcGxlQnVpbGRSZXF1ZXN0KE1vY2tNb2RlbHMuaXBob25l LCBNb2NrTW9kZWxzLnNwZWVkb21ldGVyKSk7Ci0gICAgICAgICAgICBhc3NlcnQuZGVlcEVxdWFs KE9iamVjdC5rZXlzKHByb3BlcnRpZXMpLCBbJ2Rlc2lyZWRfaW1hZ2UnLCAncm9vdHNfZGljdCcs ICd0ZXN0X25hbWUnLCAnZm9yY2VzY2hlZHVsZXInLCAnYnVpbGRfcmVxdWVzdF9pZCddKTsKKyAg ICAgICAgICAgIGFzc2VydC5kZWVwRXF1YWwoT2JqZWN0LmtleXMocHJvcGVydGllcyksIFsnZGVz aXJlZF9pbWFnZScsICdvcGVuc291cmNlJywgJ3Jvb3RzX2RpY3QnLCAndGVzdF9uYW1lJywgJ2Zv cmNlc2NoZWR1bGVyJywgJ2J1aWxkX3JlcXVlc3RfaWQnXSk7CiAgICAgICAgIH0pOwogCiAgICAg ICAgIGl0KCdzaG91bGQgcHJlc2VydmUgbm9uLXBhcmFtZXRyaWMgcHJvcGVydHkgdmFsdWVzJywg ZnVuY3Rpb24gKCkgewpAQCAtNTg0LDYgKzU5MSwxMiBAQCBkZXNjcmliZSgnQnVpbGRib3RTeW5j ZXInLCBmdW5jdGlvbiAoKSB7CiAgICAgICAgICAgICBhc3NlcnQuZXF1YWwocHJvcGVydGllc1sn ZGVzaXJlZF9pbWFnZSddLCAnMTNBNDUyJyk7CiAgICAgICAgIH0pOwogCisgICAgICAgIGl0KCdz aG91bGQgcmVzb2x2ZSAicm9vdE9wdGlvbnMiJywgZnVuY3Rpb24gKCkgeworICAgICAgICAgICAg bGV0IHN5bmNlcnMgPSBCdWlsZGJvdFN5bmNlci5fbG9hZENvbmZpZyhSZW1vdGVBUEksIHNhbXBs ZWlPU0NvbmZpZygpKTsKKyAgICAgICAgICAgIGxldCBwcm9wZXJ0aWVzID0gc3luY2Vyc1swXS5f cHJvcGVydGllc0ZvckJ1aWxkUmVxdWVzdChjcmVhdGVTYW1wbGVCdWlsZFJlcXVlc3QoTW9ja01v ZGVscy5pcGhvbmUsIE1vY2tNb2RlbHMuc3BlZWRvbWV0ZXIpKTsKKyAgICAgICAgICAgIGFzc2Vy dC5lcXVhbChwcm9wZXJ0aWVzWydyb290c19kaWN0J10sIEpTT04uc3RyaW5naWZ5KHNhbXBsZVJv b3RTZXREYXRhKSk7CisgICAgICAgIH0pOworCiAgICAgICAgIGl0KCdzaG91bGQgcmVzb2x2ZSAi cm9vdHNFeGNsdWRpbmciJywgZnVuY3Rpb24gKCkgewogICAgICAgICAgICAgbGV0IHN5bmNlcnMg PSBCdWlsZGJvdFN5bmNlci5fbG9hZENvbmZpZyhSZW1vdGVBUEksIHNhbXBsZWlPU0NvbmZpZygp KTsKICAgICAgICAgICAgIGxldCBwcm9wZXJ0aWVzID0gc3luY2Vyc1swXS5fcHJvcGVydGllc0Zv ckJ1aWxkUmVxdWVzdChjcmVhdGVTYW1wbGVCdWlsZFJlcXVlc3QoTW9ja01vZGVscy5pcGhvbmUs IE1vY2tNb2RlbHMuc3BlZWRvbWV0ZXIpKTsKQEAgLTg5Miw5ICs5MDUsMTEgQEAgZGVzY3JpYmUo J0J1aWxkYm90U3luY2VyJywgZnVuY3Rpb24gKCkgewogICAgICAgICAgICAgICAgIGFzc2VydC5k ZWVwRXF1YWwocmVxdWVzdHNbMF0uZGF0YSwgewogICAgICAgICAgICAgICAgICAgICAnYnVpbGRf cmVxdWVzdF9pZCc6ICcxNjczMy0nICsgTW9ja01vZGVscy5pcGhvbmUuaWQoKSwKICAgICAgICAg ICAgICAgICAgICAgJ2Rlc2lyZWRfaW1hZ2UnOiAnMTNBNDUyJywKKyAgICAgICAgICAgICAgICAg ICAgIm9wZW5zb3VyY2UiOiAiOWFiY2RlZiIsCiAgICAgICAgICAgICAgICAgICAgICdmb3JjZXNj aGVkdWxlcic6ICdBQlRlc3QtaVBob25lLVJ1bkJlbmNobWFyay1UZXN0cy1Gb3JjZVNjaGVkdWxl cicsCiAgICAgICAgICAgICAgICAgICAgICdyb290c19kaWN0JzogJ3siV2ViS2l0Ijp7ImlkIjoi MTExMTI3IiwidGltZSI6MTQ1Njk1NTgwNzMzNCwicmVwb3NpdG9yeSI6IldlYktpdCIsInJldmlz aW9uIjoiMTk3NDYzIn0sJwotICAgICAgICAgICAgICAgICAgICAgICAgKyAnIlNoYXJlZCI6eyJp ZCI6IjExMTIzNyIsInRpbWUiOjE0NTY5MzE4NzQwMDAsInJlcG9zaXRvcnkiOiJTaGFyZWQiLCJy ZXZpc2lvbiI6IjgwMjI5In19JywKKyAgICAgICAgICAgICAgICAgICAgICAgICsgJyJTaGFyZWQi OnsiaWQiOiIxMTEyMzciLCJ0aW1lIjoxNDU2OTMxODc0MDAwLCJyZXBvc2l0b3J5IjoiU2hhcmVk IiwicmV2aXNpb24iOiI4MDIyOSJ9LCcKKyAgICAgICAgICAgICAgICAgICAgICAgICsgJyJXZWJL aXQtR2l0Ijp7ImlkIjoiMTExMjM5IiwidGltZSI6MTQ1NjkzMTg3NDAwMCwicmVwb3NpdG9yeSI6 IldlYktpdC1HaXQiLCJyZXZpc2lvbiI6IjlhYmNkZWYifX0nLAogICAgICAgICAgICAgICAgICAg ICAnc2xhdmVuYW1lJzogJ3NvbWUtc2xhdmUnLAogICAgICAgICAgICAgICAgICAgICAndGVzdF9u YW1lJzogJ3NwZWVkb21ldGVyJwogICAgICAgICAgICAgICAgIH0pOwpkaWZmIC0tZ2l0IGEvV2Vi c2l0ZXMvcGVyZi53ZWJraXQub3JnL3VuaXQtdGVzdHMvcmVzb3VyY2VzL21vY2stdjMtbW9kZWxz LmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3VuaXQtdGVzdHMvcmVzb3VyY2VzL21vY2st djMtbW9kZWxzLmpzCmluZGV4IDc5NWVlMWQ4MzZjNTJjZGRiMzgwYzFkZmU1MmRjMDRhMDAyODNm YWMuLmM2NTI1YTUwOWVlOGEyMjI3ZjRjMWY3Mjg0NmE0YmI2MjAzMzQ3MDMgMTAwNjQ0Ci0tLSBh L1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy91bml0LXRlc3RzL3Jlc291cmNlcy9tb2NrLXYzLW1v ZGVscy5qcworKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9yZXNvdXJj ZXMvbW9jay12My1tb2RlbHMuanMKQEAgLTE4LDYgKzE4LDcgQEAgdmFyIE1vY2tNb2RlbHMgPSB7 CiAgICAgICAgICAgICBNb2NrTW9kZWxzLmlvcyA9IFJlcG9zaXRvcnkuZW5zdXJlU2luZ2xldG9u KDIyLCB7bmFtZTogJ2lPUyd9KTsKICAgICAgICAgICAgIE1vY2tNb2RlbHMud2Via2l0ID0gUmVw b3NpdG9yeS5lbnN1cmVTaW5nbGV0b24oMTEsIHtuYW1lOiAnV2ViS2l0JywgdXJsOiAnaHR0cDov L3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvJDEnfSk7CiAgICAgICAgICAgICBNb2NrTW9kZWxz LnNoYXJlZFJlcG9zaXRvcnkgPSBSZXBvc2l0b3J5LmVuc3VyZVNpbmdsZXRvbigxNiwge25hbWU6 ICdTaGFyZWQnfSk7CisgICAgICAgICAgICBNb2NrTW9kZWxzLndlYmtpdEdpdCA9IFJlcG9zaXRv cnkuZW5zdXJlU2luZ2xldG9uKDE3LCB7bmFtZTogJ1dlYktpdC1HaXQnfSk7CiAgICAgICAgICAg ICBNb2NrTW9kZWxzLmJ1aWxkZXIgPSBuZXcgQnVpbGRlcigxNzYsIHtuYW1lOiAnV2ViS2l0IFBl cmYgQnVpbGRlcicsIGJ1aWxkVXJsOiAnaHR0cDovL2J1aWxkLndlYmtpdC5vcmcvYnVpbGRlcnMv JGJ1aWxkZXJOYW1lLyRidWlsZE51bWJlcid9KTsKIAogICAgICAgICAgICAgTW9ja01vZGVscy5z b21lVGVzdCA9IFRlc3QuZW5zdXJlU2luZ2xldG9uKDEsIHtuYW1lOiAnU29tZSB0ZXN0J30pOwo=