218123 2020-10-23 07:29:12 -0700 Rename slave to worker in webkitpy 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=224988 InRadar P2 Normal --- 213092 1 aakash_jain aakash_jain aakash_jain ews-watchlist glenn jbedard webkit-bug-importer oldest_to_newest 1700998 0 aakash_jain 2020-10-23 07:29:12 -0700 Rename slave to worker in webkitpy. This is to use more inclusive naming. 1701007 1 412177 aakash_jain 2020-10-23 07:58:57 -0700 Created attachment 412177 Patch 1701028 2 412177 jbedard 2020-10-23 09:08:16 -0700 Comment on attachment 412177 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=412177&action=review > Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:578 > + build_worker = self._options.build_slave We will need to expose a "build_worker" option, change all our buildbot invocations, and then remove the "build_slave" option to totally get rid of this. (not particularly difficult, just going to take a few patches and a few buildbot restarts) 1701032 3 aakash_jain 2020-10-23 09:10:38 -0700 Yeah. 1701033 4 ews-feeder 2020-10-23 09:13:33 -0700 Committed r268925: <https://trac.webkit.org/changeset/268925> All reviewed patches have been landed. Closing bug and clearing flags on attachment 412177. 1701035 5 webkit-bug-importer 2020-10-23 09:14:22 -0700 <rdar://problem/70621688> 412177 2020-10-23 07:58:57 -0700 2020-10-23 09:13:33 -0700 Patch bug-218123-20201023105856.patch text/plain 15064 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2ODkyMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIwLTEwLTIzICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBSZW5hbWUgc2xhdmUgdG8gd29ya2VyIGluIHdlYmtpdHB5CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTgxMjMKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvY29tbW9uL25ldC9idWlsZGJvdC9idWlsZGJvdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRib3QvYnVpbGRib3RfdW5pdHRlc3QucHk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L3Jlc3VsdHNqc29ucGFyc2VyX3VuaXR0ZXN0 LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9jcmFzaGxvZ3Nf dW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29u dHJvbGxlcnMvbGF5b3V0X3Rlc3RfZmluZGVyLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9yZXN1bHRzX2dlbmVy YXRvci5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Vi a2l0X3Rlc3RzLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9sZWFrZGV0ZWN0 b3JfdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vy cy9qc29uY2hlY2tlcl91bml0dGVzdC5weToKKwogMjAyMC0xMC0yMiAgQWxleCBDaHJpc3RlbnNl biAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIE51bGwgY2hlY2sgcGxhdGZv cm1TdHJhdGVnaWVzIHdoZW4gbWFraW5nIGJsb2IgcmVhZCBzdHJlYW0gZm9yIGFuIE5TVVJMUmVx dWVzdApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L3Jlc3VsdHNqc29u cGFyc2VyX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL25ldC9yZXN1bHRzanNvbnBhcnNlcl91bml0dGVzdC5weQkocmV2aXNpb24gMjY4OTIz KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L3Jlc3VsdHNqc29ucGFyc2Vy X3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC02Miw3ICs2Miw3IEBAIGNsYXNzIFBhcnNl ZEpTT05SZXN1bHRzVGVzdCh1bml0dGVzdC5UZXMKICAgICAgICAgICAgICAgICAgICAgImFjdHVh bCI6ICJMRUFLIiwKICAgICAgICAgICAgICAgICAgICAgImxlYWtzIjogWwogICAgICAgICAgICAg ICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgICJkb2N1bWVudCI6ICJm aWxlOi8vL1ZvbHVtZXMvRGF0YS9zbGF2ZS93ZWJraXQvYnVpbGQvTGF5b3V0VGVzdHMvZmFzdC9k b20vcHJvdG90eXBlLXN0cmF3YmVycnkuaHRtbCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiZG9jdW1lbnQiOiAiZmlsZTovLy9Wb2x1bWVzL0RhdGEvd29ya2VyL3dlYmtpdC9idWlsZC9M YXlvdXRUZXN0cy9mYXN0L2RvbS9wcm90b3R5cGUtc3RyYXdiZXJyeS5odG1sIgogICAgICAgICAg ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICAgICAg fQpAQCAtODEsNyArODEsNyBAQCBjbGFzcyBQYXJzZWRKU09OUmVzdWx0c1Rlc3QodW5pdHRlc3Qu VGVzCiAgICAgImludGVycnVwdGVkIjogdHJ1ZSwKICAgICAic2tpcHBlZCI6IDQ1MCwKICAgICAi bnVtX3JlZ3Jlc3Npb25zIjogMTUsCi0gICAgImxheW91dF90ZXN0c19kaXIiOiAiXC9iXC9idWls ZFwvc2xhdmVcL1dlYmtpdF9NYWMxMF81XC9idWlsZFwvc3JjXC90aGlyZF9wYXJ0eVwvV2ViS2l0 XC9MYXlvdXRUZXN0cyIsCisgICAgImxheW91dF90ZXN0c19kaXIiOiAiXC9iXC9idWlsZFwvd29y a2VyXC9XZWJraXRfTWFjMTBfNVwvYnVpbGRcL3NyY1wvdGhpcmRfcGFydHlcL1dlYktpdFwvTGF5 b3V0VGVzdHMiLAogICAgICJ2ZXJzaW9uIjogMywKICAgICAibnVtX3Bhc3NlcyI6IDc3LAogICAg ICJoYXNfcHJldHR5X3BhdGNoIjogZmFsc2UsCkBAIC0xMTUsNyArMTE1LDcgQEAgY2xhc3MgUGFy c2VkSlNPTlJlc3VsdHNUZXN0KHVuaXR0ZXN0LlRlcwogICAgICAgICAgICAgICAgICAgICAiYWN0 dWFsIjogIkxFQUsiLAogICAgICAgICAgICAgICAgICAgICAibGVha3MiOiBbCiAgICAgICAgICAg ICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgImRvY3VtZW50Ijog ImZpbGU6Ly8vVm9sdW1lcy9EYXRhL3NsYXZlL3dlYmtpdC9idWlsZC9MYXlvdXRUZXN0cy9mYXN0 L2RvbS9wcm90b3R5cGUtc3RyYXdiZXJyeS5odG1sIgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICJkb2N1bWVudCI6ICJmaWxlOi8vL1ZvbHVtZXMvRGF0YS93b3JrZXIvd2Via2l0L2J1aWxk L0xheW91dFRlc3RzL2Zhc3QvZG9tL3Byb3RvdHlwZS1zdHJhd2JlcnJ5Lmh0bWwiCiAgICAgICAg ICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgICAg ICB9CkBAIC0xMzQsNyArMTM0LDcgQEAgY2xhc3MgUGFyc2VkSlNPTlJlc3VsdHNUZXN0KHVuaXR0 ZXN0LlRlcwogICAgICJpbnRlcnJ1cHRlZCI6IGZhbHNlLAogICAgICJza2lwcGVkIjogNDUwLAog ICAgICJudW1fcmVncmVzc2lvbnMiOiAxNSwKLSAgICAibGF5b3V0X3Rlc3RzX2RpciI6ICJcL2Jc L2J1aWxkXC9zbGF2ZVwvV2Via2l0X01hYzEwXzVcL2J1aWxkXC9zcmNcL3RoaXJkX3BhcnR5XC9X ZWJLaXRcL0xheW91dFRlc3RzIiwKKyAgICAibGF5b3V0X3Rlc3RzX2RpciI6ICJcL2JcL2J1aWxk XC93b3JrZXJcL1dlYmtpdF9NYWMxMF81XC9idWlsZFwvc3JjXC90aGlyZF9wYXJ0eVwvV2ViS2l0 XC9MYXlvdXRUZXN0cyIsCiAgICAgInZlcnNpb24iOiAzLAogICAgICJudW1fcGFzc2VzIjogNzcs CiAgICAgImhhc19wcmV0dHlfcGF0Y2giOiBmYWxzZSwKQEAgLTE0OCw3ICsxNDgsNyBAQCBjbGFz cyBQYXJzZWRKU09OUmVzdWx0c1Rlc3QodW5pdHRlc3QuVGVzCiAgICAgICAgIGV4cGVjdGVkX3Jl c3VsdHMgPSBbCiAgICAgICAgICAgICB0ZXN0X3Jlc3VsdHMuVGVzdFJlc3VsdCgic3ZnL2R5bmFt aWMtdXBkYXRlcy9TVkdGRURyb3BTaGFkb3dFbGVtZW50LWRvbS1zdGREZXZpYXRpb24tYXR0ci5o dG1sIiwgW3Rlc3RfZmFpbHVyZXMuRmFpbHVyZUltYWdlSGFzaE1pc21hdGNoKCldLCAwKSwKICAg ICAgICAgICAgIHRlc3RfcmVzdWx0cy5UZXN0UmVzdWx0KCJmYXN0L2RvbS9wcm90b3R5cGUtaW5o ZXJpdGFuY2UuaHRtbCIsIFt0ZXN0X2ZhaWx1cmVzLkZhaWx1cmVUZXh0TWlzbWF0Y2goKSwgdGVz dF9mYWlsdXJlcy5GYWlsdXJlSW1hZ2VIYXNoTWlzbWF0Y2goKSwgdGVzdF9mYWlsdXJlcy5GYWls dXJlQXVkaW9NaXNtYXRjaCgpXSwgMCksCi0gICAgICAgICAgICB0ZXN0X3Jlc3VsdHMuVGVzdFJl c3VsdCgiZmFzdC9kb20vcHJvdG90eXBlLXN0cmF3YmVycnkuaHRtbCIsIFt0ZXN0X2ZhaWx1cmVz LkZhaWx1cmVEb2N1bWVudExlYWsoWydmaWxlOi8vL1ZvbHVtZXMvRGF0YS9zbGF2ZS93ZWJraXQv YnVpbGQvTGF5b3V0VGVzdHMvZmFzdC9kb20vcHJvdG90eXBlLXN0cmF3YmVycnkuaHRtbCddKV0s IDApLAorICAgICAgICAgICAgdGVzdF9yZXN1bHRzLlRlc3RSZXN1bHQoImZhc3QvZG9tL3Byb3Rv dHlwZS1zdHJhd2JlcnJ5Lmh0bWwiLCBbdGVzdF9mYWlsdXJlcy5GYWlsdXJlRG9jdW1lbnRMZWFr KFsnZmlsZTovLy9Wb2x1bWVzL0RhdGEvd29ya2VyL3dlYmtpdC9idWlsZC9MYXlvdXRUZXN0cy9m YXN0L2RvbS9wcm90b3R5cGUtc3RyYXdiZXJyeS5odG1sJ10pXSwgMCksCiAgICAgICAgIF0KICAg ICAgICAgZXhwZWN0ZWRfcmVzdWx0cy5zb3J0KGtleT1sYW1iZGEgcmVzdWx0OiByZXN1bHQudGVz dF9uYW1lKQogICAgICAgICBwYXJzZWRfcmVzdWx0cyA9IFBhcnNlZEpTT05SZXN1bHRzKHNlbGYu X2V4YW1wbGVfZnVsbF9yZXN1bHRzX2pzb24pCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9uZXQvYnVpbGRib3QvYnVpbGRib3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1aWxkYm90L2J1aWxkYm90LnB5CShyZXZpc2lvbiAy Njg5MjMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRib3QvYnVp bGRib3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTMxNSw3ICszMTUsNyBAQCBjbGFzcyBCdWlsZEJv dChvYmplY3QpOgogICAgICAgICAgICAgIyBJZiByZXZpc2lvbl9zdHJpbmcgaGFzIG5vbi1kaWdp dHMgYXNzdW1lIGl0J3Mgbm90IGEgcmV2aXNpb24gbnVtYmVyLgogICAgICAgICAgICAgYnVpbGRl clsnYnVpbHRfcmV2aXNpb24nXSA9IGludChyZXZpc2lvbl9zdHJpbmcpIGlmIG5vdCByZS5tYXRj aChyJ1xEJywgcmV2aXNpb25fc3RyaW5nKSBlbHNlIE5vbmUKIAotICAgICAgICAgICAgIyBGSVhN RTogV2UgdHJlYXQgc2xhdmUgbG9zdCBhcyBncmVlbiBldmVuIHRob3VnaCBpdCBpcyBub3QgdG8K KyAgICAgICAgICAgICMgRklYTUU6IFdlIHRyZWF0IHdvcmtlciBsb3N0IGFzIGdyZWVuIGV2ZW4g dGhvdWdoIGl0IGlzIG5vdCB0bwogICAgICAgICAgICAgIyB3b3JrIGFyb3VuZCB0aGUgUXRzIGJv dCBiZWluZyBvbiBhIGJyb2tlbiBpbnRlcm5ldCBjb25uZWN0aW9uLgogICAgICAgICAgICAgIyBU aGUgcmVhbCBmaXggaXMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3 MDk5CiAgICAgICAgICAgICBidWlsZGVyWydpc19ncmVlbiddID0gbm90IHJlLnNlYXJjaCgnZmFp bCcsIHN0cmluZ191dGlscy5kZWNvZGUoY2VsbC5yZW5kZXJDb250ZW50cygpLCB0YXJnZXRfdHlw ZT1zdHIpKSBvciBcCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVp bGRib3QvYnVpbGRib3RfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vbmV0L2J1aWxkYm90L2J1aWxkYm90X3VuaXR0ZXN0LnB5CShyZXZpc2lv biAyNjg5MjMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRib3Qv YnVpbGRib3RfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTE4MCw3ICsxODAsNyBAQCBj bGFzcyBCdWlsZEJvdFRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgPHRkIGFsaWduPSJj ZW50ZXIiIGNsYXNzPSJBY3Rpdml0eSBpZGxlIj5pZGxlPGJyIC8+MyBwZW5kaW5nPC90ZD4KICAg ICA8dHI+CiAgICAgPHRkIGNsYXNzPSJib3giPjxhIGhyZWY9ImJ1aWxkZXJzL1F0JTIwV2luZG93 cyUyMDMyLWJpdCUyMERlYnVnIj5RdCBXaW5kb3dzIDMyLWJpdCBEZWJ1ZzwvYT48L3RkPgotICAg ICAgPHRkIGFsaWduPSJjZW50ZXIiIGNsYXNzPSJMYXN0QnVpbGQgYm94IGZhaWx1cmUiPjxhIGhy ZWY9ImJ1aWxkZXJzL1F0JTIwV2luZG93cyUyMDMyLWJpdCUyMERlYnVnL2J1aWxkcy8yMDkwIj42 MDU2MzwvYT48YnIgLz5mYWlsZWQ8YnIgLz5mYWlsZWQ8YnIgLz5zbGF2ZTxiciAvPmxvc3Q8L3Rk PgorICAgICAgPHRkIGFsaWduPSJjZW50ZXIiIGNsYXNzPSJMYXN0QnVpbGQgYm94IGZhaWx1cmUi PjxhIGhyZWY9ImJ1aWxkZXJzL1F0JTIwV2luZG93cyUyMDMyLWJpdCUyMERlYnVnL2J1aWxkcy8y MDkwIj42MDU2MzwvYT48YnIgLz5mYWlsZWQ8YnIgLz5mYWlsZWQ8YnIgLz53b3JrZXI8YnIgLz5s b3N0PC90ZD4KICAgICAgIDx0ZCBhbGlnbj0iY2VudGVyIiBjbGFzcz0iQWN0aXZpdHkgYnVpbGRp bmciPmJ1aWxkaW5nPGJyIC8+RVRBIGluPGJyIC8+fiA1IG1pbnM8YnIgLz5hdCAwODoyNTwvdGQ+ CiAgICAgPC90YWJsZT4KICcnJwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v c3lzdGVtL2NyYXNobG9nc191bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vY3Jhc2hsb2dzX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAy Njg5MjMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vY3Jhc2hsb2dz X3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zNyw3ICszNyw3IEBAIGZyb20gd2Via2l0 cHkucG9ydC53aW4gaW1wb3J0IFdpblBvcnQKIGRlZiBtYWtlX21vY2tfY3Jhc2hfcmVwb3J0X2Rh cndpbihwcm9jZXNzX25hbWUsIHBpZCk6CiAgICAgcmV0dXJuICIiIkNyYXNoIGxvZyBtYXkgbm90 IHN0YXJ0IHdpdGggUHJvY2VzcyBsaW5lCiBQcm9jZXNzOiAgICAgICAgIHtwcm9jZXNzX25hbWV9 IFt7cGlkfV0KLVBhdGg6ICAgICAgICAgICAgL1ZvbHVtZXMvRGF0YS9zbGF2ZS9zbm93bGVvcGFy ZC1pbnRlbC1yZWxlYXNlLXRlc3RzL2J1aWxkL1dlYktpdEJ1aWxkL1JlbGVhc2Uve3Byb2Nlc3Nf bmFtZX0KK1BhdGg6ICAgICAgICAgICAgL1ZvbHVtZXMvRGF0YS93b3JrZXIvc25vd2xlb3BhcmQt aW50ZWwtcmVsZWFzZS10ZXN0cy9idWlsZC9XZWJLaXRCdWlsZC9SZWxlYXNlL3twcm9jZXNzX25h bWV9CiBJZGVudGlmaWVyOiAgICAgIHtwcm9jZXNzX25hbWV9CiBWZXJzaW9uOiAgICAgICAgID8/ PyAoPz8/KQogQ29kZSBUeXBlOiAgICAgICBYODYtNjQgKE5hdGl2ZSkKQEAgLTU4LDcgKzU4LDcg QEAgQ3Jhc2hlZCBUaHJlYWQ6ICAwCiAKIER5bGQgRXJyb3IgTWVzc2FnZToKICAgTGlicmFyeSBu b3QgbG9hZGVkOiAvVm9sdW1lcy9EYXRhL1dlYktpdC1CdWlsZFNsYXZlL3Nub3dsZW9wYXJkLWlu dGVsLXJlbGVhc2UvYnVpbGQvV2ViS2l0QnVpbGQvUmVsZWFzZS9XZWJDb3JlLmZyYW1ld29yay9W ZXJzaW9ucy9BL1dlYkNvcmUKLSAgUmVmZXJlbmNlZCBmcm9tOiAvVm9sdW1lcy9EYXRhL3NsYXZl L3Nub3dsZW9wYXJkLWludGVsLXJlbGVhc2UvYnVpbGQvV2ViS2l0QnVpbGQvUmVsZWFzZS9XZWJL aXQuZnJhbWV3b3JrL1ZlcnNpb25zL0EvV2ViS2l0CisgIFJlZmVyZW5jZWQgZnJvbTogL1ZvbHVt ZXMvRGF0YS93b3JrZXIvc25vd2xlb3BhcmQtaW50ZWwtcmVsZWFzZS9idWlsZC9XZWJLaXRCdWls ZC9SZWxlYXNlL1dlYktpdC5mcmFtZXdvcmsvVmVyc2lvbnMvQS9XZWJLaXQKICAgUmVhc29uOiBp bWFnZSBub3QgZm91bmQKIAogQmluYXJ5IEltYWdlczoKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQkocmV2 aXNpb24gMjY4OTIzKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVu X3dlYmtpdF90ZXN0cy5weQkod29ya2luZyBjb3B5KQpAQCAtMzQ4LDcgKzM0OCw3IEBAIGRlZiBw YXJzZV9hcmdzKGFyZ3MpOgogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1idWlsZC1u YW1lIiwgZGVmYXVsdD0iRFVNTVlfQlVJTERfTkFNRSIsCiAgICAgICAgICAgICBoZWxwPSgiVGhl IG5hbWUgb2YgdGhlIGJ1aWxkZXIgdXNlZCBpbiBpdHMgcGF0aCwgZS5nLiB3ZWJraXQtcmVsLiIp KSwKICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tYnVpbGQtc2xhdmUiLCBkZWZhdWx0 PSJEVU1NWV9CVUlMRF9TTEFWRSIsCi0gICAgICAgICAgICBoZWxwPSgiVGhlIG5hbWUgb2YgdGhl IGJ1aWxkc2xhdmUgdXNlZC4gZS5nLiBhcHBsZS1tYWNwcm8tNi4iKSksCisgICAgICAgICAgICBo ZWxwPSgiVGhlIG5hbWUgb2YgdGhlIHdvcmtlciB1c2VkLiBlLmcuIGFwcGxlLW1hY3Byby02LiIp KSwKICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tdGVzdC1yZXN1bHRzLXNlcnZlciIs IGFjdGlvbj0iYXBwZW5kIiwgZGVmYXVsdD1bXSwKICAgICAgICAgICAgIGhlbHA9KCJJZiBzcGVj aWZpZWQsIHVwbG9hZCByZXN1bHRzIGpzb24gZmlsZXMgdG8gdGhpcyBhcHBlbmdpbmUgc2VydmVy LiIpKSwKICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tcmVzdWx0cy1zZXJ2ZXItaG9z dCIsIGFjdGlvbj0iYXBwZW5kIiwgZGVmYXVsdD1bXSwKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL2xheW91dF90ZXN0X2ZpbmRlci5weQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVy cy9sYXlvdXRfdGVzdF9maW5kZXIucHkJKHJldmlzaW9uIDI2ODkyMykKKysrIFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL2xheW91dF90ZXN0X2ZpbmRlci5w eQkod29ya2luZyBjb3B5KQpAQCAtMTYyLDcgKzE2Miw3IEBAIGNsYXNzIExheW91dFRlc3RGaW5k ZXIob2JqZWN0KToKICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5ydW5fY2h1bms6CiAgICAgICAg ICAgICBjaHVua19sZW4gPSB0ZXN0X3NpemUKICAgICAgICAgICAgICMgSW4gdGhpcyBjYXNlIGNo dW5rX251bSBjYW4gYmUgcmVhbGx5IGxhcmdlLiBXZSBuZWVkCi0gICAgICAgICAgICAjIHRvIG1h a2UgdGhlIHNsYXZlIGZpdCBpbiB0aGUgY3VycmVudCBudW1iZXIgb2YgdGVzdHMuCisgICAgICAg ICAgICAjIHRvIG1ha2UgdGhlIHdvcmtlciBmaXQgaW4gdGhlIGN1cnJlbnQgbnVtYmVyIG9mIHRl c3RzLgogICAgICAgICAgICAgc2xpY2Vfc3RhcnQgPSAoY2h1bmtfbnVtICogY2h1bmtfbGVuKSAl IG51bV90ZXN0cwogICAgICAgICBlbHNlOgogICAgICAgICAgICAgIyBWYWxpZGF0ZSB0aGUgZGF0 YS4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJz L21hbmFnZXIucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQkocmV2aXNpb24gMjY4OTIzKQorKysgVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQkod29y a2luZyBjb3B5KQpAQCAtNTc1LDggKzU3NSw4IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAg ICAgICAgbWFzdGVyX25hbWUgPSBzZWxmLl9vcHRpb25zLm1hc3Rlcl9uYW1lCiAgICAgICAgIGJ1 aWxkZXJfbmFtZSA9IHNlbGYuX29wdGlvbnMuYnVpbGRlcl9uYW1lCiAgICAgICAgIGJ1aWxkX251 bWJlciA9IHNlbGYuX29wdGlvbnMuYnVpbGRfbnVtYmVyCi0gICAgICAgIGJ1aWxkX3NsYXZlID0g c2VsZi5fb3B0aW9ucy5idWlsZF9zbGF2ZQotICAgICAgICBpZiBub3QgbWFzdGVyX25hbWUgb3Ig bm90IGJ1aWxkZXJfbmFtZSBvciBub3QgYnVpbGRfbnVtYmVyIG9yIG5vdCBidWlsZF9zbGF2ZToK KyAgICAgICAgYnVpbGRfd29ya2VyID0gc2VsZi5fb3B0aW9ucy5idWlsZF9zbGF2ZQorICAgICAg ICBpZiBub3QgbWFzdGVyX25hbWUgb3Igbm90IGJ1aWxkZXJfbmFtZSBvciBub3QgYnVpbGRfbnVt YmVyIG9yIG5vdCBidWlsZF93b3JrZXI6CiAgICAgICAgICAgICBfbG9nLmVycm9yKCItLXJlc3Vs dHMtc2VydmVyLWhvc3Qgd2FzIHNldCwgYnV0IC0tbWFzdGVyLW5hbWUsIC0tYnVpbGRlci1uYW1l LCAtLWJ1aWxkLW51bWJlciwgb3IgLS1idWlsZC1zbGF2ZSB3YXMgbm90LiBOb3QgdXBsb2FkaW5n IEpTT04gZmlsZXMuIikKICAgICAgICAgICAgIHJldHVybgogCkBAIC01ODgsMTMgKzU4OCwxMyBA QCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgICByZXZpc2lvbnNbbmFtZV0gPSB7 J3JldmlzaW9uJzogcmV2aXNpb24sICd0aW1lc3RhbXAnOiBzY20udGltZXN0YW1wX29mX25hdGl2 ZV9yZXZpc2lvbihwYXRoLCByZXZpc2lvbil9CiAKICAgICAgICAgZm9yIGhvc3RuYW1lIGluIHNl bGYuX29wdGlvbnMucmVzdWx0c19zZXJ2ZXJfaG9zdDoKLSAgICAgICAgICAgIF9sb2cuaW5mbygi VXBsb2FkaW5nIEpTT04gZmlsZXMgZm9yIG1hc3RlcjogJXMgYnVpbGRlcjogJXMgYnVpbGQ6ICVz IHNsYXZlOiAlcyB0byAlcyIsIG1hc3Rlcl9uYW1lLCBidWlsZGVyX25hbWUsIGJ1aWxkX251bWJl ciwgYnVpbGRfc2xhdmUsIGhvc3RuYW1lKQorICAgICAgICAgICAgX2xvZy5pbmZvKCJVcGxvYWRp bmcgSlNPTiBmaWxlcyBmb3IgbWFzdGVyOiB7fSBidWlsZGVyOiB7fSBidWlsZDoge30gd29ya2Vy OiB7fSB0byB7fSIuZm9ybWF0KG1hc3Rlcl9uYW1lLCBidWlsZGVyX25hbWUsIGJ1aWxkX251bWJl ciwgYnVpbGRfd29ya2VyLCBob3N0bmFtZSkpCiAKICAgICAgICAgICAgIGF0dHJzID0gWwogICAg ICAgICAgICAgICAgICgnbWFzdGVyJywgJ2J1aWxkLndlYmtpdC5vcmcnIGlmIG1hc3Rlcl9uYW1l ID09ICd3ZWJraXQub3JnJyBlbHNlIG1hc3Rlcl9uYW1lKSwgICMgRklYTUU6IFBhc3MgaW4gYnVp bGQud2Via2l0Lm9yZy4KICAgICAgICAgICAgICAgICAoJ2J1aWxkZXJfbmFtZScsIGJ1aWxkZXJf bmFtZSksCiAgICAgICAgICAgICAgICAgKCdidWlsZF9udW1iZXInLCBidWlsZF9udW1iZXIpLAot ICAgICAgICAgICAgICAgICgnYnVpbGRfc2xhdmUnLCBidWlsZF9zbGF2ZSksCisgICAgICAgICAg ICAgICAgKCdidWlsZF9zbGF2ZScsIGJ1aWxkX3dvcmtlciksCiAgICAgICAgICAgICAgICAgKCdy ZXZpc2lvbnMnLCBqc29uLmR1bXBzKHJldmlzaW9ucykpLAogICAgICAgICAgICAgICAgICgnc3Rh cnRfdGltZScsIHN0cihzdGFydF90aW1lKSksCiAgICAgICAgICAgICAgICAgKCdlbmRfdGltZScs IHN0cihlbmRfdGltZSkpLApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvbGF5b3V0X3BhY2thZ2UvanNvbl9yZXN1bHRzX2dlbmVyYXRvci5weQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29u X3Jlc3VsdHNfZ2VuZXJhdG9yLnB5CShyZXZpc2lvbiAyNjg5MjMpCisrKyBUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jlc3VsdHNfZ2VuZXJh dG9yLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zMTQsNyArMzE0LDcgQEAgY2xhc3MgSlNPTlJlc3Vs dHNHZW5lcmF0b3Iob2JqZWN0KToKIAogICAgIGRlZiBnZW5lcmF0ZV90aW1lc19tc19maWxlKHNl bGYpOgogICAgICAgICAjIEZJWE1FOiByZW5hbWUgdG8gZ2VuZXJhdGVfdGltZXNfbXNfZmlsZS4g VGhpcyBuZWVkcyB0byBiZSBjb29yZGluYXRlZCB3aXRoCi0gICAgICAgICMgY2hhbmdpbmcgdGhl IGNhbGxzIHRvIHRoaXMgb24gdGhlIGNocm9taXVtIGJ1aWxkIHNsYXZlcy4KKyAgICAgICAgIyBj aGFuZ2luZyB0aGUgY2FsbHMgdG8gdGhpcyBvbiB0aGUgY2hyb21pdW0gYnVpbGQgd29ya2Vycy4K ICAgICAgICAgdGltZXMgPSB0ZXN0X3RpbWluZ3NfdHJpZShzZWxmLl9wb3J0LCBzZWxmLl90ZXN0 X3Jlc3VsdHNfbWFwLnZhbHVlcygpKQogICAgICAgICBmaWxlX3BhdGggPSBzZWxmLl9maWxlc3lz dGVtLmpvaW4oc2VsZi5fcmVzdWx0c19kaXJlY3RvcnksIHNlbGYuVElNRVNfTVNfRklMRU5BTUUp CiAgICAgICAgIHdyaXRlX2pzb24oc2VsZi5fZmlsZXN5c3RlbSwgdGltZXMsIGZpbGVfcGF0aCkK SW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9sZWFrZGV0ZWN0b3JfdW5pdHRlc3Qu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2xlYWtkZXRlY3Rv cl91bml0dGVzdC5weQkocmV2aXNpb24gMjY4OTIzKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L2xlYWtkZXRlY3Rvcl91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMTA5LDgg KzEwOSw4IEBAIExlYWs6IDB4N2ZjNTA2MDI1OTgwICBzaXplPTQzMiAgem9uZTogRGUKIAogCiBC aW5hcnkgSW1hZ2VzOgotICAgICAgIDB4MTA3YWMyMDAwIC0gICAgICAgIDB4MTA3YjRhZmY3ICtE dW1wUmVuZGVyVHJlZSAoPz8/IC0gPz8/KSA8NTY5NEJFMDMtQTYwQS0zMEIyLTlENDAtMjdDRkZD RkI4OEVFPiAvVm9sdW1lcy9EYXRhL1dlYktpdC1CdWlsZFNsYXZlL2xpb24taW50ZWwtbGVha3Mv YnVpbGQvV2ViS2l0QnVpbGQvRGVidWcvRHVtcFJlbmRlclRyZWUKLSAgICAgICAweDEwN2MyZjAw MCAtICAgICAgICAweDEwN2M1OGZmZiArbGliV2ViQ29yZVRlc3RTdXBwb3J0LmR5bGliICg1MzUu OC4wIC0gY29tcGF0aWJpbGl0eSAxLjAuMCkgPEU0RjdBMTNFLTU4MDctMzBGNy1BMzk5LTYyRjgz OTVGOTEwNj4gL1ZvbHVtZXMvRGF0YS9XZWJLaXQtQnVpbGRTbGF2ZS9saW9uLWludGVsLWxlYWtz L2J1aWxkL1dlYktpdEJ1aWxkL0RlYnVnL2xpYldlYkNvcmVUZXN0U3VwcG9ydC5keWxpYgorICAg ICAgIDB4MTA3YWMyMDAwIC0gICAgICAgIDB4MTA3YjRhZmY3ICtEdW1wUmVuZGVyVHJlZSAoPz8/ IC0gPz8/KSA8NTY5NEJFMDMtQTYwQS0zMEIyLTlENDAtMjdDRkZDRkI4OEVFPiAvVm9sdW1lcy9E YXRhL3dvcmtlci9saW9uLWludGVsLWxlYWtzL2J1aWxkL1dlYktpdEJ1aWxkL0RlYnVnL0R1bXBS ZW5kZXJUcmVlCisgICAgICAgMHgxMDdjMmYwMDAgLSAgICAgICAgMHgxMDdjNThmZmYgK2xpYldl YkNvcmVUZXN0U3VwcG9ydC5keWxpYiAoNTM1LjguMCAtIGNvbXBhdGliaWxpdHkgMS4wLjApIDxF NEY3QTEzRS01ODA3LTMwRjctQTM5OS02MkY4Mzk1RjkxMDY+IC9Wb2x1bWVzL0RhdGEvd29ya2Vy L2xpb24taW50ZWwtbGVha3MvYnVpbGQvV2ViS2l0QnVpbGQvRGVidWcvbGliV2ViQ29yZVRlc3RT dXBwb3J0LmR5bGliCiAxNyBsZWFrcyBleGNsdWRlZCAobm90IHByaW50ZWQpCiAiIiIKIApJbmRl eDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9qc29uY2hlY2tlcl91bml0 dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNr ZXJzL2pzb25jaGVja2VyX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNjg5MjMpCisrKyBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2pzb25jaGVja2VyX3VuaXR0ZXN0LnB5CSh3 b3JraW5nIGNvcHkpCkBAIC04Niw3ICs4Niw3IEBAIGNsYXNzIEpTT05DaGVja2VyVGVzdCh1bml0 dGVzdC5UZXN0Q2FzZSkKICAgICAgICAgc2VsZi5hc3NlcnRfZXJyb3IoMSBpZiBzeXMudmVyc2lv bl9pbmZvID4gKDMsIDApIGVsc2UgMCwgJ2pzb24vc3ludGF4JywgJzw8PDw8PDwgSEVBRFxue1xu fVxuJykKIAogICAgIGRlZiB0ZXN0X3NpbmdsZV9xdW90ZShzZWxmKToKLSAgICAgICAgc2VsZi5h c3NlcnRfZXJyb3IoMiwgJ2pzb24vc3ludGF4JywgIntcbidzbGF2ZXMnOiBbXVxufVxuIikKKyAg ICAgICAgc2VsZi5hc3NlcnRfZXJyb3IoMiwgJ2pzb24vc3ludGF4JywgIntcbid3b3JrZXJzJzog W11cbn1cbiIpCiAKICAgICBkZWYgdGVzdF9pbml0KHNlbGYpOgogICAgICAgICBlcnJvcl9oYW5k bGVyID0gTW9ja0Vycm9ySGFuZGxlcihzZWxmLm1vY2tfaGFuZGxlX3N0eWxlX2Vycm9yKQpAQCAt OTUsMTMgKzk1LDEzIEBAIGNsYXNzIEpTT05DaGVja2VyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSkK IAogICAgIGRlZiB0ZXN0X25vX2Vycm9yKHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydF9ub19l cnJvcigiIiJ7Ci0gICAgInNsYXZlcyI6ICAgICBbIHsgIm5hbWUiOiAidGVzdC1zbGF2ZSIsICJw bGF0Zm9ybSI6ICIqIiB9LAorICAgICJ3b3JrZXJzIjogICAgIFsgeyAibmFtZSI6ICJ0ZXN0LXdv cmtlciIsICJwbGF0Zm9ybSI6ICIqIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog ImFwcGxlLXhzZXJ2ZS00IiwgInBsYXRmb3JtIjogIm1hYy1zbm93bGVvcGFyZCIgfQogICAgICAg ICAgICAgICAgICAgXSwKIAogICAgICJidWlsZGVycyI6ICAgWyB7ICJuYW1lIjogIlNub3dMZW9w YXJkIEludGVsIFJlbGVhc2UgKEJ1aWxkKSIsICJ0eXBlIjogIkJ1aWxkIiwgImJ1aWxkZGlyIjog InNub3dsZW9wYXJkLWludGVsLXJlbGVhc2UiLAogICAgICAgICAgICAgICAgICAgICAgICJwbGF0 Zm9ybSI6ICJtYWMtc25vd2xlb3BhcmQiLCAiY29uZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwgImFy Y2hpdGVjdHVyZXMiOiBbIng4Nl82NCJdLAotICAgICAgICAgICAgICAgICAgICAgICJzbGF2ZW5h bWVzIjogWyJhcHBsZS14c2VydmUtNCJdCisgICAgICAgICAgICAgICAgICAgICAgIndvcmtlcm5h bWVzIjogWyJhcHBsZS14c2VydmUtNCJdCiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAg ICAgICAgICAgICBdLAogCg==