224286 2021-04-07 09:18:32 -0700 Add webkit-patch support for fast-cq mode 2021-10-23 04:59:40 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=223954 https://bugs.webkit.org/show_bug.cgi?id=232196 InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap ews-watchlist glenn jbedard ryanhaddad webkit-bug-importer oldest_to_newest 1747915 0 aakash_jain 2021-04-07 09:18:32 -0700 r275282 added fast-cq mode (for landing patches quickly through commit-queue by skipping building and testing). We should webkit-patch support for fast-cq mode. webkit-patch should have a --fast-cq parameter, which would result in uploaded patch being appropriately named on Bugzilla to trigger fast-cq mode. 1747916 1 425409 aakash_jain 2021-04-07 09:21:17 -0700 Created attachment 425409 Patch 1747922 2 425411 aakash_jain 2021-04-07 09:33:43 -0700 Created attachment 425411 [fast-cq] Patch 1747925 3 ap 2021-04-07 09:44:18 -0700 This seems fine to do, but I don't really understand the goal. I understand that everything will be landed via commit queue on GitHub. But what exactly will we achieve by encouraging people to use CQ more now? Are you expecting that we'll still be using patch based workflow, so we need to find and fix all svn-apply bugs and limitations? 1747983 4 aakash_jain 2021-04-07 11:20:00 -0700 (In reply to Alexey Proskuryakov from comment #3) > This seems fine to do, but I don't really understand the goal. I understand > that everything will be landed via commit queue on GitHub. But what exactly > will we achieve by encouraging people to use CQ more now? Are you expecting > that we'll still be using patch based workflow, so we need to find and fix > all svn-apply bugs and limitations? This comment seems more about Bug 223942. fast commit queue mode would be useful even in git world, since there would be various scenarios in which people would want to land quickly or skip building/testing, e.g.: build fix, typo fix, minor follow-up fix. For example, I just used this --fast-cq parameter to upload a patch for small follow-up fix in https://bugs.webkit.org/show_bug.cgi?id=223686#c14. I will discuss the concerns about Bug 223942 separately. 1748444 5 ews-feeder 2021-04-08 13:02:59 -0700 Committed r275672 (236308@main): <https://commits.webkit.org/236308@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425411. 1748446 6 webkit-bug-importer 2021-04-08 13:03:34 -0700 <rdar://problem/76417274> 425409 2021-04-07 09:21:17 -0700 2021-04-07 09:33:40 -0700 Patch bug-224286-20210407122116.patch text/plain 5137 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NTYwNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDIxLTA0LTA3ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBBZGQgd2Via2l0LXBhdGNoIHN1cHBvcnQgZm9yIGZhc3QtY3EgbW9kZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0Mjg2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3Rvb2wvc3RlcHMvb3B0aW9ucy5weToKKyAgICAgICAgKE9wdGlvbnMpOiBBZGRl ZCAtLWZhc3QtY3EgcGFyYW1ldGVyLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9z dGVwcy9wb3N0ZGlmZi5weToKKyAgICAgICAgKFBvc3REaWZmLm9wdGlvbnMpOgorICAgICAgICAo UG9zdERpZmYucnVuKTogU2V0IHRoZSBwYXRjaCBuYW1lIGFwcHJvcHJpYXRlbHkgZm9yIGZhc3Qt Y3EgbW9kZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEv YXR0YWNobWVudC5weToKKwogMjAyMS0wNC0wNyAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBh cHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjc0MzY2KTogd2Via2l0c2NtcHkudGVz dC5zdm5fdW5pdHRlc3QuVGVzdFJlbW90ZVN2bi50ZXN0X2luZm8gZmFpbHMgaW4gbm9uLVBEVCB0 aW1lem9uZXMKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxs YS9hdHRhY2htZW50LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL25ldC9idWd6aWxsYS9hdHRhY2htZW50LnB5CShyZXZpc2lvbiAyNzU2MDYpCisrKyBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYXR0YWNobWVudC5weQkod29y a2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKICMgQ29weXJpZ2h0IChjKSAyMDA5IEdvb2dsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0jIENvcHlyaWdodCAoYykgMjAwOSwgMjAxOCBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAoYykgMjAwOS0yMDIxIEFw cGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMgQ29weXJpZ2h0IChjKSAyMDEwIFJlc2Vh cmNoIEluIE1vdGlvbiBMaW1pdGVkLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3Ry aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv dXQKQEAgLTM2LDYgKzM2LDcgQEAgX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQog CiAKIGNsYXNzIEF0dGFjaG1lbnQob2JqZWN0KToKKyAgICBmYXN0X2NxX3ByZWFtYmxlID0gIltm YXN0LWNxXSAiCiAgICAgcmV2ZXJ0X3ByZWFtYmxlID0gIlJFVkVSVCBvZiByIgogICAgIHJvbGxv dXRfcHJlYW1ibGUgPSAiUk9MTE9VVCBvZiByIgogCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvc3RlcHMvb3B0aW9ucy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dl YmtpdHB5L3Rvb2wvc3RlcHMvb3B0aW9ucy5weQkocmV2aXNpb24gMjc1NjA2KQorKysgVG9vbHMv U2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL29wdGlvbnMucHkJKHdvcmtpbmcgY29weSkKQEAg LTEsNSArMSw1IEBACiAjIENvcHlyaWdodCAoQykgMjAxMCBHb29nbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgotIyBDb3B5cmlnaHQgKEMpIDIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMTctMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCkBAIC00OCw2ICs0OCw3 IEBAIGNsYXNzIE9wdGlvbnMob2JqZWN0KToKICAgICBkZXNjcmlwdGlvbiA9IG1ha2Vfb3B0aW9u KCItbSIsICItLWRlc2NyaXB0aW9uIiwgYWN0aW9uPSJzdG9yZSIsIHR5cGU9InN0cmluZyIsIGRl c3Q9ImRlc2NyaXB0aW9uIiwgaGVscD0iRGVzY3JpcHRpb24gc3RyaW5nIGZvciB0aGUgYXR0YWNo bWVudCIpCiAgICAgZW1haWwgPSBtYWtlX29wdGlvbigiLS1lbWFpbCIsIGFjdGlvbj0ic3RvcmUi LCB0eXBlPSJzdHJpbmciLCBkZXN0PSJlbWFpbCIsIGhlbHA9IkVtYWlsIGFkZHJlc3MgdG8gdXNl IGluIENoYW5nZUxvZ3MuIikKICAgICBld3MgPSBtYWtlX29wdGlvbignLS1uby1ld3MnLCBhY3Rp b249J3N0b3JlX2ZhbHNlJywgZGVzdD0nZXdzJywgZGVmYXVsdD1UcnVlLCBoZWxwPSdEbyBub3Qg c3VibWl0IHRoZSBwYXRjaCB0byBFV1MgZm9yIGFuYWx5c2lzIChvbmx5IGFwcGxpZXMgd2hlbiB1 c2luZyAtLW5vLXJldmlldykuJykKKyAgICBmYXN0X2NxID0gbWFrZV9vcHRpb24oIi0tZmFzdC1j cSIsICItLWZhc3QtY29tbWl0LXF1ZXVlIiwgIi0tZmFzdGNxIiwgYWN0aW9uPSdzdG9yZV90cnVl JywgZGVzdD0nZmFzdF9jcScsIGRlZmF1bHQ9RmFsc2UsIGhlbHA9J0VuYWJsZSBmYXN0LWNvbW1p dC1xdWV1ZSBtb2RlIGZvciB0aGlzIHBhdGNoLCB0aGF0IHNraXBzIGJ1aWxkaW5nIGFuZCB0ZXN0 aW5nLicpCiAgICAgZm9yY2VfY2xlYW4gPSBtYWtlX29wdGlvbigiLS1mb3JjZS1jbGVhbiIsIGFj dGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9ImZvcmNlX2NsZWFuIiwgZGVmYXVsdD1GYWxzZSwgaGVs cD0iQ2xlYW4gd29ya2luZyBkaXJlY3RvcnkgYmVmb3JlIGFwcGx5aW5nIHBhdGNoZXMgKHJlbW92 ZXMgbG9jYWwgY2hhbmdlcyBhbmQgY29tbWl0cykiKQogICAgIGdpdF9jb21taXQgPSBtYWtlX29w dGlvbigiLWciLCAiLS1naXQtY29tbWl0IiwgYWN0aW9uPSJzdG9yZSIsIGRlc3Q9ImdpdF9jb21t aXQiLCBoZWxwPSJPcGVyYXRlIG9uIGEgbG9jYWwgY29tbWl0LiBJZiBhIHJhbmdlLCB0aGUgY29t bWl0cyBhcmUgc3F1YXNoZWQgaW50byBvbmUuIDxyZWY+Li4uLiBpbmNsdWRlcyB0aGUgd29ya2lu ZyBjb3B5IGNoYW5nZXMuIFVQU1RSRUFNIGNhbiBiZSB1c2VkIGZvciB0aGUgdXBzdHJlYW0vdHJh Y2tpbmcgYnJhbmNoLiIpCiAgICAgZ3JvdXAgPSBtYWtlX29wdGlvbigiLS1ncm91cCIsIGFjdGlv bj0ic3RvcmUiLCBkZXN0PSJncm91cCIsIGRlZmF1bHQ9Tm9uZSwgaGVscD0iIikKSW5kZXg6IFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9wb3N0ZGlmZi5weQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcG9zdGRpZmYucHkJKHJldmlzaW9u IDI3NTYwNikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9wb3N0ZGlmZi5w eQkod29ya2luZyBjb3B5KQpAQCAtMSw0ICsxLDUgQEAKICMgQ29weXJpZ2h0IChDKSAyMDEwIEdv b2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAoQykgMjAyMSBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRp b24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMg YXJlCkBAIC0yNiw2ICsyNyw3IEBACiAjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJ U0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogIyBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCitm cm9tIHdlYmtpdHB5LmNvbW1vbi5uZXQuYnVnemlsbGEgaW1wb3J0IEF0dGFjaG1lbnQKIGZyb20g d2Via2l0cHkudG9vbC5zdGVwcy5hYnN0cmFjdHN0ZXAgaW1wb3J0IEFic3RyYWN0U3RlcAogZnJv bSB3ZWJraXRweS50b29sLnN0ZXBzLm9wdGlvbnMgaW1wb3J0IE9wdGlvbnMKIApAQCAtNDAsNiAr NDIsNyBAQCBjbGFzcyBQb3N0RGlmZihBYnN0cmFjdFN0ZXApOgogICAgICAgICAgICAgT3B0aW9u cy5yZXF1ZXN0X2NvbW1pdCwKICAgICAgICAgICAgIE9wdGlvbnMub3Blbl9idWcsCiAgICAgICAg ICAgICBPcHRpb25zLmV3cywKKyAgICAgICAgICAgIE9wdGlvbnMuZmFzdF9jcSwKICAgICAgICAg XQogCiAgICAgZGVmIHJ1bihzZWxmLCBzdGF0ZSk6CkBAIC00Nyw2ICs1MCw4IEBAIGNsYXNzIFBv c3REaWZmKEFic3RyYWN0U3RlcCk6CiAgICAgICAgIGRlc2NyaXB0aW9uID0gc2VsZi5fb3B0aW9u cy5kZXNjcmlwdGlvbiBvciAiUGF0Y2giCiAgICAgICAgIGNvbW1lbnRfdGV4dCA9IHNlbGYuX29w dGlvbnMuY29tbWVudAogICAgICAgICBidWdfaWQgPSBzdGF0ZVsiYnVnX2lkIl0KKyAgICAgICAg aWYgc2VsZi5fb3B0aW9ucy5mYXN0X2NxOgorICAgICAgICAgICAgZGVzY3JpcHRpb24gPSAne317 fScuZm9ybWF0KEF0dGFjaG1lbnQuZmFzdF9jcV9wcmVhbWJsZSwgZGVzY3JpcHRpb24pCiAKICAg ICAgICAgYXR0YWNobWVudF9pZCA9IHNlbGYuX3Rvb2wuYnVncy5hZGRfcGF0Y2hfdG9fYnVnKGJ1 Z19pZCwgZGlmZiwgZGVzY3JpcHRpb24sIGNvbW1lbnRfdGV4dD1jb21tZW50X3RleHQsIG1hcmtf Zm9yX3Jldmlldz1zZWxmLl9vcHRpb25zLnJldmlldywgbWFya19mb3JfY29tbWl0X3F1ZXVlPXNl bGYuX29wdGlvbnMucmVxdWVzdF9jb21taXQpCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMub3Bl bl9idWc6Cg== 425411 2021-04-07 09:33:43 -0700 2021-04-08 13:02:59 -0700 [fast-cq] Patch bug-224286-20210407123342.patch text/plain 8353 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NTYwNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDIxLTA0LTA3ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBBZGQgd2Via2l0LXBhdGNoIHN1cHBvcnQgZm9yIGZhc3QtY3EgbW9kZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0Mjg2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3Rvb2wvc3RlcHMvb3B0aW9ucy5weToKKyAgICAgICAgKE9wdGlvbnMpOiBBZGRl ZCAtLWZhc3QtY3EgcGFyYW1ldGVyLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9z dGVwcy9wb3N0ZGlmZi5weToKKyAgICAgICAgKFBvc3REaWZmLm9wdGlvbnMpOgorICAgICAgICAo UG9zdERpZmYucnVuKTogU2V0IHRoZSBwYXRjaCBuYW1lIGFwcHJvcHJpYXRlbHkgZm9yIGZhc3Qt Y3EgbW9kZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEv YXR0YWNobWVudC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMv dXBsb2FkX3VuaXR0ZXN0LnB5OiBBZGRlZCB1bml0IHRlc3QuCisKIDIwMjEtMDQtMDcgIEpvbmF0 aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI3 NDM2Nik6IHdlYmtpdHNjbXB5LnRlc3Quc3ZuX3VuaXR0ZXN0LlRlc3RSZW1vdGVTdm4udGVzdF9p bmZvIGZhaWxzIGluIG5vbi1QRFQgdGltZXpvbmVzCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYXR0YWNobWVudC5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYXR0YWNobWVudC5weQkocmV2 aXNpb24gMjc1NjA2KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3pp bGxhL2F0dGFjaG1lbnQucHkJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAjIENvcHly aWdodCAoYykgMjAwOSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotIyBDb3B5cmln aHQgKGMpIDIwMDksIDIwMTggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5 cmlnaHQgKGMpIDIwMDktMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjIENv cHlyaWdodCAoYykgMjAxMCBSZXNlYXJjaCBJbiBNb3Rpb24gTGltaXRlZC4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC0zNiw2ICszNiw3IEBAIF9sb2cgPSBsb2dnaW5n LmdldExvZ2dlcihfX25hbWVfXykKIAogCiBjbGFzcyBBdHRhY2htZW50KG9iamVjdCk6CisgICAg ZmFzdF9jcV9wcmVhbWJsZSA9ICJbZmFzdC1jcV0gIgogICAgIHJldmVydF9wcmVhbWJsZSA9ICJS RVZFUlQgb2YgciIKICAgICByb2xsb3V0X3ByZWFtYmxlID0gIlJPTExPVVQgb2YgciIKIApJbmRl eDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3VwbG9hZF91bml0dGVzdC5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvdXBs b2FkX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNzU2MDYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvY29tbWFuZHMvdXBsb2FkX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC02 Nyw2ICs2Nyw3IEBAIEJ1ZyA1MDAwMiBoYXMgbm8gbm9uLW9ic29sZXRlIHBhdGNoZXMsIGkKICAg ICAgICAgb3B0aW9ucy5jaGVja19zdHlsZV9maWx0ZXIgPSBOb25lCiAgICAgICAgIG9wdGlvbnMu Y29tbWVudCA9IE5vbmUKICAgICAgICAgb3B0aW9ucy5kZXNjcmlwdGlvbiA9ICJNT0NLIGRlc2Ny aXB0aW9uIgorICAgICAgICBvcHRpb25zLmZhc3RfY3EgPSBGYWxzZQogICAgICAgICBvcHRpb25z Lm5vbl9pbnRlcmFjdGl2ZSA9IEZhbHNlCiAgICAgICAgIG9wdGlvbnMucmVxdWVzdF9jb21taXQg PSBGYWxzZQogICAgICAgICBvcHRpb25zLnJldmlldyA9IFRydWUKQEAgLTE0OSw2ICsxNTAsNyBA QCBNT0NLIGFkZF9wYXRjaF90b19idWc6IGJ1Z19pZD01MDAwMCwgZGVzCiAgICAgICAgIG9wdGlv bnMuY2hlY2tfc3R5bGVfZmlsdGVyID0gTm9uZQogICAgICAgICBvcHRpb25zLmNvbW1lbnQgPSBO b25lCiAgICAgICAgIG9wdGlvbnMuZGVzY3JpcHRpb24gPSAiTU9DSyBkZXNjcmlwdGlvbiIKKyAg ICAgICAgb3B0aW9ucy5mYXN0X2NxID0gRmFsc2UKICAgICAgICAgb3B0aW9ucy5ub25faW50ZXJh Y3RpdmUgPSBGYWxzZQogICAgICAgICBvcHRpb25zLnJlcXVlc3RfY29tbWl0ID0gRmFsc2UKICAg ICAgICAgb3B0aW9ucy5yZXZpZXcgPSBUcnVlCkBAIC0xNjQsNiArMTY2LDI5IEBAIE1PQ0s6IHVz ZXIub3Blbl91cmw6IGh0dHA6Ly9leGFtcGxlLmNvbS8KICIiIgogICAgICAgICBzZWxmLmFzc2Vy dF9leGVjdXRlX291dHB1dHMoVXBsb2FkKCksIFs1MDAwMF0sIG9wdGlvbnM9b3B0aW9ucywgZXhw ZWN0ZWRfbG9ncz1leHBlY3RlZF9sb2dzKQogCisgICAgZGVmIHRlc3RfdXBsb2FkX2Zhc3RfY3Eo c2VsZik6CisgICAgICAgIG9wdGlvbnMgPSBNb2NrT3B0aW9ucygpCisgICAgICAgIG9wdGlvbnMu Y2MgPSBOb25lCisgICAgICAgIG9wdGlvbnMuY2hlY2tfc3R5bGUgPSBUcnVlCisgICAgICAgIG9w dGlvbnMuY2hlY2tfc3R5bGVfZmlsdGVyID0gTm9uZQorICAgICAgICBvcHRpb25zLmNvbW1lbnQg PSBOb25lCisgICAgICAgIG9wdGlvbnMuZGVzY3JpcHRpb24gPSAiTU9DSyBkZXNjcmlwdGlvbiIK KyAgICAgICAgb3B0aW9ucy5mYXN0X2NxID0gVHJ1ZQorICAgICAgICBvcHRpb25zLm5vbl9pbnRl cmFjdGl2ZSA9IEZhbHNlCisgICAgICAgIG9wdGlvbnMucmVxdWVzdF9jb21taXQgPSBGYWxzZQor ICAgICAgICBvcHRpb25zLnJldmlldyA9IFRydWUKKyAgICAgICAgb3B0aW9ucy5zdWJtaXRfdG9f ZXdzID0gRmFsc2UKKyAgICAgICAgb3B0aW9ucy5zb3J0X3hjb2RlX3Byb2plY3QgPSBGYWxzZQor ICAgICAgICBvcHRpb25zLnN1Z2dlc3RfcmV2aWV3ZXJzID0gRmFsc2UKKyAgICAgICAgZXhwZWN0 ZWRfbG9ncyA9ICIiIk1PQ0s6IHVzZXIub3Blbl91cmw6IGZpbGU6Ly8uLi4KK1dhcyB0aGF0IGRp ZmYgY29ycmVjdD8KK09ic29sZXRpbmcgMiBvbGQgcGF0Y2hlcyBvbiBidWcgNTAwMDAKK01PQ0sg cmVhc3NpZ25fYnVnOiBidWdfaWQ9NTAwMDAsIGFzc2lnbmVlPU5vbmUKK01PQ0sgYWRkX3BhdGNo X3RvX2J1ZzogYnVnX2lkPTUwMDAwLCBkZXNjcmlwdGlvbj1bZmFzdC1jcV0gTU9DSyBkZXNjcmlw dGlvbiwgbWFya19mb3JfcmV2aWV3PVRydWUsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1GYWxzZSwg bWFya19mb3JfbGFuZGluZz1GYWxzZQorTU9DSzogdXNlci5vcGVuX3VybDogaHR0cDovL2V4YW1w bGUuY29tLzUwMDAwCisiIiIKKyAgICAgICAgc2VsZi5hc3NlcnRfZXhlY3V0ZV9vdXRwdXRzKFVw bG9hZCgpLCBbNTAwMDBdLCBvcHRpb25zPW9wdGlvbnMsIGV4cGVjdGVkX2xvZ3M9ZXhwZWN0ZWRf bG9ncykKKwogICAgIGRlZiB0ZXN0X3VwbG9hZF93aXRoX25vX3Jldmlld19hbmRfZXdzKHNlbGYp OgogICAgICAgICBvcHRpb25zID0gTW9ja09wdGlvbnMoKQogICAgICAgICBvcHRpb25zLmNjID0g Tm9uZQpAQCAtMTcxLDYgKzE5Niw3IEBAIE1PQ0s6IHVzZXIub3Blbl91cmw6IGh0dHA6Ly9leGFt cGxlLmNvbS8KICAgICAgICAgb3B0aW9ucy5jaGVja19zdHlsZV9maWx0ZXIgPSBOb25lCiAgICAg ICAgIG9wdGlvbnMuY29tbWVudCA9IE5vbmUKICAgICAgICAgb3B0aW9ucy5kZXNjcmlwdGlvbiA9 ICdNT0NLIGRlc2NyaXB0aW9uJworICAgICAgICBvcHRpb25zLmZhc3RfY3EgPSBGYWxzZQogICAg ICAgICBvcHRpb25zLm5vbl9pbnRlcmFjdGl2ZSA9IEZhbHNlCiAgICAgICAgIG9wdGlvbnMucmVx dWVzdF9jb21taXQgPSBGYWxzZQogICAgICAgICBvcHRpb25zLnJldmlldyA9IEZhbHNlCkluZGV4 OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvb3B0aW9ucy5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvb3B0aW9ucy5weQkocmV2aXNp b24gMjc1NjA2KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL29wdGlvbnMu cHkJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAjIENvcHlyaWdodCAoQykgMjAxMCBH b29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotIyBDb3B5cmlnaHQgKEMpIDIwMTcgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMTctMjAyMSBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmlj YXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlv bnMgYXJlCkBAIC00OCw2ICs0OCw3IEBAIGNsYXNzIE9wdGlvbnMob2JqZWN0KToKICAgICBkZXNj cmlwdGlvbiA9IG1ha2Vfb3B0aW9uKCItbSIsICItLWRlc2NyaXB0aW9uIiwgYWN0aW9uPSJzdG9y ZSIsIHR5cGU9InN0cmluZyIsIGRlc3Q9ImRlc2NyaXB0aW9uIiwgaGVscD0iRGVzY3JpcHRpb24g c3RyaW5nIGZvciB0aGUgYXR0YWNobWVudCIpCiAgICAgZW1haWwgPSBtYWtlX29wdGlvbigiLS1l bWFpbCIsIGFjdGlvbj0ic3RvcmUiLCB0eXBlPSJzdHJpbmciLCBkZXN0PSJlbWFpbCIsIGhlbHA9 IkVtYWlsIGFkZHJlc3MgdG8gdXNlIGluIENoYW5nZUxvZ3MuIikKICAgICBld3MgPSBtYWtlX29w dGlvbignLS1uby1ld3MnLCBhY3Rpb249J3N0b3JlX2ZhbHNlJywgZGVzdD0nZXdzJywgZGVmYXVs dD1UcnVlLCBoZWxwPSdEbyBub3Qgc3VibWl0IHRoZSBwYXRjaCB0byBFV1MgZm9yIGFuYWx5c2lz IChvbmx5IGFwcGxpZXMgd2hlbiB1c2luZyAtLW5vLXJldmlldykuJykKKyAgICBmYXN0X2NxID0g bWFrZV9vcHRpb24oIi0tZmFzdC1jcSIsICItLWZhc3QtY29tbWl0LXF1ZXVlIiwgIi0tZmFzdGNx IiwgYWN0aW9uPSdzdG9yZV90cnVlJywgZGVzdD0nZmFzdF9jcScsIGRlZmF1bHQ9RmFsc2UsIGhl bHA9J0VuYWJsZSBmYXN0LWNvbW1pdC1xdWV1ZSBtb2RlIGZvciB0aGlzIHBhdGNoLCB0aGF0IHNr aXBzIGJ1aWxkaW5nIGFuZCB0ZXN0aW5nLicpCiAgICAgZm9yY2VfY2xlYW4gPSBtYWtlX29wdGlv bigiLS1mb3JjZS1jbGVhbiIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9ImZvcmNlX2NsZWFu IiwgZGVmYXVsdD1GYWxzZSwgaGVscD0iQ2xlYW4gd29ya2luZyBkaXJlY3RvcnkgYmVmb3JlIGFw cGx5aW5nIHBhdGNoZXMgKHJlbW92ZXMgbG9jYWwgY2hhbmdlcyBhbmQgY29tbWl0cykiKQogICAg IGdpdF9jb21taXQgPSBtYWtlX29wdGlvbigiLWciLCAiLS1naXQtY29tbWl0IiwgYWN0aW9uPSJz dG9yZSIsIGRlc3Q9ImdpdF9jb21taXQiLCBoZWxwPSJPcGVyYXRlIG9uIGEgbG9jYWwgY29tbWl0 LiBJZiBhIHJhbmdlLCB0aGUgY29tbWl0cyBhcmUgc3F1YXNoZWQgaW50byBvbmUuIDxyZWY+Li4u LiBpbmNsdWRlcyB0aGUgd29ya2luZyBjb3B5IGNoYW5nZXMuIFVQU1RSRUFNIGNhbiBiZSB1c2Vk IGZvciB0aGUgdXBzdHJlYW0vdHJhY2tpbmcgYnJhbmNoLiIpCiAgICAgZ3JvdXAgPSBtYWtlX29w dGlvbigiLS1ncm91cCIsIGFjdGlvbj0ic3RvcmUiLCBkZXN0PSJncm91cCIsIGRlZmF1bHQ9Tm9u ZSwgaGVscD0iIikKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9wb3N0 ZGlmZi5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMv cG9zdGRpZmYucHkJKHJldmlzaW9uIDI3NTYwNikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9zdGVwcy9wb3N0ZGlmZi5weQkod29ya2luZyBjb3B5KQpAQCAtMSw0ICsxLDUgQEAKICMg Q29weXJpZ2h0IChDKSAyMDEwIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENv cHlyaWdodCAoQykgMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAogIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCkBAIC0yNiw2ICsyNyw3IEBACiAjIChJTkNMVURJTkcg TkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVT RQogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLgogCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5uZXQuYnVnemlsbGEgaW1w b3J0IEF0dGFjaG1lbnQKIGZyb20gd2Via2l0cHkudG9vbC5zdGVwcy5hYnN0cmFjdHN0ZXAgaW1w b3J0IEFic3RyYWN0U3RlcAogZnJvbSB3ZWJraXRweS50b29sLnN0ZXBzLm9wdGlvbnMgaW1wb3J0 IE9wdGlvbnMKIApAQCAtNDAsNiArNDIsNyBAQCBjbGFzcyBQb3N0RGlmZihBYnN0cmFjdFN0ZXAp OgogICAgICAgICAgICAgT3B0aW9ucy5yZXF1ZXN0X2NvbW1pdCwKICAgICAgICAgICAgIE9wdGlv bnMub3Blbl9idWcsCiAgICAgICAgICAgICBPcHRpb25zLmV3cywKKyAgICAgICAgICAgIE9wdGlv bnMuZmFzdF9jcSwKICAgICAgICAgXQogCiAgICAgZGVmIHJ1bihzZWxmLCBzdGF0ZSk6CkBAIC00 Nyw2ICs1MCw4IEBAIGNsYXNzIFBvc3REaWZmKEFic3RyYWN0U3RlcCk6CiAgICAgICAgIGRlc2Ny aXB0aW9uID0gc2VsZi5fb3B0aW9ucy5kZXNjcmlwdGlvbiBvciAiUGF0Y2giCiAgICAgICAgIGNv bW1lbnRfdGV4dCA9IHNlbGYuX29wdGlvbnMuY29tbWVudAogICAgICAgICBidWdfaWQgPSBzdGF0 ZVsiYnVnX2lkIl0KKyAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5mYXN0X2NxOgorICAgICAgICAg ICAgZGVzY3JpcHRpb24gPSAne317fScuZm9ybWF0KEF0dGFjaG1lbnQuZmFzdF9jcV9wcmVhbWJs ZSwgZGVzY3JpcHRpb24pCiAKICAgICAgICAgYXR0YWNobWVudF9pZCA9IHNlbGYuX3Rvb2wuYnVn cy5hZGRfcGF0Y2hfdG9fYnVnKGJ1Z19pZCwgZGlmZiwgZGVzY3JpcHRpb24sIGNvbW1lbnRfdGV4 dD1jb21tZW50X3RleHQsIG1hcmtfZm9yX3Jldmlldz1zZWxmLl9vcHRpb25zLnJldmlldywgbWFy a19mb3JfY29tbWl0X3F1ZXVlPXNlbGYuX29wdGlvbnMucmVxdWVzdF9jb21taXQpCiAgICAgICAg IGlmIHNlbGYuX29wdGlvbnMub3Blbl9idWc6CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3Rvb2wvc3RlcHMvc3RlcHNfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL3N0ZXBzL3N0ZXBzX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNzU2MDYp CisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvc3RlcHNfdW5pdHRlc3QucHkJ KHdvcmtpbmcgY29weSkKQEAgLTg0LDYgKzg0LDcgQEAgY2xhc3MgU3RlcHNUZXN0KHVuaXR0ZXN0 LlRlc3RDYXNlKToKICAgICAgICAgb3B0aW9ucyA9IHNlbGYuX3N0ZXBfb3B0aW9ucygpCiAgICAg ICAgIG9wdGlvbnMuZ2l0X2NvbW1pdCA9IE5vbmUKICAgICAgICAgb3B0aW9ucy5kZXNjcmlwdGlv biA9IE5vbmUKKyAgICAgICAgb3B0aW9ucy5mYXN0X2NxID0gRmFsc2UKICAgICAgICAgb3B0aW9u cy5jb21tZW50ID0gTm9uZQogICAgICAgICBvcHRpb25zLnJldmlldyA9IFRydWUKICAgICAgICAg b3B0aW9ucy5yZXF1ZXN0X2NvbW1pdCA9IEZhbHNlCg==