176761 2017-09-11 18:27:11 -0700 The EWS build system is forcing a non UTF-8 locale and breaks meson. 2017-09-27 12:31:08 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=71983 https://bugs.webkit.org/show_bug.cgi?id=127922 InRadar P2 Normal --- 1 clopez clopez aakash_jain aperez ap bugs-noreply buildbot cdumez commit-queue ddkilzer dean_johnson glenn jbedard jbicha lforschler mcatanzaro simon.fraser webkit-bug-importer youennf oldest_to_newest 1347765 0 clopez 2017-09-11 18:27:11 -0700 The WPE EWS has been failing lately a lot when trying to build the JHBuild, always with this error: Traceback (most recent call last): File "/home/ews/igalia-wpe-ews/WebKit/WebKitBuild/DependenciesWPE/Root/lib/python3.5/site-packages/mesonbuild/mesonmain.py", line 338, in run app.generate() File "/home/ews/igalia-wpe-ews/WebKit/WebKitBuild/DependenciesWPE/Root/lib/python3.5/site-packages/mesonbuild/mesonmain.py", line 181, in generate intr.run() File "/home/ews/igalia-wpe-ews/WebKit/WebKitBuild/DependenciesWPE/Root/lib/python3.5/site-packages/mesonbuild/interpreter.py", line 2728, in run super().run() File "/home/ews/igalia-wpe-ews/WebKit/WebKitBuild/DependenciesWPE/Root/lib/python3.5/site-packages/mesonbuild/interpreterbase.py", line 148, in run self.evaluate_codeblock(self.ast, start=1) File "/home/ews/igalia-wpe-ews/WebKit/WebKitBuild/DependenciesWPE/Root/lib/python3.5/site-packages/mesonbuild/interpreterbase.py", line 170, in evaluate_codeblock raise e File "/home/ews/igalia-wpe-ews/WebKit/WebKitBuild/DependenciesWPE/Root/lib/python3.5/site-packages/mesonbuild/interpreterbase.py", line 164, in evaluate_codeblock self.evaluate_statement(cur) File "/home/ews/igalia-wpe-ews/WebKit/WebKitBuild/DependenciesWPE/Root/lib/python3.5/site-packages/mesonbuild/interpreterbase.py", line 175, in evaluate_statement return self.function_call(cur) File "/home/ews/igalia-wpe-ews/WebKit/WebKitBuild/DependenciesWPE/Root/lib/python3.5/site-packages/mesonbuild/interpreterbase.py", line 385, in function_call return self.funcs[func_name](node, self.flatten(posargs), kwargs) File "/home/ews/igalia-wpe-ews/WebKit/WebKitBuild/DependenciesWPE/Root/lib/python3.5/site-packages/mesonbuild/interpreterbase.py", line 47, in wrapped return f(self, node, args, kwargs) File "/home/ews/igalia-wpe-ews/WebKit/WebKitBuild/DependenciesWPE/Root/lib/python3.5/site-packages/mesonbuild/interpreter.py", line 2401, in func_subdir self.evaluate_codeblock(codeblock) File "/home/ews/igalia-wpe-ews/WebKit/WebKitBuild/DependenciesWPE/Root/lib/python3.5/site-packages/mesonbuild/interpreterbase.py", line 170, in evaluate_codeblock raise e File "/home/ews/igalia-wpe-ews/WebKit/WebKitBuild/DependenciesWPE/Root/lib/python3.5/site-packages/mesonbuild/interpreterbase.py", line 164, in evaluate_codeblock self.evaluate_statement(cur) File "/home/ews/igalia-wpe-ews/WebKit/WebKitBuild/DependenciesWPE/Root/lib/python3.5/site-packages/mesonbuild/interpreterbase.py", line 175, in evaluate_statement return self.function_call(cur) File "/home/ews/igalia-wpe-ews/WebKit/WebKitBuild/DependenciesWPE/Root/lib/python3.5/site-packages/mesonbuild/interpreterbase.py", line 385, in function_call return self.funcs[func_name](node, self.flatten(posargs), kwargs) File "/home/ews/igalia-wpe-ews/WebKit/WebKitBuild/DependenciesWPE/Root/lib/python3.5/site-packages/mesonbuild/interpreterbase.py", line 77, in wrapped return f(s, node_or_state, args, kwargs) File "/home/ews/igalia-wpe-ews/WebKit/WebKitBuild/DependenciesWPE/Root/lib/python3.5/site-packages/mesonbuild/interpreter.py", line 2546, in func_configure_file conf.held_object) File "/home/ews/igalia-wpe-ews/WebKit/WebKitBuild/DependenciesWPE/Root/lib/python3.5/site-packages/mesonbuild/mesonlib.py", line 440, in do_conf_file replace_if_different(dst, dst_tmp) File "/home/ews/igalia-wpe-ews/WebKit/WebKitBuild/DependenciesWPE/Root/lib/python3.5/site-packages/mesonbuild/mesonlib.py", line 473, in replace_if_different if f1.read() == f2.read(): File "/usr/lib/python3.5/encodings/ascii.py", line 26, in decode return codecs.ascii_decode(input, self.errors)[0] UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 52: ordinal not in range(128) Upon further investigation, it seems the Meson build system throws this error when the system locale is not an UTF8 one. Check https://github.com/mesonbuild/meson/issues/2268 $ env -i python3 -c "import locale; print(locale.getpreferredencoding())" ANSI_X3.4-1968 $ env -i LC_ALL=C.UTF-8 python3 -c "import locale; print(locale.getpreferredencoding())" UTF-8 $ env -i LANG=C.UTF-8 python3 -c "import locale; print(locale.getpreferredencoding())" ANSI_X3.4-1968 $ env -i LC_ALL=C LANG=en_US.UTF8 python3 -c "import locale; print(locale.getpreferredencoding())" ANSI_X3.4-1968 So, passing "C.UTF-8" is fine, but not passing just "C". And I have been forcing this on the WPE EWS bot one way or the another until I realized its the WebKit build system itself the one overriding this and setting LC_ALL=C in order to disable GCC "smartquotes"! https://trac.webkit.org/browser/webkit/trunk/Tools/Scripts/webkitpy/common/system/environment.py?rev=221898#L37 1347766 1 mcatanzaro 2017-09-11 18:52:03 -0700 So, we definitely need to use a UTF-8 locale always. That should go without saying. Our platform is not non-UTF-8 safe anymore and I expect there is no shortage of odd bugs caused by using a weird locale. Anyway, apparently commit-queue can't handle UTF-8. Or couldn't in the past, see bug #71983. So we'll need to test to see if commit queue breaks when we change this. P.S. Passing C.UTF-8 is a bad idea, because I'm pretty sure that locale is a downstream Debian/Fedora patch. We should be nice to distros that don't have C.UTF-8 by not using it. en_US.UTF-8 is the standard locale nowadays. 1347871 2 clopez 2017-09-12 06:16:58 -0700 (In reply to Michael Catanzaro from comment #1) > So, we definitely need to use a UTF-8 locale always. That should go without > saying. Our platform is not non-UTF-8 safe anymore and I expect there is no > shortage of odd bugs caused by using a weird locale. > > Anyway, apparently commit-queue can't handle UTF-8. Or couldn't in the past, > see bug #71983. So we'll need to test to see if commit queue breaks when we > change this. > I think this is not longer an issue. 1) I have checked and all the GTK/WPE bots are right now producing text with UTF8 strings. This is because disable_gcc_smartquotes() is not called on the normal build done by the buildbots, only for the EWS bots. Example: https://build.webkit.org/builders/GTK%20Linux%20ARM%20Release/builds/1051/steps/compile-webkit/logs/stdio/text 2) Both the build.webkit.org as the EWS log server are now setting proper mime-type: * EWS: $ curl -i https://webkit-queues.webkit.org/results/4489980 2>&1 |grep ^Content-Type: Content-Type: text/plain; charset=utf-8 * build.webkit.org $ curl -i https://build.webkit.org/builders/GTK%20Linux%20ARM%20Release/builds/1051/steps/compile-webkit/logs/stdio/text 2>&1 |grep ^Content- Content-Type: text/plain; charset=utf-8 And any browser that is not able to understand text/plain with charset=utf-8 (or confuses that with binary data) in 2017 has bigger problems that go beyond this issue. So the issue raised in https://lists.webkit.org/pipermail/webkit-dev/2014-January/026140.html (not sure if was the same) should not be an issue anymore. And regarding commit-queue itself, I expect it to be handle UTF-8 nowadays. But even in that remote case this should not be an issue since the ports that commit-queue tests are the Mac/iOS ones (not the GTK/WPE ones). And the Apple port has long ago switched to Clang. So the GCC smartquotes thing should not be an issue anymore > P.S. Passing C.UTF-8 is a bad idea, because I'm pretty sure that locale is a > downstream Debian/Fedora patch. We should be nice to distros that don't have > C.UTF-8 by not using it. en_US.UTF-8 is the standard locale nowadays. Also passing C.UTF-8 will not disable GCC smartquotes (because GCC will enable that on any UTF8 locale). So we may as well just not pass anything. I think the best thing we can do is to completely remove this environment.disable_gcc_smartquotes() thing. Forcing the locale its a gunfoot. If the commit-queue server has problems with its own locale it should fix that locally (in the script that starts it locally) rather than doing that on WebKit IMHO. 1347876 3 clopez 2017-09-12 06:27:32 -0700 (In reply to Carlos Alberto Lopez Perez from comment #2) > (In reply to Michael Catanzaro from comment #1) > > So, we definitely need to use a UTF-8 locale always. That should go without > > saying. Our platform is not non-UTF-8 safe anymore and I expect there is no > > shortage of odd bugs caused by using a weird locale. > > > > Anyway, apparently commit-queue can't handle UTF-8. Or couldn't in the past, > > see bug #71983. So we'll need to test to see if commit queue breaks when we > > change this. > > > > > I think this is not longer an issue. > > 1) I have checked and all the GTK/WPE bots are right now producing text with > UTF8 strings. This is because disable_gcc_smartquotes() is not called on the > normal build done by the buildbots, only for the EWS bots. > > Example: > https://build.webkit.org/builders/GTK%20Linux%20ARM%20Release/builds/1051/ > steps/compile-webkit/logs/stdio/text > > > 2) Both the build.webkit.org as the EWS log server are now setting proper > mime-type: > > * EWS: > $ curl -i https://webkit-queues.webkit.org/results/4489980 2>&1 |grep > ^Content-Type: > Content-Type: text/plain; charset=utf-8 > > * build.webkit.org > $ curl -i > https://build.webkit.org/builders/GTK%20Linux%20ARM%20Release/builds/1051/ > steps/compile-webkit/logs/stdio/text 2>&1 |grep ^Content- > Content-Type: text/plain; charset=utf-8 > > > And any browser that is not able to understand text/plain with charset=utf-8 > (or confuses that with binary data) in 2017 has bigger problems that go > beyond this issue. > > So the issue raised in > https://lists.webkit.org/pipermail/webkit-dev/2014-January/026140.html (not > sure if was the same) should not be an issue anymore. > I think the issue raised on the mailing list was related to the VT100 characters that JHBuild generates that are not UTF8. For that we are setting TERM=none with environment.disable_jhbuild_VT100_output(). We can keep that as this one makes sense. I also set on the bots the TERM variable to disable the terminal control codes from JHBuild So, taken everything into account I think is safe now to remove the environment.disable_gcc_smartquotes() thing 1347885 4 320545 clopez 2017-09-12 07:11:12 -0700 Created attachment 320545 Patch 1347895 5 mcatanzaro 2017-09-12 07:39:28 -0700 Let's wait for EWS, since this could maybe break Apple ports. 1347910 6 clopez 2017-09-12 08:36:50 -0700 (In reply to Michael Catanzaro from comment #5) > Let's wait for EWS, since this could maybe break Apple ports. EWS are green (except WPE which has a long queue because its broken due to this). In any case I think restarting the EWS process is needed to the changes to take effect. 1347930 7 320545 mcatanzaro 2017-09-12 09:33:47 -0700 Comment on attachment 320545 Patch I'm surprised EWS passed. :P Still think it's liable to break something unexpected, but we need to try it, and now seems as good a time as any. 1347952 8 320545 commit-queue 2017-09-12 10:04:34 -0700 Comment on attachment 320545 Patch Clearing flags on attachment: 320545 Committed r221926: <http://trac.webkit.org/changeset/221926> 1347953 9 commit-queue 2017-09-12 10:04:36 -0700 All reviewed patches have been landed. Closing bug. 1353442 10 webkit-bug-importer 2017-09-27 12:31:08 -0700 <rdar://problem/34693416> 320545 2017-09-12 07:11:12 -0700 2017-09-12 10:04:34 -0700 Patch bug-176761-20170912161110.patch text/plain 11453 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxOTEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTYxNjZkZWQ1Yzc1Yzc2NGIxNGMzMWVlODdiMjRhYzQ5 Mjk2NDE0ZS4uMjAxNjUxZjZhM2JmNDlkZDUyZDA1MDk5YmNmNjNmODk0OTk0NGNlZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0 IEBACisyMDE3LTA5LTEyICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFRoZSBFV1MgYnVpbGQgc3lzdGVtIGlzIGZvcmNpbmcgYSBub24g VVRGLTggbG9jYWxlIGFuZCBicmVha3MgbWVzb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzY3NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBPbiAyMDExIGluIG9yZGVyIHRvIGRpc2FibGUgR0NDIHNt YXJ0cXVvdGVzIChVVEYtOCBwcmV0dHkgcXVvdGVzKQorICAgICAgICB0aGF0IHdlcmUgY2F1c2lu ZyB0cm91YmxlIHdpdGggdGhlIGNvbW1pdC1xdWV1ZSBzZXJ2ZXIsIHRoZSB0b29saW5nCisgICAg ICAgIGZvciB0aGUgRVdTIGJvdHMgc3RhcnRlZCB0byBmb3JjZSBhbiBMQ19BTEw9QyBsb2NhbGUu CisKKyAgICAgICAgVGhpcyB3YXMgbmVlZGVkIGJhY2sgdGhlbiBhcHBhcmVudGx5IGJlY2F1c2Ug dGhlIGNvbW1pdC1xdWV1ZSBzZXJ2ZXIKKyAgICAgICAgd2FzIHVuYWJsZSB0byBoYW5kbGUgcHJv cGVybHkgVVRGLTggdGV4dC4KKworICAgICAgICA2IHllYXJzIGZvcndhcmQgYW5kIG5vbmUgb2Yg dGhlIHBvcnRzIHRoYXQgY29tbWl0LXF1ZXVlIHRlc3RzIGJlZm9yZQorICAgICAgICBsYW5kaW5n IGEgcGF0Y2ggdXNlIEdDQywgYnV0IENsYW5nLiBTbyB0aGlzIHNob3VsZCBub3QgYmUgYW4gaXNz dWUgYW55bW9yZS4KKworICAgICAgICBGb3JjaW5nIGEgbm9uIFVURi04IGxvY2FsZSBicmVha3Mg dGhlIE1lc29uIGJ1aWxkIHN5c3RlbSAodGhhdCB0aGUKKyAgICAgICAgR1RLL1dQRSBwb3J0cyB1 c2UgZm9yIHNvbWUgZGVwZW5kZW5jaWVzIG9mIGl0cyBKSEJ1aWxkIGRlcGVuZGVuY2llcworICAg ICAgICBsb2NhbCBidWlsZCBzeXN0ZW0pLgorICAgICAgICBJdCBoYXMgYWxzbyB0aGUgcG90ZW50 aWFsIHRvIGJyZWFrIHRoaW5ncyBpbiBzdWJ0bGUgd2F5cyB0aGF0IGFyZQorICAgICAgICBoYXJk IHRvIGRlYnVnIGFuZCBkZXRlY3QuIFNvIGJldHRlciBzdG9wIGRvaW5nIHRoaXMuCisKKyAgICAg ICAgVGhpcyBwYXRjaCBhbHNvIGNoYW5nZXMgVEVSTT1ub25lIHRvIFRFUk09ZHVtYiB0aGF0IGlz IHRoZSBwcm9wZXIKKyAgICAgICAgd2F5IHRvIGRpc2FibGUgVlQxMDAgY29kZXMgKHNlZSBidWcg MTI3OTIyKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9lbnZp cm9ubWVudC5weToKKyAgICAgICAgKEVudmlyb25tZW50LnRvX2RpY3Rpb25hcnkpOgorICAgICAg ICAoRW52aXJvbm1lbnQuZGlzYWJsZV9qaGJ1aWxkX1ZUMTAwX291dHB1dCk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2Vudmlyb25tZW50X3VuaXR0ZXN0LnB5Ogor ICAgICAgICAoRW52aXJvbm1lbnRUZXN0LnRlc3RfZGlzYWJsZV9qaGJ1aWxkX1ZUMTAwX291dHB1 dCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHk6CisgICAgICAgIChQ b3J0Ll9idWlsZF9kcml2ZXIpOgorICAgICAgICAoUG9ydC5fYnVpbGRfaW1hZ2VfZGlmZik6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L3BvcnRfdGVzdGNhc2UucHk6CisgICAgICAg IChQb3J0VGVzdENhc2UudGVzdF9idWlsZF9kcml2ZXIpOgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9kb3dubG9hZF91bml0dGVzdC5weToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvYnVpbGQucHk6CisgICAgICAgIChCdWlsZC5idWlsZCk6 CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3N0ZXBzX3VuaXR0ZXN0LnB5 OgorCiAyMDE3LTA5LTEyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNv bT4KIAogICAgICAgICBbRnJlZXR5cGVdIERvZXNuJ3Qgc3VwcG9ydCBjb2xvdXJlZCBmb250cwpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2Vudmlyb25t ZW50LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2Vudmlyb25tZW50 LnB5CmluZGV4IGMxYmIwNGEyZTUyYTNlMjc4MzhkZmUxMzI3ZTY0ZTZiZDMzZGJiN2MuLmI3ZWI4 M2ZlMzU1MzRlYzIzYjE1NzZkMTk2MjJjNzNiMDdlYjRkN2EgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9lbnZpcm9ubWVudC5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZW52aXJvbm1lbnQucHkKQEAgLTM0LDE0ICsz NCw4IEBAIGNsYXNzIEVudmlyb25tZW50KG9iamVjdCk6CiAgICAgZGVmIHRvX2RpY3Rpb25hcnko c2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLmVudgogCi0gICAgZGVmIGRpc2FibGVfZ2NjX3Nt YXJ0cXVvdGVzKHNlbGYpOgotICAgICAgICAjIFRlY2huaWNhbGx5IHdlIG9ubHkgbmVlZCB0byBz ZXQgTENfQ1RZUEUgdG8gZGlzYWJsZSBjdXJyZW50Ci0gICAgICAgICMgc21hcnRxdW90ZSBiZWhh dmlvcjogaHR0cDovL2djYy5nbnUub3JnL2J1Z3ppbGxhL3Nob3dfYnVnLmNnaT9pZD0zODM2Mwot ICAgICAgICAjIEFwcGxlJ3MgWENvZGUgc2V0cyBMQ19BTEwgaW5zdGVhZCwgcHJvYmFibHkgdG8g YmUgZnV0dXJlLXByb29mLgotICAgICAgICBzZWxmLmVudlsnTENfQUxMJ10gPSAnQycKLQogICAg IGRlZiBkaXNhYmxlX2poYnVpbGRfVlQxMDBfb3V0cHV0KHNlbGYpOgogICAgICAgICAjIEpIQnVp bGQgZ2VuZXJhdGVzIFZUMTAwIGVzY2FwZSBzZXF1ZW5jZXMgaWYgVEVSTSBpcyB4dGVybSBvciBy eHZ0LAogICAgICAgICAjIHdoaWNoIG1ha2VzIGJyb3dzZXJzIHNldCB3cm9uZyBNSU1FIHR5cGUg KGUuZy4gU2FmYXJpLCBDaHJvbWUpLgogICAgICAgICAjIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMjc5MjIKLSAgICAgICAgc2VsZi5lbnZbJ1RFUk0nXSA9ICdub25l JworICAgICAgICBzZWxmLmVudlsnVEVSTSddID0gJ2R1bWInCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZW52aXJvbm1lbnRfdW5pdHRlc3QucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZW52aXJvbm1lbnRfdW5pdHRlc3Qu cHkKaW5kZXggNjU1OGI1MWRmYjhhMmJlODIzMjliYWEyMjU0NzY2ZTBlMTEzZjRmYy4uZTg2MWMw OGQ0MmNjZjExMzkwNDVhZmY4Nzg5NGE0ZDQxOTBkNTg1YSAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2Vudmlyb25tZW50X3VuaXR0ZXN0LnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9lbnZpcm9ubWVudF91bml0dGVz dC5weQpAQCAtMzIsOCArMzIsOCBAQCBmcm9tIC5lbnZpcm9ubWVudCBpbXBvcnQgRW52aXJvbm1l bnQKIAogCiBjbGFzcyBFbnZpcm9ubWVudFRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgotICAgIGRl ZiB0ZXN0X2Rpc2FibGVfZ2NjX3NtYXJ0cXVvdGVzKHNlbGYpOgorICAgIGRlZiB0ZXN0X2Rpc2Fi bGVfamhidWlsZF9WVDEwMF9vdXRwdXQoc2VsZik6CiAgICAgICAgIGVudmlyb25tZW50ID0gRW52 aXJvbm1lbnQoe30pCi0gICAgICAgIGVudmlyb25tZW50LmRpc2FibGVfZ2NjX3NtYXJ0cXVvdGVz KCkKKyAgICAgICAgZW52aXJvbm1lbnQuZGlzYWJsZV9qaGJ1aWxkX1ZUMTAwX291dHB1dCgpCiAg ICAgICAgIGVudiA9IGVudmlyb25tZW50LnRvX2RpY3Rpb25hcnkoKQotICAgICAgICBzZWxmLmFz c2VydEVxdWFsKGVudlsnTENfQUxMJ10sICdDJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChl bnZbJ1RFUk0nXSwgJ2R1bWInKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9w b3J0L2Jhc2UucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQppbmRleCBh YjQ4MmI0OTQ1YTgwNzdiOGRhYTcxN2NiMjEwYmZiNWYxMDZiMTViLi4yYTc0MTdiYWZhNTRiY2Zi Y2JiYmJkYjYzZjYzMDQ5MGU3NDIwNmU1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3BvcnQvYmFzZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5w eQpAQCAtMTQzMiw3ICsxNDMyLDYgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogCiAgICAgZGVmIF9i dWlsZF9kcml2ZXIoc2VsZik6CiAgICAgICAgIGVudmlyb25tZW50ID0gc2VsZi5ob3N0LmNvcHlf Y3VycmVudF9lbnZpcm9ubWVudCgpCi0gICAgICAgIGVudmlyb25tZW50LmRpc2FibGVfZ2NjX3Nt YXJ0cXVvdGVzKCkKICAgICAgICAgZW52ID0gZW52aXJvbm1lbnQudG9fZGljdGlvbmFyeSgpCiAK ICAgICAgICAgIyBGSVhNRTogV2UgYnVpbGQgYm90aCBEdW1wUmVuZGVyVHJlZSBhbmQgV2ViS2l0 VGVzdFJ1bm5lciBmb3IgV2ViS2l0VGVzdFJ1bm5lciBydW5zIGJlY2F1c2UKQEAgLTE0NDgsNyAr MTQ0Nyw2IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKIAogICAgIGRlZiBfYnVpbGRfaW1hZ2VfZGlm ZihzZWxmKToKICAgICAgICAgZW52aXJvbm1lbnQgPSBzZWxmLmhvc3QuY29weV9jdXJyZW50X2Vu dmlyb25tZW50KCkKLSAgICAgICAgZW52aXJvbm1lbnQuZGlzYWJsZV9nY2Nfc21hcnRxdW90ZXMo KQogICAgICAgICBlbnYgPSBlbnZpcm9ubWVudC50b19kaWN0aW9uYXJ5KCkKICAgICAgICAgdHJ5 OgogICAgICAgICAgICAgc2VsZi5fcnVuX3NjcmlwdCgiYnVpbGQtaW1hZ2VkaWZmIiwgZW52PWVu dikKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9wb3J0X3Rlc3RjYXNl LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3BvcnRfdGVzdGNhc2UucHkKaW5kZXgg MjllODI3ZDViODRiZjMyZDFlNzBjMjEwODYyMzE3MDQ5NjUyNmM5Ny4uOWQyOTI5OWI1YjE0Y2E5 MWVmYjcyZjhjNmM3YmNiNDM2YzI5MTdiNCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L3BvcnRfdGVzdGNhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9w b3J0L3BvcnRfdGVzdGNhc2UucHkKQEAgLTU1NywxOCArNTU3LDE4IEBAIGNsYXNzIFBvcnRUZXN0 Q2FzZSh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICMgRGVsYXkgc2V0dGluZyBfZXhlY3V0 aXZlIHRvIGF2b2lkIGxvZ2dpbmcgZHVyaW5nIGNvbnN0cnVjdGlvbgogICAgICAgICBwb3J0Ll9l eGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlKHNob3VsZF9sb2c9VHJ1ZSkKICAgICAgICAgcG9ydC5f b3B0aW9ucyA9IE1vY2tPcHRpb25zKGNvbmZpZ3VyYXRpb249IlJlbGVhc2UiKSAgIyBUaGlzIHNo b3VsZCBub3QgYmUgbmVjZXNzYXJ5LCBidXQgSSB0aGluayBUZXN0V2ViS2l0UG9ydCBpcyBhY3R1 YWxseSByZWFkaW5nIGZyb20gZGlzayAoYW5kIHRodXMgZGV0ZWN0cyB0aGUgY3VycmVudCBjb25m aWd1cmF0aW9uKS4KLSAgICAgICAgZXhwZWN0ZWRfbG9ncyA9ICJNT0NLIHJ1bl9jb21tYW5kOiBb J1Rvb2xzL1NjcmlwdHMvYnVpbGQtZHVtcHJlbmRlcnRyZWUnLCAnLS1yZWxlYXNlJ10sIGN3ZD0v bW9jay1jaGVja291dCwgZW52PXsnTENfQUxMJzogJ0MnLCAnTU9DS19FTlZJUk9OX0NPUFknOiAn MSd9XG4iCisgICAgICAgIGV4cGVjdGVkX2xvZ3MgPSAiTU9DSyBydW5fY29tbWFuZDogWydUb29s cy9TY3JpcHRzL2J1aWxkLWR1bXByZW5kZXJ0cmVlJywgJy0tcmVsZWFzZSddLCBjd2Q9L21vY2st Y2hlY2tvdXQsIGVudj17J01PQ0tfRU5WSVJPTl9DT1BZJzogJzEnfVxuIgogICAgICAgICBzZWxm LmFzc2VydFRydWUob3V0cHV0LmFzc2VydF9vdXRwdXRzKHNlbGYsIHBvcnQuX2J1aWxkX2RyaXZl ciwgZXhwZWN0ZWRfbG9ncz1leHBlY3RlZF9sb2dzKSkKIAogICAgICAgICAjIE1ha2Ugc3VyZSBX ZWJLaXRUZXN0UnVubmVyIGlzIHVzZWQuCiAgICAgICAgIHBvcnQuX29wdGlvbnMgPSBNb2NrT3B0 aW9ucyh3ZWJraXRfdGVzdF9ydW5uZXI9VHJ1ZSwgY29uZmlndXJhdGlvbj0iUmVsZWFzZSIpCi0g ICAgICAgIGV4cGVjdGVkX2xvZ3MgPSAiTU9DSyBydW5fY29tbWFuZDogWydUb29scy9TY3JpcHRz L2J1aWxkLWR1bXByZW5kZXJ0cmVlJywgJy0tcmVsZWFzZSddLCBjd2Q9L21vY2stY2hlY2tvdXQs IGVudj17J0xDX0FMTCc6ICdDJywgJ01PQ0tfRU5WSVJPTl9DT1BZJzogJzEnfVxuTU9DSyBydW5f Y29tbWFuZDogWydUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdHRlc3RydW5uZXInLCAnLS1yZWxl YXNlJ10sIGN3ZD0vbW9jay1jaGVja291dCwgZW52PXsnTENfQUxMJzogJ0MnLCAnTU9DS19FTlZJ Uk9OX0NPUFknOiAnMSd9XG4iCisgICAgICAgIGV4cGVjdGVkX2xvZ3MgPSAiTU9DSyBydW5fY29t bWFuZDogWydUb29scy9TY3JpcHRzL2J1aWxkLWR1bXByZW5kZXJ0cmVlJywgJy0tcmVsZWFzZSdd LCBjd2Q9L21vY2stY2hlY2tvdXQsIGVudj17J01PQ0tfRU5WSVJPTl9DT1BZJzogJzEnfVxuTU9D SyBydW5fY29tbWFuZDogWydUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdHRlc3RydW5uZXInLCAn LS1yZWxlYXNlJ10sIGN3ZD0vbW9jay1jaGVja291dCwgZW52PXsnTU9DS19FTlZJUk9OX0NPUFkn OiAnMSd9XG4iCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShvdXRwdXQuYXNzZXJ0X291dHB1dHMo c2VsZiwgcG9ydC5fYnVpbGRfZHJpdmVyLCBleHBlY3RlZF9sb2dzPWV4cGVjdGVkX2xvZ3MpKQog CiAgICAgICAgICMgTWFrZSBzdXJlIHdlIHNob3cgdGhlIGJ1aWxkIGxvZyB3aGVuIC0tdmVyYm9z ZSBpcyBwYXNzZWQsIHdoaWNoIHdlIHNpbXVsYXRlIGJ5IHNldHRpbmcgdGhlIGxvZ2dpbmcgbGV2 ZWwgdG8gREVCVUcuCiAgICAgICAgIG91dHB1dC5zZXRfbG9nX2xldmVsKGxvZ2dpbmcuREVCVUcp CiAgICAgICAgIHBvcnQuX29wdGlvbnMgPSBNb2NrT3B0aW9ucyhjb25maWd1cmF0aW9uPSJSZWxl YXNlIikKLSAgICAgICAgZXhwZWN0ZWRfbG9ncyA9ICIiIk1PQ0sgcnVuX2NvbW1hbmQ6IFsnVG9v bHMvU2NyaXB0cy9idWlsZC1kdW1wcmVuZGVydHJlZScsICctLXJlbGVhc2UnXSwgY3dkPS9tb2Nr LWNoZWNrb3V0LCBlbnY9eydMQ19BTEwnOiAnQycsICdNT0NLX0VOVklST05fQ09QWSc6ICcxJ30K KyAgICAgICAgZXhwZWN0ZWRfbG9ncyA9ICIiIk1PQ0sgcnVuX2NvbW1hbmQ6IFsnVG9vbHMvU2Ny aXB0cy9idWlsZC1kdW1wcmVuZGVydHJlZScsICctLXJlbGVhc2UnXSwgY3dkPS9tb2NrLWNoZWNr b3V0LCBlbnY9eydNT0NLX0VOVklST05fQ09QWSc6ICcxJ30KIE91dHB1dCBvZiBbJ1Rvb2xzL1Nj cmlwdHMvYnVpbGQtZHVtcHJlbmRlcnRyZWUnLCAnLS1yZWxlYXNlJ106CiBNT0NLIG91dHB1dCBv ZiBjaGlsZCBwcm9jZXNzCiAiIiIKQEAgLTU3OCw3ICs1NzgsNyBAQCBNT0NLIG91dHB1dCBvZiBj aGlsZCBwcm9jZXNzCiAgICAgICAgICMgTWFrZSBzdXJlIHRoYXQgZmFpbHVyZSB0byBidWlsZCBy ZXR1cm5zIEZhbHNlLgogICAgICAgICBwb3J0Ll9leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlKHNo b3VsZF9sb2c9VHJ1ZSwgc2hvdWxkX3Rocm93PVRydWUpCiAgICAgICAgICMgQmVjYXVzZSBXSzIg Y3VycmVudGx5IGhhcyB0byBidWlsZCBib3RoIHdlYmtpdHRlc3RydW5uZXIgYW5kIERSVCwgaWYg RFJUIGZhaWxzLCB0aGF0J3MgdGhlIG9ubHkgb25lIGl0IHRyaWVzLgotICAgICAgICBleHBlY3Rl ZF9sb2dzID0gIiIiTU9DSyBydW5fY29tbWFuZDogWydUb29scy9TY3JpcHRzL2J1aWxkLWR1bXBy ZW5kZXJ0cmVlJywgJy0tcmVsZWFzZSddLCBjd2Q9L21vY2stY2hlY2tvdXQsIGVudj17J0xDX0FM TCc6ICdDJywgJ01PQ0tfRU5WSVJPTl9DT1BZJzogJzEnfQorICAgICAgICBleHBlY3RlZF9sb2dz ID0gIiIiTU9DSyBydW5fY29tbWFuZDogWydUb29scy9TY3JpcHRzL2J1aWxkLWR1bXByZW5kZXJ0 cmVlJywgJy0tcmVsZWFzZSddLCBjd2Q9L21vY2stY2hlY2tvdXQsIGVudj17J01PQ0tfRU5WSVJP Tl9DT1BZJzogJzEnfQogTU9DSyBTY3JpcHRFcnJvcgogCiBNT0NLIG91dHB1dCBvZiBjaGlsZCBw cm9jZXNzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMv ZG93bmxvYWRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFu ZHMvZG93bmxvYWRfdW5pdHRlc3QucHkKaW5kZXggMGM5YmFkMDExNTE1YWZmOTRhZWNhOWIxMmFk ZjQxYTc1OGE3MjUxMS4uOTFlMjk5MzQxN2M5YTAzZTllYzg3NjE0NzQ1ZjJjMmRjMTNiYjM2ZCAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Rvd25sb2Fk X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9k b3dubG9hZF91bml0dGVzdC5weQpAQCAtMTY0LDcgKzE2NCw3IEBAIE1PQ0sgcnVuX2NvbW1hbmQ6 IFsncnVieScsICctSScsICcvbW9jay1jaGVja291dC9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcv UHJldHR5CiBNT0NLOiB1c2VyLm9wZW5fdXJsOiBmaWxlOi8vLi4uCiBXYXMgdGhhdCBkaWZmIGNv cnJlY3Q/CiBCdWlsZGluZyBXZWJLaXQKLU1PQ0sgcnVuX2FuZF90aHJvd19pZl9mYWlsOiBbJ21v Y2stYnVpbGQtd2Via2l0JywgJ0FSQ0hTPU1PQ0sgQVJDSCddLCBjd2Q9L21vY2stY2hlY2tvdXQs IGVudj17J0xDX0FMTCc6ICdDJywgJ1RFUk0nOiAnbm9uZScsICdNT0NLX0VOVklST05fQ09QWSc6 ICcxJ30KK01PQ0sgcnVuX2FuZF90aHJvd19pZl9mYWlsOiBbJ21vY2stYnVpbGQtd2Via2l0Jywg J0FSQ0hTPU1PQ0sgQVJDSCddLCBjd2Q9L21vY2stY2hlY2tvdXQsIGVudj17J1RFUk0nOiAnZHVt YicsICdNT0NLX0VOVklST05fQ09QWSc6ICcxJ30KIFJ1bm5pbmcgUHl0aG9uIHVuaXQgdGVzdHMK IE1PQ0sgcnVuX2FuZF90aHJvd19pZl9mYWlsOiBbJ21vY2stdGVzdC13ZWJraXRweSddLCBjd2Q9 L21vY2stY2hlY2tvdXQKIFJ1bm5pbmcgUGVybCB1bml0IHRlc3RzCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvYnVpbGQucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3Rvb2wvc3RlcHMvYnVpbGQucHkKaW5kZXggNmQ2NDhlMzRmZTNhOTI5YThjYTZiNzFi MDJhNzBkOWE4NDMyNWQxYS4uOGM5OTVlMGI4ZWY5NzRkMGIwYjg4NzgzNWRkNzc1YWM3Y2ZjNGZk ZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2J1aWxkLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9idWlsZC5weQpAQCAtNDcs NyArNDcsNiBAQCBjbGFzcyBCdWlsZChBYnN0cmFjdFN0ZXApOgogCiAgICAgZGVmIGJ1aWxkKHNl bGYsIGJ1aWxkX3N0eWxlLCBncm91cCk6CiAgICAgICAgIGVudmlyb25tZW50ID0gc2VsZi5fdG9v bC5jb3B5X2N1cnJlbnRfZW52aXJvbm1lbnQoKQotICAgICAgICBlbnZpcm9ubWVudC5kaXNhYmxl X2djY19zbWFydHF1b3RlcygpCiAgICAgICAgIGVudmlyb25tZW50LmRpc2FibGVfamhidWlsZF9W VDEwMF9vdXRwdXQoKQogICAgICAgICBlbnYgPSBlbnZpcm9ubWVudC50b19kaWN0aW9uYXJ5KCkK IApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3N0ZXBzX3Vu aXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3N0ZXBzX3VuaXR0 ZXN0LnB5CmluZGV4IDlhZTgxYWFlZDkyNDQ3ZTQ4Mzk3N2NiYTdjZTdlZjg2ODIzNWZkYTcuLjI2 MjA5YzQ0YjE4YzA1MDhjMmE3ODk1ZDViYjQ3ZjEwOTMzYmJiY2YgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9zdGVwc191bml0dGVzdC5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvc3RlcHNfdW5pdHRlc3QucHkKQEAgLTE4NCw3 ICsxODQsNyBAQCBNT0NLIHJ1bl9hbmRfdGhyb3dfaWZfZmFpbDogWydUb29scy9TY3JpcHRzL3J1 bi13ZWJraXQtdGVzdHMnLCAnLS1kZWJ1ZycsICctLXF1aQogICAgICAgICB0b29sLl9kZXByZWNh dGVkX3BvcnQgPSBEZXByZWNhdGVkUG9ydCgpCiAgICAgICAgIHN0ZXAgPSBzdGVwcy5CdWlsZCh0 b29sLCBtb2NrX29wdGlvbnMpCiAgICAgICAgIGV4cGVjdGVkX2xvZ3MgPSAiIiJCdWlsZGluZyBX ZWJLaXQKLU1PQ0sgcnVuX2FuZF90aHJvd19pZl9mYWlsOiBbJ1Rvb2xzL1NjcmlwdHMvYnVpbGQt anNjJywgJy0tZGVidWcnLCAnQVJDSFM9VHJ1ZSddLCBjd2Q9L21vY2stY2hlY2tvdXQsIGVudj17 J0xDX0FMTCc6ICdDJywgJ1RFUk0nOiAnbm9uZScsICdNT0NLX0VOVklST05fQ09QWSc6ICcxJ30K K01PQ0sgcnVuX2FuZF90aHJvd19pZl9mYWlsOiBbJ1Rvb2xzL1NjcmlwdHMvYnVpbGQtanNjJywg Jy0tZGVidWcnLCAnQVJDSFM9VHJ1ZSddLCBjd2Q9L21vY2stY2hlY2tvdXQsIGVudj17J1RFUk0n OiAnZHVtYicsICdNT0NLX0VOVklST05fQ09QWSc6ICcxJ30KICIiIgogICAgICAgICBPdXRwdXRD YXB0dXJlKCkuYXNzZXJ0X291dHB1dHMoc2VsZiwgc3RlcC5ydW4sIFt7fV0sIGV4cGVjdGVkX2xv Z3M9ZXhwZWN0ZWRfbG9ncykKIApAQCAtMjAwLDcgKzIwMCw3IEBAIE1PQ0sgcnVuX2FuZF90aHJv d19pZl9mYWlsOiBbJ1Rvb2xzL1NjcmlwdHMvYnVpbGQtanNjJywgJy0tZGVidWcnLCAnQVJDSFM9 VHJ1ZSddCiAgICAgICAgIHRvb2wuX2RlcHJlY2F0ZWRfcG9ydCA9IERlcHJlY2F0ZWRQb3J0KCkK ICAgICAgICAgc3RlcCA9IHN0ZXBzLkJ1aWxkKHRvb2wsIG1vY2tfb3B0aW9ucykKICAgICAgICAg ZXhwZWN0ZWRfbG9ncyA9ICIiIkJ1aWxkaW5nIFdlYktpdAotTU9DSyBydW5fYW5kX3Rocm93X2lm X2ZhaWw6IFsnVG9vbHMvU2NyaXB0cy9idWlsZC1qc2MnLCAnLS1yZWxlYXNlJywgJ0FSQ0hTPVRy dWUnXSwgY3dkPS9tb2NrLWNoZWNrb3V0LCBlbnY9eydMQ19BTEwnOiAnQycsICdURVJNJzogJ25v bmUnLCAnTU9DS19FTlZJUk9OX0NPUFknOiAnMSd9CitNT0NLIHJ1bl9hbmRfdGhyb3dfaWZfZmFp bDogWydUb29scy9TY3JpcHRzL2J1aWxkLWpzYycsICctLXJlbGVhc2UnLCAnQVJDSFM9VHJ1ZSdd LCBjd2Q9L21vY2stY2hlY2tvdXQsIGVudj17J1RFUk0nOiAnZHVtYicsICdNT0NLX0VOVklST05f Q09QWSc6ICcxJ30KICIiIgogICAgICAgICBPdXRwdXRDYXB0dXJlKCkuYXNzZXJ0X291dHB1dHMo c2VsZiwgc3RlcC5ydW4sIFt7fV0sIGV4cGVjdGVkX2xvZ3M9ZXhwZWN0ZWRfbG9ncykKIAo=