206536 2020-01-21 08:29:47 -0800 [ews] add commit-queue build step to clear flags on patch 2020-02-19 07:41:55 -0800 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=206511 https://bugs.webkit.org/show_bug.cgi?id=207387 InRadar P2 Normal --- 201934 1 aakash_jain aakash_jain aakash_jain ap jbedard webkit-bug-importer oldest_to_newest 1609058 0 aakash_jain 2020-01-21 08:29:47 -0800 [ews] add commit-queue build step to clear flags on patch and close the bug. 1609059 1 webkit-bug-importer 2020-01-21 08:30:04 -0800 <rdar://problem/58759929> 1615185 2 389843 aakash_jain 2020-02-05 12:25:46 -0800 Created attachment 389843 WIP 1615191 3 aakash_jain 2020-02-05 12:34:38 -0800 This would also use Bugzilla API key similar to Bug 206511. I think it would be better to store the API key in the passwords.json instead of environment variable as discussed in https://bugs.webkit.org/show_bug.cgi?id=206511#c10 1615229 4 389843 jbedard 2020-02-05 13:22:54 -0800 Comment on attachment 389843 WIP View in context: https://bugs.webkit.org/attachment.cgi?id=389843&action=review > Tools/BuildSlaveSupport/ews-build/steps.py:432 > + def _remove_flags_on_patch(self, patch_id): Strikes me as weird that you're having the Mixin own this function. Which actions, other than RemoveFlagsOnPatch, would use it? 1616127 5 389843 aakash_jain 2020-02-07 06:26:38 -0800 Comment on attachment 389843 WIP View in context: https://bugs.webkit.org/attachment.cgi?id=389843&action=review >> Tools/BuildSlaveSupport/ews-build/steps.py:432 >> + def _remove_flags_on_patch(self, patch_id): > > Strikes me as weird that you're having the Mixin own this function. Which actions, other than RemoveFlagsOnPatch, would use it? Other build-steps like Validating Committer/Reviewer would need to modify the flags (set cq-), which would use very similar logic. I think it's better to keep all the bugzilla logic in one place. 1616130 6 390079 aakash_jain 2020-02-07 06:33:46 -0800 Created attachment 390079 Patch 1616131 7 aakash_jain 2020-02-07 06:36:06 -0800 Sample runs: Success: https://ews-build.webkit-uat.org/#/builders/26/builds/425 Failure: https://ews-build.webkit-uat.org/#/builders/26/builds/423 1616171 8 390079 jbedard 2020-02-07 09:01:14 -0800 Comment on attachment 390079 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390079&action=review > Tools/BuildSlaveSupport/ews-build/steps.py:534 > + rc = self.remove_flags_on_patch(patch_id) Nit: not sure rc is actually helpful here, I'd probably just put this call inside self.finished. I don't feel particularly strongly about this, though. 1616173 9 390079 aakash_jain 2020-02-07 09:05:01 -0800 Comment on attachment 390079 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390079&action=review >> Tools/BuildSlaveSupport/ews-build/steps.py:534 >> + rc = self.remove_flags_on_patch(patch_id) > > Nit: not sure rc is actually helpful here, I'd probably just put this call inside self.finished. I don't feel particularly strongly about this, though. I like the function call being explicit for better readability, as it's the most important part of this class/method. 1616174 10 aakash_jain 2020-02-07 09:07:38 -0800 Committed r256026: <https://trac.webkit.org/changeset/256026> 389843 2020-02-05 12:25:46 -0800 2020-02-07 06:33:43 -0800 WIP bug-206536-20200205152545.patch text/plain 4722 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NTg0MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI2IEBACisyMDIwLTAyLTA1ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBhZGQgY29tbWl0LXF1ZXVlIGJ1aWxkIHN0ZXAgdG8gY2xlYXIg ZmxhZ3Mgb24gcGF0Y2gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwNjUzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5OgorICAgICAgICAo QnVnemlsbGFNaXhpbik6IENsYXNzIGZvciBjb21tb24gYnVnemlsbGEgcmVsYXRlZCBtZXRob2Rz LgorICAgICAgICAoQnVnemlsbGFNaXhpbi5fcmVtb3ZlX2ZsYWdzX29uX3BhdGNoKTogTWV0aG9k IHRvIHJlbW92ZSBmbGFncyBvbiBwYXRjaC4KKyAgICAgICAgKFZhbGlkYXRlUGF0Y2gpOgorICAg ICAgICAoUmVtb3ZlRmxhZ3NPblBhdGNoKTogQ2xhc3MgdG8gcmVtb3ZlIGZsYWdzIG9uIHBhdGNo LgorICAgICAgICAoUmVtb3ZlRmxhZ3NPblBhdGNoLnN0YXJ0KToKKyAgICAgICAgKFZhbGlkYXRl UGF0Y2guX2FkZFRvTG9nKTogTW92ZWQuCisgICAgICAgIChWYWxpZGF0ZVBhdGNoLmZldGNoX2Rh dGFfZnJvbV91cmwpOiBNb3ZlZC4KKyAgICAgICAgKFZhbGlkYXRlUGF0Y2guZ2V0X3BhdGNoX2pz b24pOiBNb3ZlZC4KKyAgICAgICAgKFZhbGlkYXRlUGF0Y2guZ2V0X2J1Z19qc29uKTogTW92ZWQu CisgICAgICAgIChWYWxpZGF0ZVBhdGNoLmdldF9idWdfaWRfZnJvbV9wYXRjaCk6IE1vdmVkLgor ICAgICAgICAoVmFsaWRhdGVQYXRjaC5faXNfcGF0Y2hfb2Jzb2xldGUpOiBNb3ZlZC4KKyAgICAg ICAgKFZhbGlkYXRlUGF0Y2guX2lzX3BhdGNoX3Jldmlld19kZW5pZWQpOiBNb3ZlZC4KKyAgICAg ICAgKFZhbGlkYXRlUGF0Y2guX2lzX3BhdGNoX2NxX3BsdXMpOiBNb3ZlZC4KKyAgICAgICAgKFZh bGlkYXRlUGF0Y2guX2lzX2J1Z19jbG9zZWQpOiBNb3ZlZC4KKwogMjAyMC0wMi0wNSAgWGFiaWVy IFJvZHJpZ3VleiBDYWx2YXIgIDxjYWx2YXJpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtd IEZpeCBkZXBlbmRlbmNpZXMgYnVpbGQKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3 cy1idWlsZC9zdGVwcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9l d3MtYnVpbGQvc3RlcHMucHkJKHJldmlzaW9uIDI1NTg0MykKKysrIFRvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAtMzIwLDIzICszMjAs MTEgQEAgY2xhc3MgQ2hlY2tQYXRjaFJlbGV2YW5jZShidWlsZHN0ZXAuQnVpbAogICAgICAgICBy ZXR1cm4gTm9uZQogCiAKLWNsYXNzIFZhbGlkYXRlUGF0Y2goYnVpbGRzdGVwLkJ1aWxkU3RlcCk6 Ci0gICAgbmFtZSA9ICd2YWxpZGF0ZS1wYXRjaCcKLSAgICBkZXNjcmlwdGlvbiA9IFsndmFsaWRh dGUtcGF0Y2ggcnVubmluZyddCi0gICAgZGVzY3JpcHRpb25Eb25lID0gWydWYWxpZGF0ZWQgcGF0 Y2gnXQotICAgIGZsdW5rT25GYWlsdXJlID0gVHJ1ZQotICAgIGhhbHRPbkZhaWx1cmUgPSBUcnVl CitjbGFzcyBCdWd6aWxsYU1peGluKG9iamVjdCk6CisgICAgYWRkVVJMcyA9IEZhbHNlCiAgICAg YnVnX29wZW5fc3RhdHVzZXMgPSBbJ1VOQ09ORklSTUVEJywgJ05FVycsICdBU1NJR05FRCcsICdS RU9QRU5FRCddCiAgICAgYnVnX2Nsb3NlZF9zdGF0dXNlcyA9IFsnUkVTT0xWRUQnLCAnVkVSSUZJ RUQnLCAnQ0xPU0VEJ10KIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCB2ZXJpZnlPYnNvbGV0ZT1U cnVlLCB2ZXJpZnlCdWdDbG9zZWQ9VHJ1ZSwgdmVyaWZ5UmV2aWV3RGVuaWVkPVRydWUsIGFkZFVS THM9VHJ1ZSwgdmVyaWZ5Y3FwbHVzPUZhbHNlKToKLSAgICAgICAgc2VsZi52ZXJpZnlPYnNvbGV0 ZSA9IHZlcmlmeU9ic29sZXRlCi0gICAgICAgIHNlbGYudmVyaWZ5QnVnQ2xvc2VkID0gdmVyaWZ5 QnVnQ2xvc2VkCi0gICAgICAgIHNlbGYudmVyaWZ5UmV2aWV3RGVuaWVkID0gdmVyaWZ5UmV2aWV3 RGVuaWVkCi0gICAgICAgIHNlbGYudmVyaWZ5Y3FwbHVzID0gdmVyaWZ5Y3FwbHVzCi0gICAgICAg IHNlbGYuYWRkVVJMcyA9IGFkZFVSTHMKLSAgICAgICAgYnVpbGRzdGVwLkJ1aWxkU3RlcC5fX2lu aXRfXyhzZWxmKQotCiAgICAgQGRlZmVyLmlubGluZUNhbGxiYWNrcwogICAgIGRlZiBfYWRkVG9M b2coc2VsZiwgbG9nTmFtZSwgbWVzc2FnZSk6CiAgICAgICAgIHRyeToKQEAgLTQ0MSw2ICs0Mjks MzIgQEAgY2xhc3MgVmFsaWRhdGVQYXRjaChidWlsZHN0ZXAuQnVpbGRTdGVwKQogICAgICAgICAg ICAgcmV0dXJuIDEKICAgICAgICAgcmV0dXJuIDAKIAorICAgIGRlZiBfcmVtb3ZlX2ZsYWdzX29u X3BhdGNoKHNlbGYsIHBhdGNoX2lkKToKKyAgICAgICAgcGF0Y2hfdXJsID0gJ3t9cmVzdC9idWcv YXR0YWNobWVudC97fScuZm9ybWF0KEJVR19TRVJWRVJfVVJMLCBwYXRjaF9pZCkKKyAgICAgICAg ZmxhZ3MgPSBbeyduYW1lJzogJ3JldmlldycsICdzdGF0dXMnOiAnWCd9LCB7J25hbWUnOiAnY29t bWl0LXF1ZXVlJywgJ3N0YXR1cyc6ICdYJ31dCisgICAgICAgIHRyeToKKyAgICAgICAgICAgIHJl c3BvbnNlID0gcmVxdWVzdHMucHV0KHBhdGNoX3VybCwganNvbj17J2ZsYWdzJzogZmxhZ3MsICdC dWd6aWxsYV9hcGlfa2V5Jzogb3MuZ2V0ZW52KCdCVUdaSUxMQV9BUElfS0VZJywgTm9uZSl9KQor ICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6CisgICAgICAgICAgICBzZWxmLl9hZGRUb0xv Zygnc3RkaW8nLCAnRXJyb3IgaW4gcmVtb3ZpbmcgZmxhZ3Mgb24gUGF0Y2gge306IHt9Jy5mb3Jt YXQocGF0Y2hfaWQsIGUpKQorICAgICAgICAgICAgcmV0dXJuIEZBSUxVUkUKKyAgICAgICAgcmV0 dXJuIFNVQ0NFU1MKKworCitjbGFzcyBWYWxpZGF0ZVBhdGNoKGJ1aWxkc3RlcC5CdWlsZFN0ZXAs IEJ1Z3ppbGxhTWl4aW4pOgorICAgIG5hbWUgPSAndmFsaWRhdGUtcGF0Y2gnCisgICAgZGVzY3Jp cHRpb24gPSBbJ3ZhbGlkYXRlLXBhdGNoIHJ1bm5pbmcnXQorICAgIGRlc2NyaXB0aW9uRG9uZSA9 IFsnVmFsaWRhdGVkIHBhdGNoJ10KKyAgICBmbHVua09uRmFpbHVyZSA9IFRydWUKKyAgICBoYWx0 T25GYWlsdXJlID0gVHJ1ZQorCisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHZlcmlmeU9ic29sZXRl PVRydWUsIHZlcmlmeUJ1Z0Nsb3NlZD1UcnVlLCB2ZXJpZnlSZXZpZXdEZW5pZWQ9VHJ1ZSwgYWRk VVJMcz1UcnVlLCB2ZXJpZnljcXBsdXM9RmFsc2UpOgorICAgICAgICBzZWxmLnZlcmlmeU9ic29s ZXRlID0gdmVyaWZ5T2Jzb2xldGUKKyAgICAgICAgc2VsZi52ZXJpZnlCdWdDbG9zZWQgPSB2ZXJp ZnlCdWdDbG9zZWQKKyAgICAgICAgc2VsZi52ZXJpZnlSZXZpZXdEZW5pZWQgPSB2ZXJpZnlSZXZp ZXdEZW5pZWQKKyAgICAgICAgc2VsZi52ZXJpZnljcXBsdXMgPSB2ZXJpZnljcXBsdXMKKyAgICAg ICAgc2VsZi5hZGRVUkxzID0gYWRkVVJMcworICAgICAgICBidWlsZHN0ZXAuQnVpbGRTdGVwLl9f aW5pdF9fKHNlbGYpCisKICAgICBkZWYgZ2V0UmVzdWx0U3VtbWFyeShzZWxmKToKICAgICAgICAg aWYgc2VsZi5yZXN1bHRzID09IEZBSUxVUkU6CiAgICAgICAgICAgICByZXR1cm4ge3Unc3RlcCc6 IHVuaWNvZGUoc2VsZi5kZXNjcmlwdGlvbkRvbmUpfQpAQCAtNTAwLDYgKzUxNCwyNSBAQCBjbGFz cyBWYWxpZGF0ZVBhdGNoKGJ1aWxkc3RlcC5CdWlsZFN0ZXApCiAgICAgICAgIHJldHVybiBOb25l CiAKIAorY2xhc3MgUmVtb3ZlRmxhZ3NPblBhdGNoKGJ1aWxkc3RlcC5CdWlsZFN0ZXAsIEJ1Z3pp bGxhTWl4aW4pOgorICAgIG5hbWUgPSAncmVtb3ZlLWZsYWdzLWZyb20tcGF0Y2gnCisgICAgZGVz Y3JpcHRpb25Eb25lID0gWydSZW1vdmVkIGZsYWdzIG9uIGJ1Z3ppbGxhIHBhdGNoJ10KKyAgICBm bHVua09uRmFpbHVyZSA9IEZhbHNlCisgICAgaGFsdE9uRmFpbHVyZSA9IEZhbHNlCisKKyAgICBk ZWYgc3RhcnQoc2VsZik6CisgICAgICAgIHBhdGNoX2lkID0gc2VsZi5nZXRQcm9wZXJ0eSgncGF0 Y2hfaWQnLCAnJykKKyAgICAgICAgaWYgbm90IHBhdGNoX2lkOgorICAgICAgICAgICAgc2VsZi5f YWRkVG9Mb2coJ3N0ZGlvJywgJ05vIHBhdGNoIGlkIGZvdW5kLlxuJykKKyAgICAgICAgICAgIHNl bGYuZGVzY3JpcHRpb25Eb25lID0gJ05vIHBhdGNoIGlkIGZvdW5kJworICAgICAgICAgICAgc2Vs Zi5maW5pc2hlZChGQUlMVVJFKQorICAgICAgICAgICAgcmV0dXJuIE5vbmUKKworICAgICAgICBy YyA9IHNlbGYuX3JlbW92ZV9mbGFnc19vbl9wYXRjaChwYXRjaF9pZCkKKyAgICAgICAgc2VsZi5m aW5pc2hlZChyYykKKyAgICAgICAgcmV0dXJuIE5vbmUKKworCiBjbGFzcyBVbkFwcGx5UGF0Y2hJ ZlJlcXVpcmVkKENsZWFuV29ya2luZ0RpcmVjdG9yeSk6CiAgICAgbmFtZSA9ICd1bmFwcGx5LXBh dGNoJwogICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsnVW5hcHBsaWVkIHBhdGNoJ10K 390079 2020-02-07 06:33:46 -0800 2020-02-07 09:01:14 -0800 Patch bug-206536-20200207093345.patch text/plain 5103 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NjAxNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI3IEBACisyMDIwLTAyLTA1ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBhZGQgY29tbWl0LXF1ZXVlIGJ1aWxkIHN0ZXAgdG8gY2xlYXIg ZmxhZ3Mgb24gcGF0Y2gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwNjUzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5OgorICAgICAgICAo QnVnemlsbGFNaXhpbik6IENsYXNzIGZvciBjb21tb24gYnVnemlsbGEgcmVsYXRlZCBtZXRob2Rz LgorICAgICAgICAoQnVnemlsbGFNaXhpbi5nZXRfYnVnemlsbGFfYXBpX2tleSk6IE1ldGhvZCB0 byByZWFkIGJ1Z3ppbGxhIGFwaSBrZXkgZnJvbSBmaWxlLgorICAgICAgICAoQnVnemlsbGFNaXhp bi5yZW1vdmVfZmxhZ3Nfb25fcGF0Y2gpOiBNZXRob2QgdG8gcmVtb3ZlIGZsYWdzIG9uIHBhdGNo LgorICAgICAgICAoVmFsaWRhdGVQYXRjaCk6CisgICAgICAgIChSZW1vdmVGbGFnc09uUGF0Y2gp OiBDbGFzcyB0byByZW1vdmUgZmxhZ3Mgb24gcGF0Y2guCisgICAgICAgIChSZW1vdmVGbGFnc09u UGF0Y2guc3RhcnQpOgorICAgICAgICAoVmFsaWRhdGVQYXRjaC5fYWRkVG9Mb2cpOiBNb3ZlZC4K KyAgICAgICAgKFZhbGlkYXRlUGF0Y2guZmV0Y2hfZGF0YV9mcm9tX3VybCk6IE1vdmVkLgorICAg ICAgICAoVmFsaWRhdGVQYXRjaC5nZXRfcGF0Y2hfanNvbik6IE1vdmVkLgorICAgICAgICAoVmFs aWRhdGVQYXRjaC5nZXRfYnVnX2pzb24pOiBNb3ZlZC4KKyAgICAgICAgKFZhbGlkYXRlUGF0Y2gu Z2V0X2J1Z19pZF9mcm9tX3BhdGNoKTogTW92ZWQuCisgICAgICAgIChWYWxpZGF0ZVBhdGNoLl9p c19wYXRjaF9vYnNvbGV0ZSk6IE1vdmVkLgorICAgICAgICAoVmFsaWRhdGVQYXRjaC5faXNfcGF0 Y2hfcmV2aWV3X2RlbmllZCk6IE1vdmVkLgorICAgICAgICAoVmFsaWRhdGVQYXRjaC5faXNfcGF0 Y2hfY3FfcGx1cyk6IE1vdmVkLgorICAgICAgICAoVmFsaWRhdGVQYXRjaC5faXNfYnVnX2Nsb3Nl ZCk6IE1vdmVkLgorCiAyMDIwLTAyLTA3ICBQYXRyaWNrIEdyaWZmaXMgIDxwZ3JpZmZpc0BpZ2Fs aWEuY29tPgogCiAgICAgICAgIFtHVEtdW1dQRV0gQWRkIHNhbWUtc2l0ZSBjb29raWUgc3VwcG9y dApJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQkocmV2 aXNpb24gMjU2MDE3KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBz LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zMjAsMjMgKzMyMCwxMSBAQCBjbGFzcyBDaGVja1BhdGNo UmVsZXZhbmNlKGJ1aWxkc3RlcC5CdWlsCiAgICAgICAgIHJldHVybiBOb25lCiAKIAotY2xhc3Mg VmFsaWRhdGVQYXRjaChidWlsZHN0ZXAuQnVpbGRTdGVwKToKLSAgICBuYW1lID0gJ3ZhbGlkYXRl LXBhdGNoJwotICAgIGRlc2NyaXB0aW9uID0gWyd2YWxpZGF0ZS1wYXRjaCBydW5uaW5nJ10KLSAg ICBkZXNjcmlwdGlvbkRvbmUgPSBbJ1ZhbGlkYXRlZCBwYXRjaCddCi0gICAgZmx1bmtPbkZhaWx1 cmUgPSBUcnVlCi0gICAgaGFsdE9uRmFpbHVyZSA9IFRydWUKK2NsYXNzIEJ1Z3ppbGxhTWl4aW4o b2JqZWN0KToKKyAgICBhZGRVUkxzID0gRmFsc2UKICAgICBidWdfb3Blbl9zdGF0dXNlcyA9IFsn VU5DT05GSVJNRUQnLCAnTkVXJywgJ0FTU0lHTkVEJywgJ1JFT1BFTkVEJ10KICAgICBidWdfY2xv c2VkX3N0YXR1c2VzID0gWydSRVNPTFZFRCcsICdWRVJJRklFRCcsICdDTE9TRUQnXQogCi0gICAg ZGVmIF9faW5pdF9fKHNlbGYsIHZlcmlmeU9ic29sZXRlPVRydWUsIHZlcmlmeUJ1Z0Nsb3NlZD1U cnVlLCB2ZXJpZnlSZXZpZXdEZW5pZWQ9VHJ1ZSwgYWRkVVJMcz1UcnVlLCB2ZXJpZnljcXBsdXM9 RmFsc2UpOgotICAgICAgICBzZWxmLnZlcmlmeU9ic29sZXRlID0gdmVyaWZ5T2Jzb2xldGUKLSAg ICAgICAgc2VsZi52ZXJpZnlCdWdDbG9zZWQgPSB2ZXJpZnlCdWdDbG9zZWQKLSAgICAgICAgc2Vs Zi52ZXJpZnlSZXZpZXdEZW5pZWQgPSB2ZXJpZnlSZXZpZXdEZW5pZWQKLSAgICAgICAgc2VsZi52 ZXJpZnljcXBsdXMgPSB2ZXJpZnljcXBsdXMKLSAgICAgICAgc2VsZi5hZGRVUkxzID0gYWRkVVJM cwotICAgICAgICBidWlsZHN0ZXAuQnVpbGRTdGVwLl9faW5pdF9fKHNlbGYpCi0KICAgICBAZGVm ZXIuaW5saW5lQ2FsbGJhY2tzCiAgICAgZGVmIF9hZGRUb0xvZyhzZWxmLCBsb2dOYW1lLCBtZXNz YWdlKToKICAgICAgICAgdHJ5OgpAQCAtNDQxLDYgKzQyOSwzNiBAQCBjbGFzcyBWYWxpZGF0ZVBh dGNoKGJ1aWxkc3RlcC5CdWlsZFN0ZXApCiAgICAgICAgICAgICByZXR1cm4gMQogICAgICAgICBy ZXR1cm4gMAogCisgICAgZGVmIGdldF9idWd6aWxsYV9hcGlfa2V5KHNlbGYpOgorICAgICAgICBw YXNzd29yZHMgPSBqc29uLmxvYWQob3BlbigncGFzc3dvcmRzLmpzb24nKSkKKyAgICAgICAgcmV0 dXJuIHBhc3N3b3Jkc1snQlVHWklMTEFfQVBJX0tFWSddCisKKyAgICBkZWYgcmVtb3ZlX2ZsYWdz X29uX3BhdGNoKHNlbGYsIHBhdGNoX2lkKToKKyAgICAgICAgcGF0Y2hfdXJsID0gJ3t9cmVzdC9i dWcvYXR0YWNobWVudC97fScuZm9ybWF0KEJVR19TRVJWRVJfVVJMLCBwYXRjaF9pZCkKKyAgICAg ICAgZmxhZ3MgPSBbeyduYW1lJzogJ3JldmlldycsICdzdGF0dXMnOiAnWCd9LCB7J25hbWUnOiAn Y29tbWl0LXF1ZXVlJywgJ3N0YXR1cyc6ICdYJ31dCisgICAgICAgIHRyeToKKyAgICAgICAgICAg IHJlc3BvbnNlID0gcmVxdWVzdHMucHV0KHBhdGNoX3VybCwganNvbj17J2ZsYWdzJzogZmxhZ3Ms ICdCdWd6aWxsYV9hcGlfa2V5Jzogc2VsZi5nZXRfYnVnemlsbGFfYXBpX2tleSgpfSkKKyAgICAg ICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgorICAgICAgICAgICAgc2VsZi5fYWRkVG9Mb2coJ3N0 ZGlvJywgJ0Vycm9yIGluIHJlbW92aW5nIGZsYWdzIG9uIFBhdGNoIHt9Jy5mb3JtYXQocGF0Y2hf aWQpKQorICAgICAgICAgICAgcmV0dXJuIEZBSUxVUkUKKyAgICAgICAgcmV0dXJuIFNVQ0NFU1MK KworCitjbGFzcyBWYWxpZGF0ZVBhdGNoKGJ1aWxkc3RlcC5CdWlsZFN0ZXAsIEJ1Z3ppbGxhTWl4 aW4pOgorICAgIG5hbWUgPSAndmFsaWRhdGUtcGF0Y2gnCisgICAgZGVzY3JpcHRpb24gPSBbJ3Zh bGlkYXRlLXBhdGNoIHJ1bm5pbmcnXQorICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsnVmFsaWRhdGVk IHBhdGNoJ10KKyAgICBmbHVua09uRmFpbHVyZSA9IFRydWUKKyAgICBoYWx0T25GYWlsdXJlID0g VHJ1ZQorCisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHZlcmlmeU9ic29sZXRlPVRydWUsIHZlcmlm eUJ1Z0Nsb3NlZD1UcnVlLCB2ZXJpZnlSZXZpZXdEZW5pZWQ9VHJ1ZSwgYWRkVVJMcz1UcnVlLCB2 ZXJpZnljcXBsdXM9RmFsc2UpOgorICAgICAgICBzZWxmLnZlcmlmeU9ic29sZXRlID0gdmVyaWZ5 T2Jzb2xldGUKKyAgICAgICAgc2VsZi52ZXJpZnlCdWdDbG9zZWQgPSB2ZXJpZnlCdWdDbG9zZWQK KyAgICAgICAgc2VsZi52ZXJpZnlSZXZpZXdEZW5pZWQgPSB2ZXJpZnlSZXZpZXdEZW5pZWQKKyAg ICAgICAgc2VsZi52ZXJpZnljcXBsdXMgPSB2ZXJpZnljcXBsdXMKKyAgICAgICAgc2VsZi5hZGRV UkxzID0gYWRkVVJMcworICAgICAgICBidWlsZHN0ZXAuQnVpbGRTdGVwLl9faW5pdF9fKHNlbGYp CisKICAgICBkZWYgZ2V0UmVzdWx0U3VtbWFyeShzZWxmKToKICAgICAgICAgaWYgc2VsZi5yZXN1 bHRzID09IEZBSUxVUkU6CiAgICAgICAgICAgICByZXR1cm4ge3Unc3RlcCc6IHVuaWNvZGUoc2Vs Zi5kZXNjcmlwdGlvbkRvbmUpfQpAQCAtNTAwLDYgKzUxOCwyOSBAQCBjbGFzcyBWYWxpZGF0ZVBh dGNoKGJ1aWxkc3RlcC5CdWlsZFN0ZXApCiAgICAgICAgIHJldHVybiBOb25lCiAKIAorY2xhc3Mg UmVtb3ZlRmxhZ3NPblBhdGNoKGJ1aWxkc3RlcC5CdWlsZFN0ZXAsIEJ1Z3ppbGxhTWl4aW4pOgor ICAgIG5hbWUgPSAncmVtb3ZlLWZsYWdzLWZyb20tcGF0Y2gnCisgICAgZmx1bmtPbkZhaWx1cmUg PSBGYWxzZQorICAgIGhhbHRPbkZhaWx1cmUgPSBGYWxzZQorCisgICAgZGVmIHN0YXJ0KHNlbGYp OgorICAgICAgICBwYXRjaF9pZCA9IHNlbGYuZ2V0UHJvcGVydHkoJ3BhdGNoX2lkJywgJycpCisg ICAgICAgIGlmIG5vdCBwYXRjaF9pZDoKKyAgICAgICAgICAgIHNlbGYuX2FkZFRvTG9nKCdzdGRp bycsICdwYXRjaF9pZCBidWlsZCBwcm9wZXJ0eSBub3QgZm91bmQuXG4nKQorICAgICAgICAgICAg c2VsZi5kZXNjcmlwdGlvbkRvbmUgPSAnTm8gcGF0Y2ggaWQgZm91bmQnCisgICAgICAgICAgICBz ZWxmLmZpbmlzaGVkKEZBSUxVUkUpCisgICAgICAgICAgICByZXR1cm4gTm9uZQorCisgICAgICAg IHJjID0gc2VsZi5yZW1vdmVfZmxhZ3Nfb25fcGF0Y2gocGF0Y2hfaWQpCisgICAgICAgIHNlbGYu ZmluaXNoZWQocmMpCisgICAgICAgIHJldHVybiBOb25lCisKKyAgICBkZWYgZ2V0UmVzdWx0U3Vt bWFyeShzZWxmKToKKyAgICAgICAgaWYgc2VsZi5yZXN1bHRzID09IFNVQ0NFU1M6CisgICAgICAg ICAgICByZXR1cm4ge3Unc3RlcCc6IHUnUmVtb3ZlZCBmbGFncyBvbiBidWd6aWxsYSBwYXRjaCd9 CisgICAgICAgIHJldHVybiB7dSdzdGVwJzogdSdGYWlsZWQgdG8gcmVtb3ZlIGZsYWdzIG9uIGJ1 Z3ppbGxhIHBhdGNoJ30KKworCiBjbGFzcyBVbkFwcGx5UGF0Y2hJZlJlcXVpcmVkKENsZWFuV29y a2luZ0RpcmVjdG9yeSk6CiAgICAgbmFtZSA9ICd1bmFwcGx5LXBhdGNoJwogICAgIGRlc2NyaXB0 aW9uRG9uZSA9IFsnVW5hcHBsaWVkIHBhdGNoJ10K