218082 2020-10-22 08:55:09 -0700 [webkitpy] Rename slave to worker in perftestsrunner 2021-05-17 10:01:35 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=225106 InRadar P2 Normal --- 213092 1 aakash_jain aakash_jain aakash_jain cdumez ews-watchlist glenn jbedard rniwa webkit-bug-importer oldest_to_newest 1700656 0 aakash_jain 2020-10-22 08:55:09 -0700 Rename slave to worker in perftestsrunner. This is to use more inclusive naming. 1700680 1 412109 aakash_jain 2020-10-22 09:28:31 -0700 Created attachment 412109 Patch 1700681 2 webkit-bug-importer 2020-10-22 09:31:37 -0700 <rdar://problem/70576780> 1700737 3 412109 rniwa 2020-10-22 10:52:52 -0700 Comment on attachment 412109 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=412109&action=review > Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:178 > + # TODO: remove this test and the corresponding parameter after all instances of this deprecated parameter have been removed Use FIXME instead. 1700745 4 412115 aakash_jain 2020-10-22 11:00:27 -0700 Created attachment 412115 Patch for landing 1700763 5 ews-feeder 2020-10-22 11:51:14 -0700 Committed r268880: <https://trac.webkit.org/changeset/268880> All reviewed patches have been landed. Closing bug and clearing flags on attachment 412115. 412109 2020-10-22 09:28:31 -0700 2020-10-22 11:00:23 -0700 Patch bug-218082-20201022092830.patch text/plain 11815 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2ODg2NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDIwLTEwLTIyICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0cHldIFJlbmFtZSBzbGF2ZSB0byB3b3JrZXIgaW4gcGVyZnRl c3RzcnVubmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTgwODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5 OgorICAgICAgICAoUGVyZlRlc3RzUnVubmVyLl9wYXJzZV9hcmdzKTogU3VwcG9ydGluZyBib3Ro IC0tc2xhdmUtY29uZmlnLWpzb24tcGF0aCBhbmQgLS13b3JrZXItY29uZmlnLWpzb24tcGF0aCBm b3Igbm93LgorICAgICAgICAoX2dlbmVyYXRlX3Jlc3VsdHMpOgorICAgICAgICAoX21lcmdlX3dv cmtlcl9jb25maWdfanNvbik6CisgICAgICAgIChfbWVyZ2Vfc2xhdmVfY29uZmlnX2pzb24pOiBE ZWxldGVkLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVy ZnRlc3RzcnVubmVyX2ludGVncmF0aW9udGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lcl91bml0dGVzdC5weToKKyAgICAg ICAgKE1haW5UZXN0LnRlc3RfcGFyc2VfYXJncyk6CisgICAgICAgIChNYWluVGVzdC50ZXN0X3Bh cnNlX2RlcHJlY2F0ZWRfYXJncyk6IEFkZGVkIHVuaXQtdGVzdCBmb3IgZGVwcmVjYXRlZCBwYXJh bWV0ZXIuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25m aWcvc3RlcHMucHk6CisgICAgICAgIChSdW5BbmRVcGxvYWRQZXJmVGVzdHMpOgorCiAyMDIwLTEw LTIyICBQZW5nIExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CiAKICAgICAgICAgTGV0IHdlYmtp dERpc3BsYXlpbmdGdWxsc2NyZWVuKCkgcmV0dXJuIHRydWUgd2hlbiBhIHZpZGVvIGVsZW1lbnTi gJlzIGZ1bGxzY3JlZW4gbW9kZSBpcyBub3QgVmlkZW9GdWxsc2NyZWVuTW9kZU5vbmUKSW5kZXg6 IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3N0ZXBzLnB5 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmct Y29uZmlnL3N0ZXBzLnB5CShyZXZpc2lvbiAyNjg4NjUpCisrKyBUb29scy9CdWlsZFNsYXZlU3Vw cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAt OTM3LDcgKzkzNyw3IEBAIGNsYXNzIFJ1bkFuZFVwbG9hZFBlcmZUZXN0cyhzaGVsbC5UZXN0KToK ICAgICBkZXNjcmlwdGlvbkRvbmUgPSBbInBlcmYtdGVzdHMiXQogICAgIGNvbW1hbmQgPSBbInB5 dGhvbiIsICIuL1Rvb2xzL1NjcmlwdHMvcnVuLXBlcmYtdGVzdHMiLAogICAgICAgICAgICAgICAg Ii0tb3V0cHV0LWpzb24tcGF0aCIsICJwZXJmLXRlc3QtcmVzdWx0cy5qc29uIiwKLSAgICAgICAg ICAgICAgICItLXNsYXZlLWNvbmZpZy1qc29uLXBhdGgiLCAiLi4vLi4vcGVyZi10ZXN0LWNvbmZp Zy5qc29uIiwKKyAgICAgICAgICAgICAgICItLXdvcmtlci1jb25maWctanNvbi1wYXRoIiwgIi4u Ly4uL3BlcmYtdGVzdC1jb25maWcuanNvbiIsCiAgICAgICAgICAgICAgICAiLS1uby1zaG93LXJl c3VsdHMiLAogICAgICAgICAgICAgICAgIi0tcmVzZXQtcmVzdWx0cyIsCiAgICAgICAgICAgICAg ICAiLS10ZXN0LXJlc3VsdHMtc2VydmVyIiwgInBlcmYud2Via2l0Lm9yZyIsCkluZGV4OiBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3Bl cmZ0ZXN0c3J1bm5lci5weQkocmV2aXNpb24gMjY4ODY1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkJKHdvcmtpbmcgY29weSkK QEAgLTExMSw4ICsxMTEsOSBAQCBjbGFzcyBQZXJmVGVzdHNSdW5uZXIob2JqZWN0KToKICAgICAg ICAgICAgICAgICBoZWxwPSJQYXRoIHRvIGdlbmVyYXRlIGEgSlNPTiBmaWxlIGF0OyBtYXkgY29u dGFpbiBwcmV2aW91cyByZXN1bHRzIGlmIGl0IGFscmVhZHkgZXhpc3RzLiIpLAogICAgICAgICAg ICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tcmVzZXQtcmVzdWx0cyIsIGFjdGlvbj0ic3RvcmVf dHJ1ZSIsCiAgICAgICAgICAgICAgICAgaGVscD0iQ2xlYXJzIHRoZSBjb250ZW50IGluIHRoZSBn ZW5lcmF0ZWQgSlNPTiBmaWxlIGJlZm9yZSBhZGRpbmcgdGhlIHJlc3VsdHMuIiksCi0gICAgICAg ICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1zbGF2ZS1jb25maWctanNvbi1wYXRoIiwgYWN0 aW9uPSdjYWxsYmFjaycsIGNhbGxiYWNrPV9leHBhbmRfcGF0aCwgdHlwZT0ic3RyIiwKLSAgICAg ICAgICAgICAgICBoZWxwPSJPbmx5IHVzZWQgb24gYm90cy4gUGF0aCB0byBhIHNsYXZlIGNvbmZp Z3VyYXRpb24gZmlsZS4iKSwKKyAgICAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLXNs YXZlLWNvbmZpZy1qc29uLXBhdGgiLCAiLS13b3JrZXItY29uZmlnLWpzb24tcGF0aCIsIGFjdGlv bj0nY2FsbGJhY2snLAorICAgICAgICAgICAgICAgIGNhbGxiYWNrPV9leHBhbmRfcGF0aCwgdHlw ZT0ic3RyIiwgZGVzdD0id29ya2VyX2NvbmZpZ19qc29uX3BhdGgiLAorICAgICAgICAgICAgICAg IGhlbHA9Ik9ubHkgdXNlZCBvbiBib3RzLiBQYXRoIHRvIGEgd29ya2VyIGNvbmZpZ3VyYXRpb24g ZmlsZS4iKSwKICAgICAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLWRlc2NyaXB0aW9u IiwKICAgICAgICAgICAgICAgICBoZWxwPSJBZGQgYSBkZXNjcmlwdGlvbiB0byB0aGUgb3V0cHV0 IEpTT04gZmlsZSBpZiBvbmUgaXMgZ2VuZXJhdGVkIiksCiAgICAgICAgICAgICBvcHRwYXJzZS5t YWtlX29wdGlvbigiLS1uby1zaG93LXJlc3VsdHMiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVm YXVsdD1UcnVlLCBkZXN0PSJzaG93X3Jlc3VsdHMiLApAQCAtMjQ2LDggKzI0Nyw4IEBAIGNsYXNz IFBlcmZUZXN0c1J1bm5lcihvYmplY3QpOgogICAgICAgICBvdXRwdXRfanNvbl9wYXRoID0gc2Vs Zi5fb3V0cHV0X2pzb25fcGF0aCgpCiAgICAgICAgIG91dHB1dCA9IHNlbGYuX2dlbmVyYXRlX3Jl c3VsdHNfZGljdChzZWxmLl90aW1lc3RhbXAsIG9wdGlvbnMuZGVzY3JpcHRpb24sIG9wdGlvbnMu cGxhdGZvcm0sIG9wdGlvbnMuYnVpbGRlcl9uYW1lLCBvcHRpb25zLmJ1aWxkX251bWJlcikKIAot ICAgICAgICBpZiBvcHRpb25zLnNsYXZlX2NvbmZpZ19qc29uX3BhdGg6Ci0gICAgICAgICAgICBv dXRwdXQgPSBzZWxmLl9tZXJnZV9zbGF2ZV9jb25maWdfanNvbihvcHRpb25zLnNsYXZlX2NvbmZp Z19qc29uX3BhdGgsIG91dHB1dCkKKyAgICAgICAgaWYgb3B0aW9ucy53b3JrZXJfY29uZmlnX2pz b25fcGF0aDoKKyAgICAgICAgICAgIG91dHB1dCA9IHNlbGYuX21lcmdlX3dvcmtlcl9jb25maWdf anNvbihvcHRpb25zLndvcmtlcl9jb25maWdfanNvbl9wYXRoLCBvdXRwdXQpCiAgICAgICAgICAg ICBpZiBub3Qgb3V0cHV0OgogICAgICAgICAgICAgICAgIHJldHVybiBzZWxmLkVYSVRfQ09ERV9C QURfU09VUkNFX0pTT04KIApAQCAtMzE2LDE5ICszMTcsMTkgQEAgY2xhc3MgUGVyZlRlc3RzUnVu bmVyKG9iamVjdCk6CiAgICAgZGVmIF9kYXRldGltZV9pbl9FUzVfY29tcGF0aWJsZV9pc29fZm9y bWF0KGRhdGV0aW1lKToKICAgICAgICAgcmV0dXJuIGRhdGV0aW1lLnN0cmZ0aW1lKCclWS0lbS0l ZFQlSDolTTolUy4lZicpCiAKLSAgICBkZWYgX21lcmdlX3NsYXZlX2NvbmZpZ19qc29uKHNlbGYs IHNsYXZlX2NvbmZpZ19qc29uX3BhdGgsIGNvbnRlbnRzKToKLSAgICAgICAgaWYgbm90IHNlbGYu X2hvc3QuZmlsZXN5c3RlbS5pc2ZpbGUoc2xhdmVfY29uZmlnX2pzb25fcGF0aCk6Ci0gICAgICAg ICAgICBfbG9nLmVycm9yKCJNaXNzaW5nIHNsYXZlIGNvbmZpZ3VyYXRpb24gSlNPTiBmaWxlOiAl cyIgJSBzbGF2ZV9jb25maWdfanNvbl9wYXRoKQorICAgIGRlZiBfbWVyZ2Vfd29ya2VyX2NvbmZp Z19qc29uKHNlbGYsIHdvcmtlcl9jb25maWdfanNvbl9wYXRoLCBjb250ZW50cyk6CisgICAgICAg IGlmIG5vdCBzZWxmLl9ob3N0LmZpbGVzeXN0ZW0uaXNmaWxlKHdvcmtlcl9jb25maWdfanNvbl9w YXRoKToKKyAgICAgICAgICAgIF9sb2cuZXJyb3IoJ01pc3Npbmcgd29ya2VyIGNvbmZpZ3VyYXRp b24gSlNPTiBmaWxlOiB7fScuZm9ybWF0KHdvcmtlcl9jb25maWdfanNvbl9wYXRoKSkKICAgICAg ICAgICAgIHJldHVybiBOb25lCiAKICAgICAgICAgdHJ5OgotICAgICAgICAgICAgc2xhdmVfY29u ZmlnX2pzb24gPSBzZWxmLl9ob3N0LmZpbGVzeXN0ZW0ub3Blbl90ZXh0X2ZpbGVfZm9yX3JlYWRp bmcoc2xhdmVfY29uZmlnX2pzb25fcGF0aCkKLSAgICAgICAgICAgIHNsYXZlX2NvbmZpZyA9IGpz b24ubG9hZChzbGF2ZV9jb25maWdfanNvbikKLSAgICAgICAgICAgIGZvciBrZXkgaW4gc2xhdmVf Y29uZmlnOgotICAgICAgICAgICAgICAgIGNvbnRlbnRzWydidWlsZGVyJyArIGtleS5jYXBpdGFs aXplKCldID0gc2xhdmVfY29uZmlnW2tleV0KKyAgICAgICAgICAgIHdvcmtlcl9jb25maWdfanNv biA9IHNlbGYuX2hvc3QuZmlsZXN5c3RlbS5vcGVuX3RleHRfZmlsZV9mb3JfcmVhZGluZyh3b3Jr ZXJfY29uZmlnX2pzb25fcGF0aCkKKyAgICAgICAgICAgIHdvcmtlcl9jb25maWcgPSBqc29uLmxv YWQod29ya2VyX2NvbmZpZ19qc29uKQorICAgICAgICAgICAgZm9yIGtleSBpbiB3b3JrZXJfY29u ZmlnOgorICAgICAgICAgICAgICAgIGNvbnRlbnRzWydidWlsZGVyJyArIGtleS5jYXBpdGFsaXpl KCldID0gd29ya2VyX2NvbmZpZ1trZXldCiAgICAgICAgICAgICByZXR1cm4gY29udGVudHMKICAg ICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlcnJvcjoKLSAgICAgICAgICAgIF9sb2cuZXJyb3Io IkZhaWxlZCB0byBtZXJnZSBzbGF2ZSBjb25maWd1cmF0aW9uIEpTT04gZmlsZSAlczogJXMiICUg KHNsYXZlX2NvbmZpZ19qc29uX3BhdGgsIGVycm9yKSkKKyAgICAgICAgICAgIF9sb2cuZXJyb3Io J0ZhaWxlZCB0byBtZXJnZSB3b3JrZXIgY29uZmlndXJhdGlvbiBKU09OIGZpbGUge306IHt9Jy5m b3JtYXQod29ya2VyX2NvbmZpZ19qc29uX3BhdGgsIGVycm9yKSkKICAgICAgICAgcmV0dXJuIE5v bmUKIAogICAgIGRlZiBfbWVyZ2Vfb3V0cHV0c19pZl9uZWVkZWQoc2VsZiwgb3V0cHV0X2pzb25f cGF0aCwgb3V0cHV0KToKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2Vf dGVzdHMvcGVyZnRlc3RzcnVubmVyX2ludGVncmF0aW9udGVzdC5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lcl9p bnRlZ3JhdGlvbnRlc3QucHkJKHJldmlzaW9uIDI2ODg2NSkKKysrIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyX2ludGVncmF0aW9udGVzdC5w eQkod29ya2luZyBjb3B5KQpAQCAtNDQ2LDIzICs0NDYsMjMgQEAgY2xhc3MgTWFpblRlc3QodW5p dHRlc3QuVGVzdENhc2UpOgogICAgICAgICBwb3J0Lmhvc3QuZmlsZXN5c3RlbS53cml0ZV90ZXh0 X2ZpbGUoJy9tb2NrLWNoZWNrb3V0L291dHB1dC5qc29uJywgJ3siYW5vdGhlciBiYWQganNvbiI6 ICIxIn0nKQogICAgICAgICBzZWxmLl90ZXN0X3J1bl93aXRoX2pzb25fb3V0cHV0KHJ1bm5lciwg cG9ydC5ob3N0LmZpbGVzeXN0ZW0sIGV4cGVjdGVkX2V4aXRfY29kZT1QZXJmVGVzdHNSdW5uZXIu RVhJVF9DT0RFX0JBRF9NRVJHRSkKIAotICAgIGRlZiB0ZXN0X3J1bl93aXRoX3NsYXZlX2NvbmZp Z19qc29uKHNlbGYpOgorICAgIGRlZiB0ZXN0X3J1bl93aXRoX3dvcmtlcl9jb25maWdfanNvbihz ZWxmKToKICAgICAgICAgcnVubmVyLCBwb3J0ID0gc2VsZi5jcmVhdGVfcnVubmVyX2FuZF9zZXR1 cF9yZXN1bHRzX3RlbXBsYXRlKGFyZ3M9WyctLW91dHB1dC1qc29uLXBhdGg9L21vY2stY2hlY2tv dXQvb3V0cHV0Lmpzb24nLAotICAgICAgICAgICAgJy0tc2xhdmUtY29uZmlnLWpzb24tcGF0aD0v bW9jay1jaGVja291dC9zbGF2ZS1jb25maWcuanNvbicsICctLXRlc3QtcmVzdWx0cy1zZXJ2ZXI9 c29tZS5ob3N0J10pCi0gICAgICAgIHBvcnQuaG9zdC5maWxlc3lzdGVtLndyaXRlX3RleHRfZmls ZSgnL21vY2stY2hlY2tvdXQvc2xhdmUtY29uZmlnLmpzb24nLCAneyJrZXkiOiAidmFsdWUifScp CisgICAgICAgICAgICAnLS13b3JrZXItY29uZmlnLWpzb24tcGF0aD0vbW9jay1jaGVja291dC93 b3JrZXItY29uZmlnLmpzb24nLCAnLS10ZXN0LXJlc3VsdHMtc2VydmVyPXNvbWUuaG9zdCddKQor ICAgICAgICBwb3J0Lmhvc3QuZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUoJy9tb2NrLWNoZWNr b3V0L3dvcmtlci1jb25maWcuanNvbicsICd7ImtleSI6ICJ2YWx1ZSJ9JykKICAgICAgICAgc2Vs Zi5fdGVzdF9ydW5fd2l0aF9qc29uX291dHB1dChydW5uZXIsIHBvcnQuaG9zdC5maWxlc3lzdGVt LCB1cGxvYWRfc3VjY2VlZHM9VHJ1ZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLl9s b2FkX291dHB1dF9qc29uKHJ1bm5lciksIFt7CiAgICAgICAgICAgICAiYnVpbGRUaW1lIjogIjIw MTMtMDItMDhUMTU6MTk6MzcuNDYwMDAwIiwgInRlc3RzIjogc2VsZi5fZXZlbnRfdGFyZ2V0X3dy YXBwZXJfYW5kX2luc3BlY3Rvcl9yZXN1bHRzLAogICAgICAgICAgICAgInJldmlzaW9ucyI6IHsi V2ViS2l0IjogeyJ0aW1lc3RhbXAiOiAiMjAxMy0wMi0wMSAwODo0ODowNSArMDAwMCIsICJyZXZp c2lvbiI6ICI1Njc4In19LCAiYnVpbGRlcktleSI6ICJ2YWx1ZSJ9XSkKIAotICAgIGRlZiB0ZXN0 X3J1bl93aXRoX2JhZF9zbGF2ZV9jb25maWdfanNvbihzZWxmKToKKyAgICBkZWYgdGVzdF9ydW5f d2l0aF9iYWRfd29ya2VyX2NvbmZpZ19qc29uKHNlbGYpOgogICAgICAgICBydW5uZXIsIHBvcnQg PSBzZWxmLmNyZWF0ZV9ydW5uZXJfYW5kX3NldHVwX3Jlc3VsdHNfdGVtcGxhdGUoYXJncz1bJy0t b3V0cHV0LWpzb24tcGF0aD0vbW9jay1jaGVja291dC9vdXRwdXQuanNvbicsCi0gICAgICAgICAg ICAnLS1zbGF2ZS1jb25maWctanNvbi1wYXRoPS9tb2NrLWNoZWNrb3V0L3NsYXZlLWNvbmZpZy5q c29uJywgJy0tdGVzdC1yZXN1bHRzLXNlcnZlcj1zb21lLmhvc3QnXSkKKyAgICAgICAgICAgICct LXdvcmtlci1jb25maWctanNvbi1wYXRoPS9tb2NrLWNoZWNrb3V0L3dvcmtlci1jb25maWcuanNv bicsICctLXRlc3QtcmVzdWx0cy1zZXJ2ZXI9c29tZS5ob3N0J10pCiAgICAgICAgIGxvZ3MgPSBz ZWxmLl90ZXN0X3J1bl93aXRoX2pzb25fb3V0cHV0KHJ1bm5lciwgcG9ydC5ob3N0LmZpbGVzeXN0 ZW0sIGV4cGVjdGVkX2V4aXRfY29kZT1QZXJmVGVzdHNSdW5uZXIuRVhJVF9DT0RFX0JBRF9TT1VS Q0VfSlNPTikKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCdNaXNzaW5nIHNsYXZlIGNvbmZpZ3Vy YXRpb24gSlNPTiBmaWxlOiAvbW9jay1jaGVja291dC9zbGF2ZS1jb25maWcuanNvbicgaW4gbG9n cykKLSAgICAgICAgcG9ydC5ob3N0LmZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKCcvbW9jay1j aGVja291dC9zbGF2ZS1jb25maWcuanNvbicsICdiYWQganNvbicpCisgICAgICAgIHNlbGYuYXNz ZXJ0VHJ1ZSgnTWlzc2luZyB3b3JrZXIgY29uZmlndXJhdGlvbiBKU09OIGZpbGU6IC9tb2NrLWNo ZWNrb3V0L3dvcmtlci1jb25maWcuanNvbicgaW4gbG9ncykKKyAgICAgICAgcG9ydC5ob3N0LmZp bGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKCcvbW9jay1jaGVja291dC93b3JrZXItY29uZmlnLmpz b24nLCAnYmFkIGpzb24nKQogICAgICAgICBzZWxmLl90ZXN0X3J1bl93aXRoX2pzb25fb3V0cHV0 KHJ1bm5lciwgcG9ydC5ob3N0LmZpbGVzeXN0ZW0sIGV4cGVjdGVkX2V4aXRfY29kZT1QZXJmVGVz dHNSdW5uZXIuRVhJVF9DT0RFX0JBRF9TT1VSQ0VfSlNPTikKLSAgICAgICAgcG9ydC5ob3N0LmZp bGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKCcvbW9jay1jaGVja291dC9zbGF2ZS1jb25maWcuanNv bicsICdbImFub3RoZXIgYmFkIGpzb24iXScpCisgICAgICAgIHBvcnQuaG9zdC5maWxlc3lzdGVt LndyaXRlX3RleHRfZmlsZSgnL21vY2stY2hlY2tvdXQvd29ya2VyLWNvbmZpZy5qc29uJywgJ1si YW5vdGhlciBiYWQganNvbiJdJykKICAgICAgICAgc2VsZi5fdGVzdF9ydW5fd2l0aF9qc29uX291 dHB1dChydW5uZXIsIHBvcnQuaG9zdC5maWxlc3lzdGVtLCBleHBlY3RlZF9leGl0X2NvZGU9UGVy ZlRlc3RzUnVubmVyLkVYSVRfQ09ERV9CQURfU09VUkNFX0pTT04pCiAKICAgICBkZWYgdGVzdF9y dW5fd2l0aF9tdWx0aXBsZV9yZXBvc2l0b3JpZXMoc2VsZik6CkBAIC00OTAsOCArNDkwLDggQEAg Y2xhc3MgTWFpblRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiB0ZXN0X3J1bl93aXRo X3VwbG9hZF9qc29uX3Nob3VsZF9nZW5lcmF0ZV9wZXJmX3dlYmtpdF9qc29uKHNlbGYpOgogICAg ICAgICBydW5uZXIsIHBvcnQgPSBzZWxmLmNyZWF0ZV9ydW5uZXJfYW5kX3NldHVwX3Jlc3VsdHNf dGVtcGxhdGUoYXJncz1bJy0tb3V0cHV0LWpzb24tcGF0aD0vbW9jay1jaGVja291dC9vdXRwdXQu anNvbicsCiAgICAgICAgICAgICAnLS10ZXN0LXJlc3VsdHMtc2VydmVyJywgJ3NvbWUuaG9zdCcs ICctLXBsYXRmb3JtJywgJ3BsYXRmb3JtMScsICctLWJ1aWxkZXItbmFtZScsICdidWlsZGVyMScs ICctLWJ1aWxkLW51bWJlcicsICcxMjMnLAotICAgICAgICAgICAgJy0tc2xhdmUtY29uZmlnLWpz b24tcGF0aD0vbW9jay1jaGVja291dC9zbGF2ZS1jb25maWcuanNvbiddKQotICAgICAgICBwb3J0 Lmhvc3QuZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUoJy9tb2NrLWNoZWNrb3V0L3NsYXZlLWNv bmZpZy5qc29uJywgJ3sia2V5IjogInZhbHVlMSJ9JykKKyAgICAgICAgICAgICctLXdvcmtlci1j b25maWctanNvbi1wYXRoPS9tb2NrLWNoZWNrb3V0L3dvcmtlci1jb25maWcuanNvbiddKQorICAg ICAgICBwb3J0Lmhvc3QuZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUoJy9tb2NrLWNoZWNrb3V0 L3dvcmtlci1jb25maWcuanNvbicsICd7ImtleSI6ICJ2YWx1ZTEifScpCiAKICAgICAgICAgc2Vs Zi5fdGVzdF9ydW5fd2l0aF9qc29uX291dHB1dChydW5uZXIsIHBvcnQuaG9zdC5maWxlc3lzdGVt LCB1cGxvYWRfc3VjY2VlZHM9VHJ1ZSkKICAgICAgICAgZ2VuZXJhdGVkX2pzb24gPSBqc29uLmxv YWRzKHBvcnQuaG9zdC5maWxlc3lzdGVtLmZpbGVzWycvbW9jay1jaGVja291dC9vdXRwdXQuanNv biddKQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJm dGVzdHNydW5uZXJfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXJfdW5pdHRlc3QucHkJKHJldmlz aW9uIDI2ODg2NSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMv cGVyZnRlc3RzcnVubmVyX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNDksNyArMTQ5 LDcgQEAgY2xhc3MgTWFpblRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgICAg ICctLW5vLXNob3ctcmVzdWx0cycsCiAgICAgICAgICAgICAgICAgJy0tcmVzZXQtcmVzdWx0cycs CiAgICAgICAgICAgICAgICAgJy0tb3V0cHV0LWpzb24tcGF0aD1hL291dHB1dC5qc29uJywKLSAg ICAgICAgICAgICAgICAnLS1zbGF2ZS1jb25maWctanNvbi1wYXRoPWEvc291cmNlLmpzb24nLAor ICAgICAgICAgICAgICAgICctLXdvcmtlci1jb25maWctanNvbi1wYXRoPWEvc291cmNlLmpzb24n LAogICAgICAgICAgICAgICAgICctLXRlc3QtcmVzdWx0cy1zZXJ2ZXI9c29tZWhvc3QnLAogICAg ICAgICAgICAgICAgICctLWFkZGl0aW9uYWwtZHJ0LWZsYWc9LS1lbmFibGUtdGhyZWFkZWQtcGFy c2VyJywKICAgICAgICAgICAgICAgICAnLS1hZGRpdGlvbmFsLWRydC1mbGFnPS0tYXdlc29tZXNh dWNlJywKQEAgLTE2NywxMyArMTY3LDE4IEBAIGNsYXNzIE1haW5UZXN0KHVuaXR0ZXN0LlRlc3RD YXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShvcHRpb25zLnNob3dfcmVzdWx0cykKICAg ICAgICAgc2VsZi5hc3NlcnRUcnVlKG9wdGlvbnMucmVzZXRfcmVzdWx0cykKICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChvcHRpb25zLm91dHB1dF9qc29uX3BhdGgsICdhL291dHB1dC5qc29uJykK LSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChvcHRpb25zLnNsYXZlX2NvbmZpZ19qc29uX3BhdGgs ICdhL3NvdXJjZS5qc29uJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChvcHRpb25zLndvcmtl cl9jb25maWdfanNvbl9wYXRoLCAnYS9zb3VyY2UuanNvbicpCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwob3B0aW9ucy50ZXN0X3Jlc3VsdHNfc2VydmVyLCAnc29tZWhvc3QnKQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKG9wdGlvbnMuYWRkaXRpb25hbF9kcnRfZmxhZywgWyctLWVuYWJsZS10 aHJlYWRlZC1wYXJzZXInLCAnLS1hd2Vzb21lc2F1Y2UnXSkKICAgICAgICAgc2VsZi5hc3NlcnRF cXVhbChvcHRpb25zLnJlcGVhdCwgNSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChvcHRpb25z LnRlc3RfcnVubmVyX2NvdW50LCA1KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKG9wdGlvbnMu bm9fdGltZW91dCwgVHJ1ZSkKIAorICAgIGRlZiB0ZXN0X3BhcnNlX2RlcHJlY2F0ZWRfYXJncyhz ZWxmKToKKyAgICAgICAgIyBUT0RPOiByZW1vdmUgdGhpcyB0ZXN0IGFuZCB0aGUgY29ycmVzcG9u ZGluZyBwYXJhbWV0ZXIgYWZ0ZXIgYWxsIGluc3RhbmNlcyBvZiB0aGlzIGRlcHJlY2F0ZWQgcGFy YW1ldGVyIGhhdmUgYmVlbiByZW1vdmVkCisgICAgICAgIG9wdGlvbnMsIF8gPSBQZXJmVGVzdHNS dW5uZXIuX3BhcnNlX2FyZ3MoWyctLXNsYXZlLWNvbmZpZy1qc29uLXBhdGg9YS9zb3VyY2UxLmpz b24nXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChvcHRpb25zLndvcmtlcl9jb25maWdfanNv bl9wYXRoLCAnYS9zb3VyY2UxLmpzb24nKQorCiAgICAgZGVmIHRlc3RfdXBsb2FkX2pzb24oc2Vs Zik6CiAgICAgICAgIHJ1bm5lciwgcG9ydCA9IHNlbGYuY3JlYXRlX3J1bm5lcigpCiAgICAgICAg IHBvcnQuaG9zdC5maWxlc3lzdGVtLmZpbGVzWycvbW9jay1jaGVja291dC9zb21lLmpzb24nXSA9 ICdzb21lIGNvbnRlbnQnCg== 412115 2020-10-22 11:00:27 -0700 2020-10-22 11:51:14 -0700 Patch for landing bug-218082-20201022140026.patch text/plain 11751 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2ODg3MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDIwLTEwLTIyICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0cHldIFJlbmFtZSBzbGF2ZSB0byB3b3JrZXIgaW4gcGVyZnRl c3RzcnVubmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTgwODIKKworICAgICAgICBSZXZpZXdlZCBieSBSeW9zdWtlIE5pd2EuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5weToK KyAgICAgICAgKFBlcmZUZXN0c1J1bm5lci5fcGFyc2VfYXJncyk6IFN1cHBvcnRpbmcgYm90aCAt LXNsYXZlLWNvbmZpZy1qc29uLXBhdGggYW5kIC0td29ya2VyLWNvbmZpZy1qc29uLXBhdGggZm9y IG5vdy4KKyAgICAgICAgKF9nZW5lcmF0ZV9yZXN1bHRzKToKKyAgICAgICAgKF9tZXJnZV93b3Jr ZXJfY29uZmlnX2pzb24pOgorICAgICAgICAoX21lcmdlX3NsYXZlX2NvbmZpZ19qc29uKTogRGVs ZXRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0 ZXN0c3J1bm5lcl9pbnRlZ3JhdGlvbnRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXJfdW5pdHRlc3QucHk6CisgICAgICAg IChNYWluVGVzdC50ZXN0X3BhcnNlX2FyZ3MpOgorICAgICAgICAoTWFpblRlc3QudGVzdF9wYXJz ZV9kZXByZWNhdGVkX2FyZ3MpOiBBZGRlZCB1bml0LXRlc3QgZm9yIGRlcHJlY2F0ZWQgcGFyYW1l dGVyLgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln L3N0ZXBzLnB5OgorICAgICAgICAoUnVuQW5kVXBsb2FkUGVyZlRlc3RzKToKKwogMjAyMC0xMC0y MiAgQW5nZWxvcyBPaWtvbm9tb3BvdWxvcyAgPGFuZ2Vsb3NAaWdhbGlhLmNvbT4KIAogICAgICAg ICBEZXRlY3QgdW5yZWNvZ25pemVkIG9wdGlvbnMgaW4gYnVpbGQtanNjCkluZGV4OiBUb29scy9C dWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9zdGVwcy5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9z dGVwcy5weQkocmV2aXNpb24gMjY4ODcxKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvc3RlcHMucHkJKHdvcmtpbmcgY29weSkKQEAgLTkzNyw3ICs5 MzcsNyBAQCBjbGFzcyBSdW5BbmRVcGxvYWRQZXJmVGVzdHMoc2hlbGwuVGVzdCk6CiAgICAgZGVz Y3JpcHRpb25Eb25lID0gWyJwZXJmLXRlc3RzIl0KICAgICBjb21tYW5kID0gWyJweXRob24iLCAi Li9Ub29scy9TY3JpcHRzL3J1bi1wZXJmLXRlc3RzIiwKICAgICAgICAgICAgICAgICItLW91dHB1 dC1qc29uLXBhdGgiLCAicGVyZi10ZXN0LXJlc3VsdHMuanNvbiIsCi0gICAgICAgICAgICAgICAi LS1zbGF2ZS1jb25maWctanNvbi1wYXRoIiwgIi4uLy4uL3BlcmYtdGVzdC1jb25maWcuanNvbiIs CisgICAgICAgICAgICAgICAiLS13b3JrZXItY29uZmlnLWpzb24tcGF0aCIsICIuLi8uLi9wZXJm LXRlc3QtY29uZmlnLmpzb24iLAogICAgICAgICAgICAgICAgIi0tbm8tc2hvdy1yZXN1bHRzIiwK ICAgICAgICAgICAgICAgICItLXJlc2V0LXJlc3VsdHMiLAogICAgICAgICAgICAgICAgIi0tdGVz dC1yZXN1bHRzLXNlcnZlciIsICJwZXJmLndlYmtpdC5vcmciLApJbmRleDogVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNy dW5uZXIucHkJKHJldmlzaW9uIDI2ODg3MSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVy Zm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMTEs OCArMTExLDkgQEAgY2xhc3MgUGVyZlRlc3RzUnVubmVyKG9iamVjdCk6CiAgICAgICAgICAgICAg ICAgaGVscD0iUGF0aCB0byBnZW5lcmF0ZSBhIEpTT04gZmlsZSBhdDsgbWF5IGNvbnRhaW4gcHJl dmlvdXMgcmVzdWx0cyBpZiBpdCBhbHJlYWR5IGV4aXN0cy4iKSwKICAgICAgICAgICAgIG9wdHBh cnNlLm1ha2Vfb3B0aW9uKCItLXJlc2V0LXJlc3VsdHMiLCBhY3Rpb249InN0b3JlX3RydWUiLAog ICAgICAgICAgICAgICAgIGhlbHA9IkNsZWFycyB0aGUgY29udGVudCBpbiB0aGUgZ2VuZXJhdGVk IEpTT04gZmlsZSBiZWZvcmUgYWRkaW5nIHRoZSByZXN1bHRzLiIpLAotICAgICAgICAgICAgb3B0 cGFyc2UubWFrZV9vcHRpb24oIi0tc2xhdmUtY29uZmlnLWpzb24tcGF0aCIsIGFjdGlvbj0nY2Fs bGJhY2snLCBjYWxsYmFjaz1fZXhwYW5kX3BhdGgsIHR5cGU9InN0ciIsCi0gICAgICAgICAgICAg ICAgaGVscD0iT25seSB1c2VkIG9uIGJvdHMuIFBhdGggdG8gYSBzbGF2ZSBjb25maWd1cmF0aW9u IGZpbGUuIiksCisgICAgICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1zbGF2ZS1jb25m aWctanNvbi1wYXRoIiwgIi0td29ya2VyLWNvbmZpZy1qc29uLXBhdGgiLCBhY3Rpb249J2NhbGxi YWNrJywKKyAgICAgICAgICAgICAgICBjYWxsYmFjaz1fZXhwYW5kX3BhdGgsIHR5cGU9InN0ciIs IGRlc3Q9Indvcmtlcl9jb25maWdfanNvbl9wYXRoIiwKKyAgICAgICAgICAgICAgICBoZWxwPSJP bmx5IHVzZWQgb24gYm90cy4gUGF0aCB0byBhIHdvcmtlciBjb25maWd1cmF0aW9uIGZpbGUuIiks CiAgICAgICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1kZXNjcmlwdGlvbiIsCiAgICAg ICAgICAgICAgICAgaGVscD0iQWRkIGEgZGVzY3JpcHRpb24gdG8gdGhlIG91dHB1dCBKU09OIGZp bGUgaWYgb25lIGlzIGdlbmVyYXRlZCIpLAogICAgICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRp b24oIi0tbm8tc2hvdy1yZXN1bHRzIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlZmF1bHQ9VHJ1 ZSwgZGVzdD0ic2hvd19yZXN1bHRzIiwKQEAgLTI0Niw4ICsyNDcsOCBAQCBjbGFzcyBQZXJmVGVz dHNSdW5uZXIob2JqZWN0KToKICAgICAgICAgb3V0cHV0X2pzb25fcGF0aCA9IHNlbGYuX291dHB1 dF9qc29uX3BhdGgoKQogICAgICAgICBvdXRwdXQgPSBzZWxmLl9nZW5lcmF0ZV9yZXN1bHRzX2Rp Y3Qoc2VsZi5fdGltZXN0YW1wLCBvcHRpb25zLmRlc2NyaXB0aW9uLCBvcHRpb25zLnBsYXRmb3Jt LCBvcHRpb25zLmJ1aWxkZXJfbmFtZSwgb3B0aW9ucy5idWlsZF9udW1iZXIpCiAKLSAgICAgICAg aWYgb3B0aW9ucy5zbGF2ZV9jb25maWdfanNvbl9wYXRoOgotICAgICAgICAgICAgb3V0cHV0ID0g c2VsZi5fbWVyZ2Vfc2xhdmVfY29uZmlnX2pzb24ob3B0aW9ucy5zbGF2ZV9jb25maWdfanNvbl9w YXRoLCBvdXRwdXQpCisgICAgICAgIGlmIG9wdGlvbnMud29ya2VyX2NvbmZpZ19qc29uX3BhdGg6 CisgICAgICAgICAgICBvdXRwdXQgPSBzZWxmLl9tZXJnZV93b3JrZXJfY29uZmlnX2pzb24ob3B0 aW9ucy53b3JrZXJfY29uZmlnX2pzb25fcGF0aCwgb3V0cHV0KQogICAgICAgICAgICAgaWYgbm90 IG91dHB1dDoKICAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi5FWElUX0NPREVfQkFEX1NPVVJD RV9KU09OCiAKQEAgLTMxNiwxOSArMzE3LDE5IEBAIGNsYXNzIFBlcmZUZXN0c1J1bm5lcihvYmpl Y3QpOgogICAgIGRlZiBfZGF0ZXRpbWVfaW5fRVM1X2NvbXBhdGlibGVfaXNvX2Zvcm1hdChkYXRl dGltZSk6CiAgICAgICAgIHJldHVybiBkYXRldGltZS5zdHJmdGltZSgnJVktJW0tJWRUJUg6JU06 JVMuJWYnKQogCi0gICAgZGVmIF9tZXJnZV9zbGF2ZV9jb25maWdfanNvbihzZWxmLCBzbGF2ZV9j b25maWdfanNvbl9wYXRoLCBjb250ZW50cyk6Ci0gICAgICAgIGlmIG5vdCBzZWxmLl9ob3N0LmZp bGVzeXN0ZW0uaXNmaWxlKHNsYXZlX2NvbmZpZ19qc29uX3BhdGgpOgotICAgICAgICAgICAgX2xv Zy5lcnJvcigiTWlzc2luZyBzbGF2ZSBjb25maWd1cmF0aW9uIEpTT04gZmlsZTogJXMiICUgc2xh dmVfY29uZmlnX2pzb25fcGF0aCkKKyAgICBkZWYgX21lcmdlX3dvcmtlcl9jb25maWdfanNvbihz ZWxmLCB3b3JrZXJfY29uZmlnX2pzb25fcGF0aCwgY29udGVudHMpOgorICAgICAgICBpZiBub3Qg c2VsZi5faG9zdC5maWxlc3lzdGVtLmlzZmlsZSh3b3JrZXJfY29uZmlnX2pzb25fcGF0aCk6Cisg ICAgICAgICAgICBfbG9nLmVycm9yKCdNaXNzaW5nIHdvcmtlciBjb25maWd1cmF0aW9uIEpTT04g ZmlsZToge30nLmZvcm1hdCh3b3JrZXJfY29uZmlnX2pzb25fcGF0aCkpCiAgICAgICAgICAgICBy ZXR1cm4gTm9uZQogCiAgICAgICAgIHRyeToKLSAgICAgICAgICAgIHNsYXZlX2NvbmZpZ19qc29u ID0gc2VsZi5faG9zdC5maWxlc3lzdGVtLm9wZW5fdGV4dF9maWxlX2Zvcl9yZWFkaW5nKHNsYXZl X2NvbmZpZ19qc29uX3BhdGgpCi0gICAgICAgICAgICBzbGF2ZV9jb25maWcgPSBqc29uLmxvYWQo c2xhdmVfY29uZmlnX2pzb24pCi0gICAgICAgICAgICBmb3Iga2V5IGluIHNsYXZlX2NvbmZpZzoK LSAgICAgICAgICAgICAgICBjb250ZW50c1snYnVpbGRlcicgKyBrZXkuY2FwaXRhbGl6ZSgpXSA9 IHNsYXZlX2NvbmZpZ1trZXldCisgICAgICAgICAgICB3b3JrZXJfY29uZmlnX2pzb24gPSBzZWxm Ll9ob3N0LmZpbGVzeXN0ZW0ub3Blbl90ZXh0X2ZpbGVfZm9yX3JlYWRpbmcod29ya2VyX2NvbmZp Z19qc29uX3BhdGgpCisgICAgICAgICAgICB3b3JrZXJfY29uZmlnID0ganNvbi5sb2FkKHdvcmtl cl9jb25maWdfanNvbikKKyAgICAgICAgICAgIGZvciBrZXkgaW4gd29ya2VyX2NvbmZpZzoKKyAg ICAgICAgICAgICAgICBjb250ZW50c1snYnVpbGRlcicgKyBrZXkuY2FwaXRhbGl6ZSgpXSA9IHdv cmtlcl9jb25maWdba2V5XQogICAgICAgICAgICAgcmV0dXJuIGNvbnRlbnRzCiAgICAgICAgIGV4 Y2VwdCBFeGNlcHRpb24gYXMgZXJyb3I6Ci0gICAgICAgICAgICBfbG9nLmVycm9yKCJGYWlsZWQg dG8gbWVyZ2Ugc2xhdmUgY29uZmlndXJhdGlvbiBKU09OIGZpbGUgJXM6ICVzIiAlIChzbGF2ZV9j b25maWdfanNvbl9wYXRoLCBlcnJvcikpCisgICAgICAgICAgICBfbG9nLmVycm9yKCdGYWlsZWQg dG8gbWVyZ2Ugd29ya2VyIGNvbmZpZ3VyYXRpb24gSlNPTiBmaWxlIHt9OiB7fScuZm9ybWF0KHdv cmtlcl9jb25maWdfanNvbl9wYXRoLCBlcnJvcikpCiAgICAgICAgIHJldHVybiBOb25lCiAKICAg ICBkZWYgX21lcmdlX291dHB1dHNfaWZfbmVlZGVkKHNlbGYsIG91dHB1dF9qc29uX3BhdGgsIG91 dHB1dCk6CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3Bl cmZ0ZXN0c3J1bm5lcl9pbnRlZ3JhdGlvbnRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXJfaW50ZWdyYXRp b250ZXN0LnB5CShyZXZpc2lvbiAyNjg4NzEpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Bl cmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lcl9pbnRlZ3JhdGlvbnRlc3QucHkJKHdvcmtp bmcgY29weSkKQEAgLTQ0NiwyMyArNDQ2LDIzIEBAIGNsYXNzIE1haW5UZXN0KHVuaXR0ZXN0LlRl c3RDYXNlKToKICAgICAgICAgcG9ydC5ob3N0LmZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKCcv bW9jay1jaGVja291dC9vdXRwdXQuanNvbicsICd7ImFub3RoZXIgYmFkIGpzb24iOiAiMSJ9JykK ICAgICAgICAgc2VsZi5fdGVzdF9ydW5fd2l0aF9qc29uX291dHB1dChydW5uZXIsIHBvcnQuaG9z dC5maWxlc3lzdGVtLCBleHBlY3RlZF9leGl0X2NvZGU9UGVyZlRlc3RzUnVubmVyLkVYSVRfQ09E RV9CQURfTUVSR0UpCiAKLSAgICBkZWYgdGVzdF9ydW5fd2l0aF9zbGF2ZV9jb25maWdfanNvbihz ZWxmKToKKyAgICBkZWYgdGVzdF9ydW5fd2l0aF93b3JrZXJfY29uZmlnX2pzb24oc2VsZik6CiAg ICAgICAgIHJ1bm5lciwgcG9ydCA9IHNlbGYuY3JlYXRlX3J1bm5lcl9hbmRfc2V0dXBfcmVzdWx0 c190ZW1wbGF0ZShhcmdzPVsnLS1vdXRwdXQtanNvbi1wYXRoPS9tb2NrLWNoZWNrb3V0L291dHB1 dC5qc29uJywKLSAgICAgICAgICAgICctLXNsYXZlLWNvbmZpZy1qc29uLXBhdGg9L21vY2stY2hl Y2tvdXQvc2xhdmUtY29uZmlnLmpzb24nLCAnLS10ZXN0LXJlc3VsdHMtc2VydmVyPXNvbWUuaG9z dCddKQotICAgICAgICBwb3J0Lmhvc3QuZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUoJy9tb2Nr LWNoZWNrb3V0L3NsYXZlLWNvbmZpZy5qc29uJywgJ3sia2V5IjogInZhbHVlIn0nKQorICAgICAg ICAgICAgJy0td29ya2VyLWNvbmZpZy1qc29uLXBhdGg9L21vY2stY2hlY2tvdXQvd29ya2VyLWNv bmZpZy5qc29uJywgJy0tdGVzdC1yZXN1bHRzLXNlcnZlcj1zb21lLmhvc3QnXSkKKyAgICAgICAg cG9ydC5ob3N0LmZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKCcvbW9jay1jaGVja291dC93b3Jr ZXItY29uZmlnLmpzb24nLCAneyJrZXkiOiAidmFsdWUifScpCiAgICAgICAgIHNlbGYuX3Rlc3Rf cnVuX3dpdGhfanNvbl9vdXRwdXQocnVubmVyLCBwb3J0Lmhvc3QuZmlsZXN5c3RlbSwgdXBsb2Fk X3N1Y2NlZWRzPVRydWUpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5fbG9hZF9vdXRw dXRfanNvbihydW5uZXIpLCBbewogICAgICAgICAgICAgImJ1aWxkVGltZSI6ICIyMDEzLTAyLTA4 VDE1OjE5OjM3LjQ2MDAwMCIsICJ0ZXN0cyI6IHNlbGYuX2V2ZW50X3RhcmdldF93cmFwcGVyX2Fu ZF9pbnNwZWN0b3JfcmVzdWx0cywKICAgICAgICAgICAgICJyZXZpc2lvbnMiOiB7IldlYktpdCI6 IHsidGltZXN0YW1wIjogIjIwMTMtMDItMDEgMDg6NDg6MDUgKzAwMDAiLCAicmV2aXNpb24iOiAi NTY3OCJ9fSwgImJ1aWxkZXJLZXkiOiAidmFsdWUifV0pCiAKLSAgICBkZWYgdGVzdF9ydW5fd2l0 aF9iYWRfc2xhdmVfY29uZmlnX2pzb24oc2VsZik6CisgICAgZGVmIHRlc3RfcnVuX3dpdGhfYmFk X3dvcmtlcl9jb25maWdfanNvbihzZWxmKToKICAgICAgICAgcnVubmVyLCBwb3J0ID0gc2VsZi5j cmVhdGVfcnVubmVyX2FuZF9zZXR1cF9yZXN1bHRzX3RlbXBsYXRlKGFyZ3M9WyctLW91dHB1dC1q c29uLXBhdGg9L21vY2stY2hlY2tvdXQvb3V0cHV0Lmpzb24nLAotICAgICAgICAgICAgJy0tc2xh dmUtY29uZmlnLWpzb24tcGF0aD0vbW9jay1jaGVja291dC9zbGF2ZS1jb25maWcuanNvbicsICct LXRlc3QtcmVzdWx0cy1zZXJ2ZXI9c29tZS5ob3N0J10pCisgICAgICAgICAgICAnLS13b3JrZXIt Y29uZmlnLWpzb24tcGF0aD0vbW9jay1jaGVja291dC93b3JrZXItY29uZmlnLmpzb24nLCAnLS10 ZXN0LXJlc3VsdHMtc2VydmVyPXNvbWUuaG9zdCddKQogICAgICAgICBsb2dzID0gc2VsZi5fdGVz dF9ydW5fd2l0aF9qc29uX291dHB1dChydW5uZXIsIHBvcnQuaG9zdC5maWxlc3lzdGVtLCBleHBl Y3RlZF9leGl0X2NvZGU9UGVyZlRlc3RzUnVubmVyLkVYSVRfQ09ERV9CQURfU09VUkNFX0pTT04p Ci0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnTWlzc2luZyBzbGF2ZSBjb25maWd1cmF0aW9uIEpT T04gZmlsZTogL21vY2stY2hlY2tvdXQvc2xhdmUtY29uZmlnLmpzb24nIGluIGxvZ3MpCi0gICAg ICAgIHBvcnQuaG9zdC5maWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZSgnL21vY2stY2hlY2tvdXQv c2xhdmUtY29uZmlnLmpzb24nLCAnYmFkIGpzb24nKQorICAgICAgICBzZWxmLmFzc2VydFRydWUo J01pc3Npbmcgd29ya2VyIGNvbmZpZ3VyYXRpb24gSlNPTiBmaWxlOiAvbW9jay1jaGVja291dC93 b3JrZXItY29uZmlnLmpzb24nIGluIGxvZ3MpCisgICAgICAgIHBvcnQuaG9zdC5maWxlc3lzdGVt LndyaXRlX3RleHRfZmlsZSgnL21vY2stY2hlY2tvdXQvd29ya2VyLWNvbmZpZy5qc29uJywgJ2Jh ZCBqc29uJykKICAgICAgICAgc2VsZi5fdGVzdF9ydW5fd2l0aF9qc29uX291dHB1dChydW5uZXIs IHBvcnQuaG9zdC5maWxlc3lzdGVtLCBleHBlY3RlZF9leGl0X2NvZGU9UGVyZlRlc3RzUnVubmVy LkVYSVRfQ09ERV9CQURfU09VUkNFX0pTT04pCi0gICAgICAgIHBvcnQuaG9zdC5maWxlc3lzdGVt LndyaXRlX3RleHRfZmlsZSgnL21vY2stY2hlY2tvdXQvc2xhdmUtY29uZmlnLmpzb24nLCAnWyJh bm90aGVyIGJhZCBqc29uIl0nKQorICAgICAgICBwb3J0Lmhvc3QuZmlsZXN5c3RlbS53cml0ZV90 ZXh0X2ZpbGUoJy9tb2NrLWNoZWNrb3V0L3dvcmtlci1jb25maWcuanNvbicsICdbImFub3RoZXIg YmFkIGpzb24iXScpCiAgICAgICAgIHNlbGYuX3Rlc3RfcnVuX3dpdGhfanNvbl9vdXRwdXQocnVu bmVyLCBwb3J0Lmhvc3QuZmlsZXN5c3RlbSwgZXhwZWN0ZWRfZXhpdF9jb2RlPVBlcmZUZXN0c1J1 bm5lci5FWElUX0NPREVfQkFEX1NPVVJDRV9KU09OKQogCiAgICAgZGVmIHRlc3RfcnVuX3dpdGhf bXVsdGlwbGVfcmVwb3NpdG9yaWVzKHNlbGYpOgpAQCAtNDkwLDggKzQ5MCw4IEBAIGNsYXNzIE1h aW5UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF9ydW5fd2l0aF91cGxvYWRf anNvbl9zaG91bGRfZ2VuZXJhdGVfcGVyZl93ZWJraXRfanNvbihzZWxmKToKICAgICAgICAgcnVu bmVyLCBwb3J0ID0gc2VsZi5jcmVhdGVfcnVubmVyX2FuZF9zZXR1cF9yZXN1bHRzX3RlbXBsYXRl KGFyZ3M9WyctLW91dHB1dC1qc29uLXBhdGg9L21vY2stY2hlY2tvdXQvb3V0cHV0Lmpzb24nLAog ICAgICAgICAgICAgJy0tdGVzdC1yZXN1bHRzLXNlcnZlcicsICdzb21lLmhvc3QnLCAnLS1wbGF0 Zm9ybScsICdwbGF0Zm9ybTEnLCAnLS1idWlsZGVyLW5hbWUnLCAnYnVpbGRlcjEnLCAnLS1idWls ZC1udW1iZXInLCAnMTIzJywKLSAgICAgICAgICAgICctLXNsYXZlLWNvbmZpZy1qc29uLXBhdGg9 L21vY2stY2hlY2tvdXQvc2xhdmUtY29uZmlnLmpzb24nXSkKLSAgICAgICAgcG9ydC5ob3N0LmZp bGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKCcvbW9jay1jaGVja291dC9zbGF2ZS1jb25maWcuanNv bicsICd7ImtleSI6ICJ2YWx1ZTEifScpCisgICAgICAgICAgICAnLS13b3JrZXItY29uZmlnLWpz b24tcGF0aD0vbW9jay1jaGVja291dC93b3JrZXItY29uZmlnLmpzb24nXSkKKyAgICAgICAgcG9y dC5ob3N0LmZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKCcvbW9jay1jaGVja291dC93b3JrZXIt Y29uZmlnLmpzb24nLCAneyJrZXkiOiAidmFsdWUxIn0nKQogCiAgICAgICAgIHNlbGYuX3Rlc3Rf cnVuX3dpdGhfanNvbl9vdXRwdXQocnVubmVyLCBwb3J0Lmhvc3QuZmlsZXN5c3RlbSwgdXBsb2Fk X3N1Y2NlZWRzPVRydWUpCiAgICAgICAgIGdlbmVyYXRlZF9qc29uID0ganNvbi5sb2Fkcyhwb3J0 Lmhvc3QuZmlsZXN5c3RlbS5maWxlc1snL21vY2stY2hlY2tvdXQvb3V0cHV0Lmpzb24nXSkKSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVu bmVyX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVy Zm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNjg4 NzEpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0 c3J1bm5lcl91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMTQ5LDcgKzE0OSw3IEBAIGNs YXNzIE1haW5UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgICAgICAnLS1uby1z aG93LXJlc3VsdHMnLAogICAgICAgICAgICAgICAgICctLXJlc2V0LXJlc3VsdHMnLAogICAgICAg ICAgICAgICAgICctLW91dHB1dC1qc29uLXBhdGg9YS9vdXRwdXQuanNvbicsCi0gICAgICAgICAg ICAgICAgJy0tc2xhdmUtY29uZmlnLWpzb24tcGF0aD1hL3NvdXJjZS5qc29uJywKKyAgICAgICAg ICAgICAgICAnLS13b3JrZXItY29uZmlnLWpzb24tcGF0aD1hL3NvdXJjZS5qc29uJywKICAgICAg ICAgICAgICAgICAnLS10ZXN0LXJlc3VsdHMtc2VydmVyPXNvbWVob3N0JywKICAgICAgICAgICAg ICAgICAnLS1hZGRpdGlvbmFsLWRydC1mbGFnPS0tZW5hYmxlLXRocmVhZGVkLXBhcnNlcicsCiAg ICAgICAgICAgICAgICAgJy0tYWRkaXRpb25hbC1kcnQtZmxhZz0tLWF3ZXNvbWVzYXVjZScsCkBA IC0xNjcsMTMgKzE2NywxOCBAQCBjbGFzcyBNYWluVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAg ICAgICAgIHNlbGYuYXNzZXJ0RmFsc2Uob3B0aW9ucy5zaG93X3Jlc3VsdHMpCiAgICAgICAgIHNl bGYuYXNzZXJ0VHJ1ZShvcHRpb25zLnJlc2V0X3Jlc3VsdHMpCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwob3B0aW9ucy5vdXRwdXRfanNvbl9wYXRoLCAnYS9vdXRwdXQuanNvbicpCi0gICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwob3B0aW9ucy5zbGF2ZV9jb25maWdfanNvbl9wYXRoLCAnYS9zb3Vy Y2UuanNvbicpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwob3B0aW9ucy53b3JrZXJfY29uZmln X2pzb25fcGF0aCwgJ2Evc291cmNlLmpzb24nKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKG9w dGlvbnMudGVzdF9yZXN1bHRzX3NlcnZlciwgJ3NvbWVob3N0JykKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChvcHRpb25zLmFkZGl0aW9uYWxfZHJ0X2ZsYWcsIFsnLS1lbmFibGUtdGhyZWFkZWQt cGFyc2VyJywgJy0tYXdlc29tZXNhdWNlJ10pCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwob3B0 aW9ucy5yZXBlYXQsIDUpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwob3B0aW9ucy50ZXN0X3J1 bm5lcl9jb3VudCwgNSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChvcHRpb25zLm5vX3RpbWVv dXQsIFRydWUpCiAKKyAgICBkZWYgdGVzdF9wYXJzZV9kZXByZWNhdGVkX2FyZ3Moc2VsZik6Cisg ICAgICAgICMgRklYTUU6IHJlbW92ZSB0aGlzIHRlc3QgYW5kIHRoZSBjb3JyZXNwb25kaW5nIHBh cmFtZXRlciBhZnRlciBhbGwgaW5zdGFuY2VzIG9mIHRoaXMgZGVwcmVjYXRlZCBwYXJhbWV0ZXIg aGF2ZSBiZWVuIHJlbW92ZWQKKyAgICAgICAgb3B0aW9ucywgXyA9IFBlcmZUZXN0c1J1bm5lci5f cGFyc2VfYXJncyhbJy0tc2xhdmUtY29uZmlnLWpzb24tcGF0aD1hL3NvdXJjZTEuanNvbiddKQor ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKG9wdGlvbnMud29ya2VyX2NvbmZpZ19qc29uX3BhdGgs ICdhL3NvdXJjZTEuanNvbicpCisKICAgICBkZWYgdGVzdF91cGxvYWRfanNvbihzZWxmKToKICAg ICAgICAgcnVubmVyLCBwb3J0ID0gc2VsZi5jcmVhdGVfcnVubmVyKCkKICAgICAgICAgcG9ydC5o b3N0LmZpbGVzeXN0ZW0uZmlsZXNbJy9tb2NrLWNoZWNrb3V0L3NvbWUuanNvbiddID0gJ3NvbWUg Y29udGVudCcK