214147 2020-07-09 10:25:47 -0700 Add EWS queues for tvOS and watchOS builders 2020-07-13 18:00:02 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=213402 https://bugs.webkit.org/show_bug.cgi?id=214279 https://bugs.webkit.org/show_bug.cgi?id=214214 InRadar P2 Normal --- 1 aakash_jain aakash_jain ap dean_johnson jbedard jlewis3 ryanhaddad slewis thorton webkit-bug-importer oldest_to_newest 1670163 0 aakash_jain 2020-07-09 10:25:47 -0700 Add EWS queues for tvOS and watchOS. It would prevent people from accidentally breaking these configurations. 1670170 1 403886 aakash_jain 2020-07-09 10:36:44 -0700 Created attachment 403886 Patch 1670203 2 403886 ryanhaddad 2020-07-09 11:54:47 -0700 Comment on attachment 403886 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=403886&action=review > Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py:46 > + ALL_QUEUES = ['style', 'ios', 'ios-sim', 'mac', 'mac-debug', 'tv', 'tv-sim', 'watch', 'watch-sim', 'gtk', 'wpe', 'wincairo', 'win', I think we should use 'tvos' and 'watchos' instead of 'tv' and 'watch'. 1670216 3 aakash_jain 2020-07-09 12:19:18 -0700 (In reply to Ryan Haddad from comment #2) > > Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py:46 > > + ALL_QUEUES = ['style', 'ios', 'ios-sim', 'mac', 'mac-debug', 'tv', 'tv-sim', 'watch', 'watch-sim', 'gtk', 'wpe', 'wincairo', 'win', > > I think we should use 'tvos' and 'watchos' instead of 'tv' and 'watch'. These names appear in status-bubbles on Bugzilla, so I was trying to keep them small (similar to 'mac' instead of 'macos'). 1670219 4 ryanhaddad 2020-07-09 12:24:55 -0700 (In reply to Aakash Jain from comment #3) > (In reply to Ryan Haddad from comment #2) > > > Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py:46 > > > + ALL_QUEUES = ['style', 'ios', 'ios-sim', 'mac', 'mac-debug', 'tv', 'tv-sim', 'watch', 'watch-sim', 'gtk', 'wpe', 'wincairo', 'win', > > > > I think we should use 'tvos' and 'watchos' instead of 'tv' and 'watch'. > These names appear in status-bubbles on Bugzilla, so I was trying to keep > them small (similar to 'mac' instead of 'macos'). If keeping the bubbles small is a priority, that's fine. 1670251 5 403886 dean_johnson 2020-07-09 13:23:07 -0700 Comment on attachment 403886 Patch Unofficial r=me. Code looks good. 1670281 6 ews-feeder 2020-07-09 14:23:52 -0700 Committed r264196: <https://trac.webkit.org/changeset/264196> All reviewed patches have been landed. Closing bug and clearing flags on attachment 403886. 1670282 7 webkit-bug-importer 2020-07-09 14:24:16 -0700 <rdar://problem/65290635> 1671246 8 aakash_jain 2020-07-13 18:00:02 -0700 Minor follow-up fix: https://trac.webkit.org/changeset/264327/webkit 403886 2020-07-09 10:36:44 -0700 2020-07-09 14:23:52 -0700 Patch bug-214147-20200709133643.patch text/plain 12984 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NDE3OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDIwLTA3LTA5ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBBZGQgRVdTIHF1ZXVlcyBmb3IgdHZPUyBhbmQgd2F0Y2hPUyBidWlsZGVy cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0MTQ3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWls ZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy92aWV3cy9zdGF0dXNidWJibGUucHk6IEFkZGVkIHN0 YXR1cy1idWJibGVzIGZvciB0dm9zIGFuZCB3YXRjaG9zIHF1ZXVlcy4KKyAgICAgICAgKiBCdWls ZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvY29uZmlnLmpzb246IEFkZGVkIHdhdGNob3MgYW5kIHR2 b3MgYnVpbGRlcnMuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rv cmllcy5weToKKyAgICAgICAgKHdhdGNoT1NCdWlsZEZhY3RvcnkpOgorICAgICAgICAodHZPU0J1 aWxkRmFjdG9yeSk6CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rv cmllc191bml0dGVzdC5weTogQWRkZWQgdW5pdC10ZXN0cy4KKyAgICAgICAgKiBCdWlsZFNsYXZl U3VwcG9ydC9ld3MtYnVpbGQvbG9hZENvbmZpZy5weToKKyAgICAgICAgKiBCdWlsZFNsYXZlU3Vw cG9ydC9ld3MtYnVpbGQvc3RlcHMucHk6CisgICAgICAgIChhcHBlbmRDdXN0b21CdWlsZEZsYWdz KTogQWRkZWQgc3VwcG9ydCBmb3IgdHZvcyBhbmQgd2F0Y2hvcy4KKyAgICAgICAgKENvbXBpbGVX ZWJLaXQuc3RhcnQpOiBEaXR0by4KKyAgICAgICAgKFByaW50Q29uZmlndXJhdGlvbi5ydW4pOiBE aXR0by4KKwogMjAyMC0wNy0wOSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNv bT4KIAogICAgICAgICBbaU9TXSBPY2Nhc2lvbmFsIGNyYXNoIHVuZGVyIC1bVUlWaWV3IF9zZXRW aWV3RGVsZWdhdGU6XSB3aGVuIHByZXNlbnRpbmcgZGF0ZSBhbmQgdGltZSBwaWNrZXJzCkluZGV4 OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy92aWV3cy9zdGF0dXNidWJibGUu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFwcC9ld3Mvdmll d3Mvc3RhdHVzYnViYmxlLnB5CShyZXZpc2lvbiAyNjQxNzkpCisrKyBUb29scy9CdWlsZFNsYXZl U3VwcG9ydC9ld3MtYXBwL2V3cy92aWV3cy9zdGF0dXNidWJibGUucHkJKHdvcmtpbmcgY29weSkK QEAgLTQzLDcgKzQzLDcgQEAgY2xhc3MgU3RhdHVzQnViYmxlKFZpZXcpOgogICAgICMgVGhlc2Ug cXVldWUgbmFtZXMgYXJlIGZyb20gc2hvcnRuYW1lIGluIGh0dHBzOi8vdHJhYy53ZWJraXQub3Jn L2Jyb3dzZXIvd2Via2l0L3RydW5rL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9j b25maWcuanNvbgogICAgICMgRklYTUU6IEF1dG8tZ2VuZXJhdGUgdGhpcyBsaXN0IGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU2NDAKICAgICAjIE5vdGU6IFRoaXMg bGlzdCBpcyBzb3J0ZWQgaW4gdGhlIG9yZGVyIG9mIHdoaWNoIGJ1YmJsZXMgYXBwZWFyIGluIGJ1 Z3ppbGxhLgotICAgIEFMTF9RVUVVRVMgPSBbJ3N0eWxlJywgJ2lvcycsICdpb3Mtc2ltJywgJ21h YycsICdtYWMtZGVidWcnLCAnZ3RrJywgJ3dwZScsICd3aW5jYWlybycsICd3aW4nLAorICAgIEFM TF9RVUVVRVMgPSBbJ3N0eWxlJywgJ2lvcycsICdpb3Mtc2ltJywgJ21hYycsICdtYWMtZGVidWcn LCAndHYnLCAndHYtc2ltJywgJ3dhdGNoJywgJ3dhdGNoLXNpbScsICdndGsnLCAnd3BlJywgJ3dp bmNhaXJvJywgJ3dpbicsCiAgICAgICAgICAgICAgICAgICAnaW9zLXdrMicsICdtYWMtd2sxJywg J21hYy13azInLCAnbWFjLWRlYnVnLXdrMScsICdhcGktaW9zJywgJ2FwaS1tYWMnLCAnYXBpLWd0 aycsCiAgICAgICAgICAgICAgICAgICAnYmluZGluZ3MnLCAnanNjJywgJ2pzYy1hcm12NycsICdq c2MtbWlwcycsICdqc2MtaTM4NicsICd3ZWJraXRwZXJsJywgJ3dlYmtpdHB5JywgJ3NlcnZpY2Vz J10KICAgICAjIEZJWE1FOiBBdXRvLWdlbmVyYXRlIHRoZSBxdWV1ZSdzIHRyaWdnZXIgcmVsYXRp b25zaGlwCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvY29uZmlnLmpz b24KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2NvbmZp Zy5qc29uCShyZXZpc2lvbiAyNjQxNzkpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3Mt YnVpbGQvY29uZmlnLmpzb24JKHdvcmtpbmcgY29weSkKQEAgLTQzNiw2ICs0MzYsNDYgQEAKICAg ICAgICJ3b3JrZXJuYW1lcyI6IFsiZXdzMTEyIiwgImV3czExMyIsICJld3MxMTUiLCAiZXdzMTE3 Il0KICAgICB9LAogICAgIHsKKyAgICAgICJuYW1lIjogIndhdGNoT1MtNi1CdWlsZC1FV1MiLAor ICAgICAgInNob3J0bmFtZSI6ICJ3YXRjaCIsCisgICAgICAiaWNvbiI6ICJidWlsZE9ubHkiLAor ICAgICAgImZhY3RvcnkiOiAid2F0Y2hPU0J1aWxkRmFjdG9yeSIsCisgICAgICAicGxhdGZvcm0i OiAid2F0Y2hvcy02IiwKKyAgICAgICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLAorICAgICAg ImFyY2hpdGVjdHVyZXMiOiBbImFybTY0XzMyIl0sCisgICAgICAid29ya2VybmFtZXMiOiBbImV3 czE2MyIsICJld3MxNjQiLCAiZXdzMTY1Il0KKyAgICB9LAorICAgIHsKKyAgICAgICJuYW1lIjog IndhdGNoT1MtNi1TaW11bGF0b3ItQnVpbGQtRVdTIiwKKyAgICAgICJzaG9ydG5hbWUiOiAid2F0 Y2gtc2ltIiwKKyAgICAgICJpY29uIjogImJ1aWxkT25seSIsCisgICAgICAiZmFjdG9yeSI6ICJ3 YXRjaE9TQnVpbGRGYWN0b3J5IiwKKyAgICAgICJwbGF0Zm9ybSI6ICJ3YXRjaG9zLXNpbXVsYXRv ci02IiwKKyAgICAgICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLAorICAgICAgImFyY2hpdGVj dHVyZXMiOiBbImkzODYiXSwKKyAgICAgICJ3b3JrZXJuYW1lcyI6IFsiZXdzMTY0IiwgImV3czE2 NSIsICJld3MxNjYiXQorICAgIH0sCisgICAgIHsKKyAgICAgICJuYW1lIjogInR2T1MtMTMtQnVp bGQtRVdTIiwKKyAgICAgICJzaG9ydG5hbWUiOiAidHYiLAorICAgICAgImljb24iOiAiYnVpbGRP bmx5IiwKKyAgICAgICJmYWN0b3J5IjogInR2T1NCdWlsZEZhY3RvcnkiLAorICAgICAgInBsYXRm b3JtIjogInR2b3MtMTMiLAorICAgICAgImNvbmZpZ3VyYXRpb24iOiAicmVsZWFzZSIsCisgICAg ICAiYXJjaGl0ZWN0dXJlcyI6IFsiYXJtNjQiXSwKKyAgICAgICJ3b3JrZXJuYW1lcyI6IFsiZXdz MTY3IiwgImV3czE2OCIsICJld3MxNjkiXQorICAgIH0sCisgICAgeworICAgICAgIm5hbWUiOiAi dHZPUy0xMy1TaW11bGF0b3ItQnVpbGQtRVdTIiwKKyAgICAgICJzaG9ydG5hbWUiOiAidHYtc2lt IiwKKyAgICAgICJpY29uIjogImJ1aWxkT25seSIsCisgICAgICAiZmFjdG9yeSI6ICJ0dk9TQnVp bGRGYWN0b3J5IiwKKyAgICAgICJwbGF0Zm9ybSI6ICJ0dm9zLXNpbXVsYXRvci0xMyIsCisgICAg ICAiY29uZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwKKyAgICAgICJhcmNoaXRlY3R1cmVzIjogWyJ4 ODZfNjQiXSwKKyAgICAgICJ3b3JrZXJuYW1lcyI6IFsiZXdzMTY4IiwgImV3czE2OSIsICJld3Mx NzAiXQorICAgIH0sCisgICAgewogICAgICAgIm5hbWUiOiAiV2luZG93cy1FV1MiLAogICAgICAg InNob3J0bmFtZSI6ICJ3aW4iLAogICAgICAgImljb24iOiAiYnVpbGRBbmRUZXN0IiwKQEAgLTYw Niw3ICs2NDYsOSBAQAogICAgICAgImJ1aWxkZXJOYW1lcyI6IFsiQXBwbHktV2F0Y2hMaXN0LUVX UyIsICJCaW5kaW5ncy1UZXN0cy1FV1MiLCAiR1RLLUJ1aWxkLUVXUyIsICJpT1MtMTMtQnVpbGQt RVdTIiwgImlPUy0xMy1TaW11bGF0b3ItQnVpbGQtRVdTIiwKICAgICAgICAgICAgICAgICAgICAg ICAgIkpTQy1BUk12Ny0zMmJpdHMtQnVpbGQtRVdTIiwgIkpTQy1BUk12Ny0zMmJpdHMtRVdTIiwg IkpTQy1pMzg2LTMyYml0cy1FV1MiLCAiSlNDLU1JUFNFTC0zMmJpdHMtQnVpbGQtRVdTIiwKICAg ICAgICAgICAgICAgICAgICAgICAgIkpTQy1NSVBTRUwtMzJiaXRzLUVXUyIsICJKU0MtVGVzdHMt RVdTIiwgIm1hY09TLU1vamF2ZS1EZWJ1Zy1CdWlsZC1FV1MiLCAibWFjT1MtTW9qYXZlLVJlbGVh c2UtQnVpbGQtRVdTIiwKLSAgICAgICAgICAgICAgICAgICAgICAgIlNlcnZpY2VzLUVXUyIsICJT dHlsZS1FV1MiLCAiV1BFLUVXUyIsICJXZWJLaXRQZXJsLVRlc3RzLUVXUyIsICJXZWJLaXRQeS1U ZXN0cy1FV1MiLCAiV2luQ2Fpcm8tRVdTIiwgIldpbmRvd3MtRVdTIl0KKyAgICAgICAgICAgICAg ICAgICAgICAgIlNlcnZpY2VzLUVXUyIsICJTdHlsZS1FV1MiLAorICAgICAgICAgICAgICAgICAg ICAgICAidHZPUy0xMy1CdWlsZC1FV1MiLCAidHZPUy0xMy1TaW11bGF0b3ItQnVpbGQtRVdTIiwg IndhdGNoT1MtNi1CdWlsZC1FV1MiLCAid2F0Y2hPUy02LVNpbXVsYXRvci1CdWlsZC1FV1MiLAor ICAgICAgICAgICAgICAgICAgICAgICAiV1BFLUVXUyIsICJXZWJLaXRQZXJsLVRlc3RzLUVXUyIs ICJXZWJLaXRQeS1UZXN0cy1FV1MiLCAiV2luQ2Fpcm8tRVdTIiwgIldpbmRvd3MtRVdTIl0KICAg ICB9LAogICAgIHsKICAgICAgICJ0eXBlIjogIlRyeV9Vc2VycGFzcyIsCkluZGV4OiBUb29scy9C dWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkJKHJldmlzaW9uIDI2 NDE3OSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkJ KHdvcmtpbmcgY29weSkKQEAgLTE2Myw2ICsxNjMsMTQgQEAgY2xhc3MgbWFjT1NCdWlsZEZhY3Rv cnkoQnVpbGRGYWN0b3J5KToKICAgICBwYXNzCiAKIAorY2xhc3Mgd2F0Y2hPU0J1aWxkRmFjdG9y eShCdWlsZEZhY3RvcnkpOgorICAgIHBhc3MKKworCitjbGFzcyB0dk9TQnVpbGRGYWN0b3J5KEJ1 aWxkRmFjdG9yeSk6CisgICAgcGFzcworCisKIGNsYXNzIG1hY09TV0sxRmFjdG9yeShUZXN0RmFj dG9yeSk6CiAgICAgTGF5b3V0VGVzdENsYXNzID0gUnVuV2ViS2l0MVRlc3RzCiAgICAgd2lsbFRy aWdnZXJDcmFzaExvZ1N1Ym1pc3Npb24gPSBUcnVlCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3Vw cG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXNfdW5pdHRlc3QucHkJKHJldmlz aW9uIDI2NDE3OSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3Jp ZXNfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTE1Nyw2ICsxNTcsNTggQEAgY2xhc3Mg VGVzdFRlc3RzRmFjdG9yeShUZXN0Q2FzZSk6CiAKIAogY2xhc3MgVGVzdEJ1aWxkRmFjdG9yeShU ZXN0Q2FzZSk6CisgICAgZGVmIHRlc3RfbWFjb3NfYnVpbGRfZmFjdG9yeShzZWxmKToKKyAgICAg ICAgZmFjdG9yeSA9IGZhY3Rvcmllcy5tYWNPU0J1aWxkRmFjdG9yeShwbGF0Zm9ybT0nbWFjLW1v amF2ZScsIGNvbmZpZ3VyYXRpb249J3JlbGVhc2UnLCBhcmNoaXRlY3R1cmVzPVsieDg2XzY0Il0p CisgICAgICAgIHNlbGYuYXNzZXJ0QnVpbGRTdGVwcyhmYWN0b3J5LnN0ZXBzLCBbCisgICAgICAg ICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVwcy5Db25maWd1cmVCdWlsZCwgcGxhdGZvcm09J21h Yy1tb2phdmUnLCBjb25maWd1cmF0aW9uPSdyZWxlYXNlJywgYXJjaGl0ZWN0dXJlcz1bIng4Nl82 NCJdLCBidWlsZE9ubHk9RmFsc2UsIHRyaWdnZXJzPU5vbmUsIHJlbW90ZXM9Tm9uZSwgYWRkaXRp b25hbEFyZ3VtZW50cz1Ob25lKSwKKyAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBz LlZhbGlkYXRlUGF0Y2gpLAorICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuUHJp bnRDb25maWd1cmF0aW9uKSwKKyAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLkNo ZWNrT3V0U291cmNlKSwKKyAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLkNoZWNr T3V0U3BlY2lmaWNSZXZpc2lvbiksCisgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVw cy5BcHBseVBhdGNoKSwKKyAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLktpbGxP bGRQcm9jZXNzZXMpLAorICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuQ29tcGls ZVdlYktpdCksCisgICAgICAgIF0pCisKKyAgICBkZWYgdGVzdF9pb3NfYnVpbGRfZmFjdG9yeShz ZWxmKToKKyAgICAgICAgZmFjdG9yeSA9IGZhY3Rvcmllcy5pT1NCdWlsZEZhY3RvcnkocGxhdGZv cm09J2lvcy0xMycsIGNvbmZpZ3VyYXRpb249J3JlbGVhc2UnLCBhcmNoaXRlY3R1cmVzPVsiYXJt NjQiXSkKKyAgICAgICAgc2VsZi5hc3NlcnRCdWlsZFN0ZXBzKGZhY3Rvcnkuc3RlcHMsIFsKKyAg ICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLkNvbmZpZ3VyZUJ1aWxkLCBwbGF0Zm9y bT0naW9zLTEzJywgY29uZmlndXJhdGlvbj0ncmVsZWFzZScsIGFyY2hpdGVjdHVyZXM9WyJhcm02 NCJdLCBidWlsZE9ubHk9RmFsc2UsIHRyaWdnZXJzPU5vbmUsIHJlbW90ZXM9Tm9uZSwgYWRkaXRp b25hbEFyZ3VtZW50cz1Ob25lKSwKKyAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBz LlZhbGlkYXRlUGF0Y2gpLAorICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuUHJp bnRDb25maWd1cmF0aW9uKSwKKyAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLkNo ZWNrT3V0U291cmNlKSwKKyAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLkNoZWNr T3V0U3BlY2lmaWNSZXZpc2lvbiksCisgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVw cy5BcHBseVBhdGNoKSwKKyAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLktpbGxP bGRQcm9jZXNzZXMpLAorICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuQ29tcGls ZVdlYktpdCksCisgICAgICAgIF0pCisKKyAgICBkZWYgdGVzdF93YXRjaG9zX2J1aWxkX2ZhY3Rv cnkoc2VsZik6CisgICAgICAgIGZhY3RvcnkgPSBmYWN0b3JpZXMuaU9TQnVpbGRGYWN0b3J5KHBs YXRmb3JtPSd3YXRjaG9zLTYnLCBjb25maWd1cmF0aW9uPSdyZWxlYXNlJywgYXJjaGl0ZWN0dXJl cz1bImFybTY0XzMyIl0pCisgICAgICAgIHNlbGYuYXNzZXJ0QnVpbGRTdGVwcyhmYWN0b3J5LnN0 ZXBzLCBbCisgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVwcy5Db25maWd1cmVCdWls ZCwgcGxhdGZvcm09J3dhdGNob3MtNicsIGNvbmZpZ3VyYXRpb249J3JlbGVhc2UnLCBhcmNoaXRl Y3R1cmVzPVsiYXJtNjRfMzIiXSwgYnVpbGRPbmx5PUZhbHNlLCB0cmlnZ2Vycz1Ob25lLCByZW1v dGVzPU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSksCisgICAgICAgICAgICBfQnVpbGRT dGVwRmFjdG9yeShzdGVwcy5WYWxpZGF0ZVBhdGNoKSwKKyAgICAgICAgICAgIF9CdWlsZFN0ZXBG YWN0b3J5KHN0ZXBzLlByaW50Q29uZmlndXJhdGlvbiksCisgICAgICAgICAgICBfQnVpbGRTdGVw RmFjdG9yeShzdGVwcy5DaGVja091dFNvdXJjZSksCisgICAgICAgICAgICBfQnVpbGRTdGVwRmFj dG9yeShzdGVwcy5DaGVja091dFNwZWNpZmljUmV2aXNpb24pLAorICAgICAgICAgICAgX0J1aWxk U3RlcEZhY3Rvcnkoc3RlcHMuQXBwbHlQYXRjaCksCisgICAgICAgICAgICBfQnVpbGRTdGVwRmFj dG9yeShzdGVwcy5LaWxsT2xkUHJvY2Vzc2VzKSwKKyAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0 b3J5KHN0ZXBzLkNvbXBpbGVXZWJLaXQpLAorICAgICAgICBdKQorCisgICAgZGVmIHRlc3RfdHZv c19idWlsZF9mYWN0b3J5KHNlbGYpOgorICAgICAgICBmYWN0b3J5ID0gZmFjdG9yaWVzLmlPU0J1 aWxkRmFjdG9yeShwbGF0Zm9ybT0ndHZvcy0xMycsIGNvbmZpZ3VyYXRpb249J3JlbGVhc2UnLCBh cmNoaXRlY3R1cmVzPVsiYXJtNjQiXSkKKyAgICAgICAgc2VsZi5hc3NlcnRCdWlsZFN0ZXBzKGZh Y3Rvcnkuc3RlcHMsIFsKKyAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLkNvbmZp Z3VyZUJ1aWxkLCBwbGF0Zm9ybT0ndHZvcy0xMycsIGNvbmZpZ3VyYXRpb249J3JlbGVhc2UnLCBh cmNoaXRlY3R1cmVzPVsiYXJtNjQiXSwgYnVpbGRPbmx5PUZhbHNlLCB0cmlnZ2Vycz1Ob25lLCBy ZW1vdGVzPU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSksCisgICAgICAgICAgICBfQnVp bGRTdGVwRmFjdG9yeShzdGVwcy5WYWxpZGF0ZVBhdGNoKSwKKyAgICAgICAgICAgIF9CdWlsZFN0 ZXBGYWN0b3J5KHN0ZXBzLlByaW50Q29uZmlndXJhdGlvbiksCisgICAgICAgICAgICBfQnVpbGRT dGVwRmFjdG9yeShzdGVwcy5DaGVja091dFNvdXJjZSksCisgICAgICAgICAgICBfQnVpbGRTdGVw RmFjdG9yeShzdGVwcy5DaGVja091dFNwZWNpZmljUmV2aXNpb24pLAorICAgICAgICAgICAgX0J1 aWxkU3RlcEZhY3Rvcnkoc3RlcHMuQXBwbHlQYXRjaCksCisgICAgICAgICAgICBfQnVpbGRTdGVw RmFjdG9yeShzdGVwcy5LaWxsT2xkUHJvY2Vzc2VzKSwKKyAgICAgICAgICAgIF9CdWlsZFN0ZXBG YWN0b3J5KHN0ZXBzLkNvbXBpbGVXZWJLaXQpLAorICAgICAgICBdKQorCiAgICAgZGVmIHRlc3Rf anNjX21pcHNlbF9mYWN0b3J5KHNlbGYpOgogICAgICAgICBmYWN0b3J5ID0gZmFjdG9yaWVzLkpT Q0J1aWxkRmFjdG9yeShwbGF0Zm9ybT0nanNjJywgY29uZmlndXJhdGlvbj0ncmVsZWFzZScsIGFy Y2hpdGVjdHVyZXM9WyJtaXBzZWwiXSkKICAgICAgICAgc2VsZi5hc3NlcnRCdWlsZFN0ZXBzKGZh Y3Rvcnkuc3RlcHMsIFsKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9s b2FkQ29uZmlnLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1i dWlsZC9sb2FkQ29uZmlnLnB5CShyZXZpc2lvbiAyNjQxNzkpCisrKyBUb29scy9CdWlsZFNsYXZl U3VwcG9ydC9ld3MtYnVpbGQvbG9hZENvbmZpZy5weQkod29ya2luZyBjb3B5KQpAQCAtMzEsOSAr MzEsOSBAQCBmcm9tIGJ1aWxkYm90LndvcmtlciBpbXBvcnQgV29ya2VyCiBmcm9tIGJ1aWxkYm90 LnV0aWwgaW1wb3J0IGlkZW50aWZpZXJzIGFzIGJ1aWxkYm90X2lkZW50aWZpZXJzCiAKIGZyb20g ZmFjdG9yaWVzIGltcG9ydCAoQVBJVGVzdHNGYWN0b3J5LCBCaW5kaW5nc0ZhY3RvcnksIEJ1aWxk RmFjdG9yeSwgQ29tbWl0UXVldWVGYWN0b3J5LCBGYWN0b3J5LCBHVEtCdWlsZEZhY3RvcnksCi0g ICAgICAgICAgICAgICAgICAgICAgIEdUS1Rlc3RzRmFjdG9yeSwgSlNDQnVpbGRGYWN0b3J5LCBK U0NCdWlsZEFuZFRlc3RzRmFjdG9yeSwgU3R5bGVGYWN0b3J5LCBUZXN0RmFjdG9yeSwgV1BFRmFj dG9yeSwgV2ViS2l0UGVybEZhY3RvcnksCi0gICAgICAgICAgICAgICAgICAgICAgIFdlYktpdFB5 RmFjdG9yeSwgV2luQ2Fpcm9GYWN0b3J5LCBXaW5kb3dzRmFjdG9yeSwgaU9TQnVpbGRGYWN0b3J5 LCBpT1NUZXN0c0ZhY3RvcnksCi0gICAgICAgICAgICAgICAgICAgICAgIG1hY09TQnVpbGRGYWN0 b3J5LCBtYWNPU1dLMUZhY3RvcnksIG1hY09TV0syRmFjdG9yeSwgU2VydmljZXNGYWN0b3J5LCBX YXRjaExpc3RGYWN0b3J5KQorICAgICAgICAgICAgICAgICAgICAgICBHVEtUZXN0c0ZhY3Rvcnks IEpTQ0J1aWxkRmFjdG9yeSwgSlNDQnVpbGRBbmRUZXN0c0ZhY3RvcnksIFN0eWxlRmFjdG9yeSwg VGVzdEZhY3RvcnksIHR2T1NCdWlsZEZhY3RvcnksCisgICAgICAgICAgICAgICAgICAgICAgIFdQ RUZhY3RvcnksIFdlYktpdFBlcmxGYWN0b3J5LCBXZWJLaXRQeUZhY3RvcnksIFdpbkNhaXJvRmFj dG9yeSwgV2luZG93c0ZhY3RvcnksIGlPU0J1aWxkRmFjdG9yeSwgaU9TVGVzdHNGYWN0b3J5LAor ICAgICAgICAgICAgICAgICAgICAgICBtYWNPU0J1aWxkRmFjdG9yeSwgbWFjT1NXSzFGYWN0b3J5 LCBtYWNPU1dLMkZhY3RvcnksIFNlcnZpY2VzRmFjdG9yeSwgV2F0Y2hMaXN0RmFjdG9yeSwgd2F0 Y2hPU0J1aWxkRmFjdG9yeSkKIAogQlVJTERFUl9OQU1FX0xFTkdUSF9MSU1JVCA9IDcwCiBTVEVQ X05BTUVfTEVOR1RIX0xJTUlUID0gNTAKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3 cy1idWlsZC9zdGVwcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9l d3MtYnVpbGQvc3RlcHMucHkJKHJldmlzaW9uIDI2NDE3OSkKKysrIFRvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAtMTIzMSwxMiArMTIz MSwxMiBAQCBjbGFzcyBJbnN0YWxsV3BlRGVwZW5kZW5jaWVzKHNoZWxsLlNoZWxsCiAKIGRlZiBh cHBlbmRDdXN0b21CdWlsZEZsYWdzKHN0ZXAsIHBsYXRmb3JtLCBmdWxsUGxhdGZvcm0pOgogICAg ICMgRklYTUU6IE1ha2UgYSBjb21tb24gJ3N1cHBvcnRlZCBwbGF0Zm9ybXMnIGxpc3QuCi0gICAg aWYgcGxhdGZvcm0gbm90IGluICgnZ3RrJywgJ3dpbmNhaXJvJywgJ2lvcycsICdqc2Mtb25seScs ICd3cGUnKToKKyAgICBpZiBwbGF0Zm9ybSBub3QgaW4gKCdndGsnLCAnd2luY2Fpcm8nLCAnaW9z JywgJ2pzYy1vbmx5JywgJ3dwZScsICdwbGF5c3RhdGlvbicsICd0dm9zJywgJ3dhdGNob3MnKToK ICAgICAgICAgcmV0dXJuCi0gICAgaWYgZnVsbFBsYXRmb3JtLnN0YXJ0c3dpdGgoJ2lvcy1zaW11 bGF0b3InKToKLSAgICAgICAgcGxhdGZvcm0gPSAnaW9zLXNpbXVsYXRvcicKLSAgICBlbGlmIHBs YXRmb3JtID09ICdpb3MnOgotICAgICAgICBwbGF0Zm9ybSA9ICdkZXZpY2UnCisgICAgaWYgJ3Np bXVsYXRvcicgaW4gZnVsbFBsYXRmb3JtOgorICAgICAgICBwbGF0Zm9ybSA9IHBsYXRmb3JtICsg Jy1zaW11bGF0b3InCisgICAgZWxpZiBwbGF0Zm9ybSBpbiBbJ2lvcycsICd0dm9zJywgJ3dhdGNo b3MnXToKKyAgICAgICAgcGxhdGZvcm0gPSBwbGF0Zm9ybSArICctZGV2aWNlJwogICAgIHN0ZXAu c2V0Q29tbWFuZChzdGVwLmNvbW1hbmQgKyBbJy0tJyArIHBsYXRmb3JtXSkKIAogCkBAIC0xMjg2 LDExICsxMjg2LDExIEBAIGNsYXNzIENvbXBpbGVXZWJLaXQoc2hlbGwuQ29tcGlsZSk6CiAKICAg ICAgICAgaWYgYWRkaXRpb25hbEFyZ3VtZW50czoKICAgICAgICAgICAgIHNlbGYuc2V0Q29tbWFu ZChzZWxmLmNvbW1hbmQgKyBhZGRpdGlvbmFsQXJndW1lbnRzKQotICAgICAgICBpZiBwbGF0Zm9y bSBpbiAoJ21hYycsICdpb3MnKSBhbmQgYXJjaGl0ZWN0dXJlOgorICAgICAgICBpZiBwbGF0Zm9y bSBpbiAoJ21hYycsICdpb3MnLCAndHZvcycsICd3YXRjaG9zJykgYW5kIGFyY2hpdGVjdHVyZToK ICAgICAgICAgICAgIHNlbGYuc2V0Q29tbWFuZChzZWxmLmNvbW1hbmQgKyBbJ0FSQ0hTPScgKyBh cmNoaXRlY3R1cmVdKQogICAgICAgICAgICAgaWYgcGxhdGZvcm0gPT0gJ2lvcyc6CiAgICAgICAg ICAgICAgICAgc2VsZi5zZXRDb21tYW5kKHNlbGYuY29tbWFuZCArIFsnT05MWV9BQ1RJVkVfQVJD SD1OTyddKQotICAgICAgICBpZiBwbGF0Zm9ybSBpbiAoJ21hYycsICdpb3MnKSBhbmQgYnVpbGRP bmx5OgorICAgICAgICBpZiBwbGF0Zm9ybSBpbiAoJ21hYycsICdpb3MnLCAndHZvcycsICd3YXRj aG9zJykgYW5kIGJ1aWxkT25seToKICAgICAgICAgICAgICMgRm9yIGJ1aWxkLW9ubHkgYm90cywg dGhlIGV4cGVjdGF0aW9uIGlzIHRoYXQgdGVzdHMgd2lsbCBiZSBydW4gb24gc2VwYXJhdGUgbWFj aGluZXMsCiAgICAgICAgICAgICAjIHNvIHdlIG5lZWQgdG8gcGFja2FnZSBkZWJ1ZyBpbmZvIGFz IGRTWU1zLiBPbmx5IGdlbmVyYXRpbmcgbGluZSB0YWJsZXMgbWFrZXMKICAgICAgICAgICAgICMg dGhpcyBtdWNoIGZhc3RlciB0aGFuIGZ1bGwgZGVidWcgaW5mbywgYW5kIGNyYXNoIGxvZ3Mgc3Rp bGwgaGF2ZSBsaW5lIG51bWJlcnMuCkBAIC0yNDY0LDcgKzI0NjQsNyBAQCBjbGFzcyBQcmludENv bmZpZ3VyYXRpb24oc3RlcHMuU2hlbGxTZXF1CiAgICAgICAgIHBsYXRmb3JtID0gc2VsZi5nZXRQ cm9wZXJ0eSgncGxhdGZvcm0nLCAnKicpCiAgICAgICAgIGlmIHBsYXRmb3JtICE9ICdqc2Mtb25s eSc6CiAgICAgICAgICAgICBwbGF0Zm9ybSA9IHBsYXRmb3JtLnNwbGl0KCctJylbMF0KLSAgICAg ICAgaWYgcGxhdGZvcm0gaW4gKCdtYWMnLCAnaW9zJywgJyonKToKKyAgICAgICAgaWYgcGxhdGZv cm0gaW4gKCdtYWMnLCAnaW9zJywgJ3R2b3MnLCAnd2F0Y2hvcycsICcqJyk6CiAgICAgICAgICAg ICBjb21tYW5kX2xpc3QuZXh0ZW5kKHNlbGYuY29tbWFuZF9saXN0X2FwcGxlKQogICAgICAgICBl bGlmIHBsYXRmb3JtIGluICgnZ3RrJywgJ3dwZScsICdqc2Mtb25seScpOgogICAgICAgICAgICAg Y29tbWFuZF9saXN0LmV4dGVuZChzZWxmLmNvbW1hbmRfbGlzdF9saW51eCkK