228628 2021-07-29 18:10:10 -0700 [WPE][GTK] Clean build broken with python3 after r280382 2021-08-17 11:22:30 -0700 1 1 1 Unclassified WebKit CMake WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=228290 https://bugs.webkit.org/show_bug.cgi?id=228629 https://bugs.webkit.org/show_bug.cgi?id=229199 P2 Normal --- 229137 1 clopez pnormand aakash_jain aperez bugs-noreply commit-queue jbedard pnormand oldest_to_newest 1780667 0 clopez 2021-07-29 18:10:10 -0700 Not sure still what causes this, it looks like the autoinstall python magic is not working as expected with python3 here. This was detected on the EWS: https://ews-build.webkit.org/#/builders/36/builds/41166 Steps to reproduce: $ rm -fr WebKitBuild/GTK/Release/ $ rm -fr Tools/Scripts/libraries/autoinstalled/ $ Tools/Scripts/build-webkit --gtk --cmakeargs='-DPYTHON_EXECUTABLE=/usr/bin/python3' Output: FAILED: Source/JavaScriptCore/CMakeFiles/JavaScriptCore-build-revision cd /app/webkit && /usr/bin/python3 /app/webkit/Tools/glib/apply-build-revision-to-files.py /app/webkit/WebKitBuild/Release/Source/JavaScriptCore/javascriptcoregtk-4.1.pc Traceback (most recent call last): File "<frozen importlib._bootstrap>", line 908, in _find_spec AttributeError: type object 'AutoInstall' has no attribute 'find_spec' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/usr/lib/python3.8/urllib/request.py", line 1354, in do_open h.request(req.get_method(), req.selector, req.data, headers, File "/usr/lib/python3.8/http/client.py", line 1255, in request self._send_request(method, url, body, headers, encode_chunked) File "/usr/lib/python3.8/http/client.py", line 1301, in _send_request self.endheaders(body, encode_chunked=encode_chunked) File "/usr/lib/python3.8/http/client.py", line 1250, in endheaders self._send_output(message_body, encode_chunked=encode_chunked) File "/usr/lib/python3.8/http/client.py", line 1010, in _send_output self.send(msg) File "/usr/lib/python3.8/http/client.py", line 950, in send self.connect() File "/usr/lib/python3.8/http/client.py", line 1417, in connect super().connect() File "/usr/lib/python3.8/http/client.py", line 921, in connect self.sock = self._create_connection( File "/usr/lib/python3.8/socket.py", line 787, in create_connection for res in getaddrinfo(host, port, 0, SOCK_STREAM): File "/usr/lib/python3.8/socket.py", line 918, in getaddrinfo for res in _socket.getaddrinfo(host, port, family, type, proto, flags): socket.gaierror: [Errno -3] Temporary failure in name resolution During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/app/webkit/Tools/glib/apply-build-revision-to-files.py", line 25, in <module> from webkitpy.common.checkout.scm.detection import SCMDetector # nopep8 File "/app/webkit/Tools/Scripts/webkitpy/__init__.py", line 78, in <module> import webkitscmpy File "/app/webkit/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py", line 57, in <module> from webkitscmpy.commit import Commit File "/app/webkit/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/commit.py", line 24, in <module> import six File "<frozen importlib._bootstrap>", line 991, in _find_and_load File "<frozen importlib._bootstrap>", line 971, in _find_and_load_unlocked File "<frozen importlib._bootstrap>", line 910, in _find_spec File "<frozen importlib._bootstrap>", line 884, in _find_spec_legacy File "/app/webkit/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py", line 598, in find_module cls.install(name) File "/app/webkit/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py", line 582, in install return all([to_install.install() for to_install in packages]) File "/app/webkit/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py", line 582, in <listcomp> return all([to_install.install() for to_install in packages]) File "/app/webkit/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py", line 261, in install AutoInstall.install('setuptools') File "/app/webkit/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py", line 582, in install return all([to_install.install() for to_install in packages]) File "/app/webkit/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py", line 582, in <listcomp> return all([to_install.install() for to_install in packages]) File "/app/webkit/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py", line 272, in install if not self.archives(): File "/app/webkit/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py", line 181, in archives response = AutoInstall._request('https://{}/{}'.format(AutoInstall.index, path)) File "/app/webkit/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py", line 414, in _request return urlopen(url, timeout=cls.timeout, context=context) File "/usr/lib/python3.8/urllib/request.py", line 222, in urlopen return opener.open(url, data, timeout) File "/usr/lib/python3.8/urllib/request.py", line 525, in open response = self._open(req, data) File "/usr/lib/python3.8/urllib/request.py", line 542, in _open result = self._call_chain(self.handle_open, protocol, protocol + File "/usr/lib/python3.8/urllib/request.py", line 502, in _call_chain result = func(*args) File "/usr/lib/python3.8/urllib/request.py", line 1397, in https_open return self.do_open(http.client.HTTPSConnection, req, File "/usr/lib/python3.8/urllib/request.py", line 1357, in do_open raise URLError(err) urllib.error.URLError: <urlopen error [Errno -3] Temporary failure in name resolution> [1172/6979] Generating ../../JavaScriptCore/DerivedSources/LLIntDesiredSettings.h ninja: build stopped: subcommand failed. 1780670 1 clopez 2021-07-29 18:20:44 -0700 I attached a patch on bug 228629 to fix the build with python2, which should be enough for the moment to have the EWS working back 1780701 2 clopez 2021-07-29 23:05:46 -0700 As far as I can see, the issue (apparently) comes because the class AutoInstall in file Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py does not implement the method find_spec() which is new in python 3.4 See: https://docs.python.org/3/library/importlib.html#importlib.abc.MetaPathFinder.find_spec What puzzles me is that the script works if I call it directly with python3, it only fails if is called from the build :? 1784400 3 pnormand 2021-08-15 11:43:05 -0700 The network issue happens because the build sandbox has no network access, unless either sccache or icecc is enabled. That would be easy to fix, but then... ... the webkitpy auto install black magic doesn't seem to work well in case it's triggered from concurrent processes. I tried to debug this for a few hours, gave up... ... I'll submit a patch getting rid of webkitpy in the glib/apply-build-revision-to-files.py. We don't need webkitpy for this, we can call svnversion, git svn info, or git log -1... depending on the kind of checkout... 1784453 4 435583 pnormand 2021-08-16 03:38:27 -0700 Created attachment 435583 Patch 1784476 5 ews-feeder 2021-08-16 06:34:21 -0700 Committed r281077 (240537@main): <https://commits.webkit.org/240537@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 435583. 1784485 6 commit-queue 2021-08-16 07:10:44 -0700 Re-opened since this is blocked by bug 229137 1784491 7 435598 pnormand 2021-08-16 07:22:44 -0700 Created attachment 435598 [fast-cq] Patch 1784550 8 ews-feeder 2021-08-16 09:34:50 -0700 Committed r281089 (240549@main): <https://commits.webkit.org/240549@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 435598. 435583 2021-08-16 03:38:27 -0700 2021-08-16 07:22:39 -0700 Patch bug-228628-20210816033826.patch text/plain 3731 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMDc0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDIzM2Y0YjhiMDQ2N2I5NTQ4YzgzODUwNmQzOTRlMTU1 NzJhZDI2MC4uMTg3MGEzZmVhY2E0NGI2Zjc2YzM3YmRmNjk4OGUwMWNiNTk1MTBiMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDIxLTA4LTE2ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbV1BFXVtHVEtdIENsZWFuIGJ1aWxkIGJyb2tlbiB3aXRoIHB5dGhvbjMgYWZ0 ZXIgcjI4MDM4MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjI4NjI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhlIHdlYmtpdHB5IGF1dG9pbnN0YWxsIGRvZXNuJ3QgcmVsaWFibHkgd29yayB3aGVuIGl0 J3MgdHJpZ2dlcmVkIGZyb20gY29uY3VycmVudAorICAgICAgICBwcm9jZXNzZXMuIFJlcGxhY2Ug d2Via2l0cHkgdXNhZ2UgaW4gYXBwbHktYnVpbGQtcmV2aXNpb24tdG8tZmlsZXMucHkgc2NyaXB0 IHdpdGggZXhwbGljaXQKKyAgICAgICAgY2FsbHMgdG8gc3ZudmVyc2lvbiwgZ2l0IHN2biBpbmZv IG9yIGdpdCBsb2cgLTEsIGRlcGVuZGluZyBvbiB0aGUga2luZCBvZiBTQ00gY2hlY2tvdXQuCisK KyAgICAgICAgKiBnbGliL2FwcGx5LWJ1aWxkLXJldmlzaW9uLXRvLWZpbGVzLnB5OgorICAgICAg ICAoZ2V0X2J1aWxkX3JldmlzaW9uKToKKyAgICAgICAgKG1haW4pOgorCiAyMDIxLTA4LTE2ICBD YXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJl dmlld2VkLiBGaXggR1RLIGRpc3RjaGVjayBidWlsZApkaWZmIC0tZ2l0IGEvVG9vbHMvZ2xpYi9h cHBseS1idWlsZC1yZXZpc2lvbi10by1maWxlcy5weSBiL1Rvb2xzL2dsaWIvYXBwbHktYnVpbGQt cmV2aXNpb24tdG8tZmlsZXMucHkKaW5kZXggMjNhN2M1YWQ3Y2U2ODMxOGU2YTA2YWJmODBkOTli MWRmMjg0YzhkZS4uN2JmZjgyMmRjNjc1MWYzYmFhMzkyNzEyNWU2ZjBhZDZjNjYxYjA3YSAxMDA2 NDQKLS0tIGEvVG9vbHMvZ2xpYi9hcHBseS1idWlsZC1yZXZpc2lvbi10by1maWxlcy5weQorKysg Yi9Ub29scy9nbGliL2FwcGx5LWJ1aWxkLXJldmlzaW9uLXRvLWZpbGVzLnB5CkBAIC0xLDQgKzEs MyBAQAotIyEvdXNyL2Jpbi9lbnYgcHl0aG9uCiAjCiAjIENvcHlyaWdodCAoQykgMjAyMSBJZ2Fs aWEgUy5MLgogIwpAQCAtMTgsMTggKzE3LDQ1IEBACiAKIGltcG9ydCBvcwogaW1wb3J0IHN5cwor aW1wb3J0IHN1YnByb2Nlc3MKK3RyeToKKyAgICBmcm9tIHVybGxpYi5wYXJzZSBpbXBvcnQgdXJs cGFyc2UgICMgcHlsaW50OiBkaXNhYmxlPUUwNjExCitleGNlcHQgSW1wb3J0RXJyb3I6CisgICAg ZnJvbSB1cmxwYXJzZSBpbXBvcnQgdXJscGFyc2UKIAotdG9wX2xldmVsX2RpcmVjdG9yeSA9IG9z LnBhdGgubm9ybXBhdGgob3MucGF0aC5qb2luKG9zLnBhdGguZGlybmFtZShfX2ZpbGVfXyksICIu LiIsICIuLiIpKQotc3lzLnBhdGguaW5zZXJ0KDAsIG9zLnBhdGguam9pbih0b3BfbGV2ZWxfZGly ZWN0b3J5LCAiVG9vbHMiLCAiU2NyaXB0cyIpKQogCi1mcm9tIHdlYmtpdHB5LmNvbW1vbi5jaGVj a291dC5zY20uZGV0ZWN0aW9uIGltcG9ydCBTQ01EZXRlY3RvciAgIyBub3BlcDgKLWZyb20gd2Vi a2l0cHkuY29tbW9uLnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IEV4ZWN1dGl2ZSAgIyBub3BlcDgK LWZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5maWxlc3lzdGVtIGltcG9ydCBGaWxlU3lzdGVt ICAjIG5vcGVwOAorZGVmIGdldF9idWlsZF9yZXZpc2lvbigpOgorICAgIHJldmlzaW9uID0gInVu a25vd24iCisgICAgd2l0aCBvcGVuKG9zLmRldm51bGwsICd3JykgYXMgZGV2bnVsbDoKKyAgICAg ICAgaWYgb3MucGF0aC5pc2Rpcihvcy5wYXRoLmpvaW4oJy5naXQnLCAnc3ZuJykpOgorICAgICAg ICAgICAgZm9yIGxpbmUgaW4gc3VicHJvY2Vzcy5jaGVja19vdXRwdXQoKCJnaXQiLCAic3ZuIiwg ImluZm8iKSwgc3RkZXJyPWRldm51bGwpLnNwbGl0bGluZXMoKToKKyAgICAgICAgICAgICAgICBw YXJzZWQgPSBsaW5lLnNwbGl0KGInOicpCisgICAgICAgICAgICAgICAga2V5ID0gcGFyc2VkWzBd CisgICAgICAgICAgICAgICAgY29udGVudHMgPSBiJzonLmpvaW4ocGFyc2VkWzE6XSkKKyAgICAg ICAgICAgICAgICBpZiBrZXkgPT0gYidSZXZpc2lvbic6CisgICAgICAgICAgICAgICAgICAgIHJl dmlzaW9uID0gInIlcyIgJSBjb250ZW50cy5kZWNvZGUoJ3V0Zi04Jykuc3RyaXAoKQorICAgICAg ICAgICAgICAgICAgICBicmVhaworICAgICAgICBlbGlmIG9zLnBhdGguaXNkaXIoJy5naXQnKToK KyAgICAgICAgICAgIGNvbW1pdF9tZXNzYWdlID0gc3VicHJvY2Vzcy5jaGVja19vdXRwdXQoKCJn aXQiLCAibG9nIiwgIi0xIiwgIi0tcHJldHR5PSVCIiwgIm9yaWdpbi9tYWluIiksIHN0ZGVycj1k ZXZudWxsKQorICAgICAgICAgICAgIyBDb21taXQgbWVzc2FnZXMgdGVuZCB0byBiZSBodWdlIGFu ZCB0aGUgbWV0YWRhdGEgd2UncmUgbG9va2luZworICAgICAgICAgICAgIyBmb3IgaXMgYXQgdGhl IHZlcnkgZW5kLiBBbHNvIGEgc3Bvb2ZlZCAnQ2Fub25pY2FsIGxpbmsnIG1lbnRpb24KKyAgICAg ICAgICAgICMgY291bGQgYXBwZWFyIGVhcmx5IG9uLiBTbyBtYWtlIHN1cmUgd2UgZ2V0IHRoZSBy aWdodCBtZXRhZGF0YSBieQorICAgICAgICAgICAgIyByZXZlcnNpbmcgdGhlIGNvbnRlbnRzLiBB bmQgdGhpcyBpcyBhIG1pY3JvLW9wdGltaXphdGlvbiBhcyB3ZWxsLgorICAgICAgICAgICAgZm9y IGxpbmUgaW4gcmV2ZXJzZWQoY29tbWl0X21lc3NhZ2Uuc3BsaXRsaW5lcygpKToKKyAgICAgICAg ICAgICAgICBwYXJzZWQgPSBsaW5lLnNwbGl0KGInOicpCisgICAgICAgICAgICAgICAga2V5ID0g cGFyc2VkWzBdCisgICAgICAgICAgICAgICAgY29udGVudHMgPSBiJzonLmpvaW4ocGFyc2VkWzE6 XSkKKyAgICAgICAgICAgICAgICBpZiBrZXkgPT0gYidDYW5vbmljYWwgbGluayc6CisgICAgICAg ICAgICAgICAgICAgIHVybCA9IGNvbnRlbnRzLmRlY29kZSgndXRmLTgnKS5zdHJpcCgpCisgICAg ICAgICAgICAgICAgICAgIHJldmlzaW9uID0gdXJscGFyc2UodXJsKS5wYXRoWzE6XSAgIyBzdHJp cCBsZWFkaW5nIC8KKyAgICAgICAgICAgICAgICAgICAgYnJlYWsKKyAgICAgICAgZWxzZToKKyAg ICAgICAgICAgIHJldmlzaW9uID0gInIlcyIgJSBzdWJwcm9jZXNzLmNoZWNrX291dHB1dCgoInN2 bnZlcnNpb24iKSwgc3RkZXJyPWRldm51bGwpLmRlY29kZSgndXRmLTgnKS5zdHJpcCgpCisKKyAg ICByZXR1cm4gcmV2aXNpb24KIAogZGVmIG1haW4oYXJncyk6Ci0gICAgc2NtID0gU0NNRGV0ZWN0 b3IoRmlsZVN5c3RlbSgpLCBFeGVjdXRpdmUoKSkuZGVmYXVsdF9zY20oKQotICAgIHN2bl9yZXZp c2lvbiA9IHNjbS5oZWFkX3N2bl9yZXZpc2lvbigpCi0gICAgYnVpbGRfcmV2aXNpb24gPSAicnt9 Ii5mb3JtYXQoc3ZuX3JldmlzaW9uKQorICAgIGJ1aWxkX3JldmlzaW9uID0gZ2V0X2J1aWxkX3Jl dmlzaW9uKCkKIAogICAgIGZvciBpbl9maWxlIGluIGFyZ3M6CiAgICAgICAgIGZpbGVuYW1lID0g b3MucGF0aC5iYXNlbmFtZShpbl9maWxlKQo= 435598 2021-08-16 07:22:44 -0700 2021-08-16 09:34:52 -0700 [fast-cq] Patch bug-228628-20210816072243.patch text/plain 3723 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMDgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWNkOGViNTU5MjlkODEzMDI0OWUyYWFiZTUxMzYzOWZm NDVkOWRiNy4uNWRkN2M0ZjE5MzgwYTBiYzg4NTNjZDUxNTZhMmM3ZGQzNjg0YWJjMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDIxLTA4LTE2ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbV1BFXVtHVEtdIENsZWFuIGJ1aWxkIGJyb2tlbiB3aXRoIHB5dGhvbjMgYWZ0 ZXIgcjI4MDM4MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjI4NjI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhlIHdlYmtpdHB5IGF1dG9pbnN0YWxsIGRvZXNuJ3QgcmVsaWFibHkgd29yayB3aGVuIGl0 J3MgdHJpZ2dlcmVkIGZyb20gY29uY3VycmVudAorICAgICAgICBwcm9jZXNzZXMuIFJlcGxhY2Ug d2Via2l0cHkgdXNhZ2UgaW4gYXBwbHktYnVpbGQtcmV2aXNpb24tdG8tZmlsZXMucHkgc2NyaXB0 IHdpdGggZXhwbGljaXQKKyAgICAgICAgY2FsbHMgdG8gc3ZudmVyc2lvbiwgZ2l0IHN2biBpbmZv IG9yIGdpdCBsb2cgLTEsIGRlcGVuZGluZyBvbiB0aGUga2luZCBvZiBTQ00gY2hlY2tvdXQuCisK KyAgICAgICAgKiBnbGliL2FwcGx5LWJ1aWxkLXJldmlzaW9uLXRvLWZpbGVzLnB5OgorICAgICAg ICAoZ2V0X2J1aWxkX3JldmlzaW9uKToKKyAgICAgICAgKG1haW4pOgorCiAyMDIxLTA4LTE2ICBD b21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmll d2VkLCByZXZlcnRpbmcgcjI4MTA3Ny4KZGlmZiAtLWdpdCBhL1Rvb2xzL2dsaWIvYXBwbHktYnVp bGQtcmV2aXNpb24tdG8tZmlsZXMucHkgYi9Ub29scy9nbGliL2FwcGx5LWJ1aWxkLXJldmlzaW9u LXRvLWZpbGVzLnB5CmluZGV4IDIzYTdjNWFkN2NlNjgzMThlNmEwNmFiZjgwZDk5YjFkZjI4NGM4 ZGUuLjAzYWQwNGJmMjY5NTEzNTFjMmFjYzQyOTBjY2Q4YTljYWYyN2RmNzcgMTAwNjQ0Ci0tLSBh L1Rvb2xzL2dsaWIvYXBwbHktYnVpbGQtcmV2aXNpb24tdG8tZmlsZXMucHkKKysrIGIvVG9vbHMv Z2xpYi9hcHBseS1idWlsZC1yZXZpc2lvbi10by1maWxlcy5weQpAQCAtMSw0ICsxLDMgQEAKLSMh L3Vzci9iaW4vZW52IHB5dGhvbgogIwogIyBDb3B5cmlnaHQgKEMpIDIwMjEgSWdhbGlhIFMuTC4K ICMKQEAgLTE4LDE4ICsxNyw0NSBAQAogCiBpbXBvcnQgb3MKIGltcG9ydCBzeXMKK2ltcG9ydCBz dWJwcm9jZXNzCit0cnk6CisgICAgZnJvbSB1cmxsaWIucGFyc2UgaW1wb3J0IHVybHBhcnNlICAj IHB5bGludDogZGlzYWJsZT1FMDYxMQorZXhjZXB0IEltcG9ydEVycm9yOgorICAgIGZyb20gdXJs cGFyc2UgaW1wb3J0IHVybHBhcnNlCiAKLXRvcF9sZXZlbF9kaXJlY3RvcnkgPSBvcy5wYXRoLm5v cm1wYXRoKG9zLnBhdGguam9pbihvcy5wYXRoLmRpcm5hbWUoX19maWxlX18pLCAiLi4iLCAiLi4i KSkKLXN5cy5wYXRoLmluc2VydCgwLCBvcy5wYXRoLmpvaW4odG9wX2xldmVsX2RpcmVjdG9yeSwg IlRvb2xzIiwgIlNjcmlwdHMiKSkKIAotZnJvbSB3ZWJraXRweS5jb21tb24uY2hlY2tvdXQuc2Nt LmRldGVjdGlvbiBpbXBvcnQgU0NNRGV0ZWN0b3IgICMgbm9wZXA4Ci1mcm9tIHdlYmtpdHB5LmNv bW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBFeGVjdXRpdmUgICMgbm9wZXA4Ci1mcm9tIHdl YmtpdHB5LmNvbW1vbi5zeXN0ZW0uZmlsZXN5c3RlbSBpbXBvcnQgRmlsZVN5c3RlbSAgIyBub3Bl cDgKK2RlZiBnZXRfYnVpbGRfcmV2aXNpb24oKToKKyAgICByZXZpc2lvbiA9ICJ1bmtub3duIgor ICAgIHdpdGggb3Blbihvcy5kZXZudWxsLCAndycpIGFzIGRldm51bGw6CisgICAgICAgIGlmIG9z LnBhdGguaXNkaXIob3MucGF0aC5qb2luKCcuZ2l0JywgJ3N2bicpKToKKyAgICAgICAgICAgIGZv ciBsaW5lIGluIHN1YnByb2Nlc3MuY2hlY2tfb3V0cHV0KCgiZ2l0IiwgInN2biIsICJpbmZvIiks IHN0ZGVycj1kZXZudWxsKS5zcGxpdGxpbmVzKCk6CisgICAgICAgICAgICAgICAgcGFyc2VkID0g bGluZS5zcGxpdChiJzonKQorICAgICAgICAgICAgICAgIGtleSA9IHBhcnNlZFswXQorICAgICAg ICAgICAgICAgIGNvbnRlbnRzID0gYic6Jy5qb2luKHBhcnNlZFsxOl0pCisgICAgICAgICAgICAg ICAgaWYga2V5ID09IGInUmV2aXNpb24nOgorICAgICAgICAgICAgICAgICAgICByZXZpc2lvbiA9 ICJyJXMiICUgY29udGVudHMuZGVjb2RlKCd1dGYtOCcpLnN0cmlwKCkKKyAgICAgICAgICAgICAg ICAgICAgYnJlYWsKKyAgICAgICAgZWxpZiBvcy5wYXRoLmlzZGlyKCcuZ2l0Jyk6CisgICAgICAg ICAgICBjb21taXRfbWVzc2FnZSA9IHN1YnByb2Nlc3MuY2hlY2tfb3V0cHV0KCgiZ2l0IiwgImxv ZyIsICItMSIsICItLXByZXR0eT0lQiIsICJvcmlnaW4vSEVBRCIpLCBzdGRlcnI9ZGV2bnVsbCkK KyAgICAgICAgICAgICMgQ29tbWl0IG1lc3NhZ2VzIHRlbmQgdG8gYmUgaHVnZSBhbmQgdGhlIG1l dGFkYXRhIHdlJ3JlIGxvb2tpbmcKKyAgICAgICAgICAgICMgZm9yIGlzIGF0IHRoZSB2ZXJ5IGVu ZC4gQWxzbyBhIHNwb29mZWQgJ0Nhbm9uaWNhbCBsaW5rJyBtZW50aW9uCisgICAgICAgICAgICAj IGNvdWxkIGFwcGVhciBlYXJseSBvbi4gU28gbWFrZSBzdXJlIHdlIGdldCB0aGUgcmlnaHQgbWV0 YWRhdGEgYnkKKyAgICAgICAgICAgICMgcmV2ZXJzaW5nIHRoZSBjb250ZW50cy4gQW5kIHRoaXMg aXMgYSBtaWNyby1vcHRpbWl6YXRpb24gYXMgd2VsbC4KKyAgICAgICAgICAgIGZvciBsaW5lIGlu IHJldmVyc2VkKGNvbW1pdF9tZXNzYWdlLnNwbGl0bGluZXMoKSk6CisgICAgICAgICAgICAgICAg cGFyc2VkID0gbGluZS5zcGxpdChiJzonKQorICAgICAgICAgICAgICAgIGtleSA9IHBhcnNlZFsw XQorICAgICAgICAgICAgICAgIGNvbnRlbnRzID0gYic6Jy5qb2luKHBhcnNlZFsxOl0pCisgICAg ICAgICAgICAgICAgaWYga2V5ID09IGInQ2Fub25pY2FsIGxpbmsnOgorICAgICAgICAgICAgICAg ICAgICB1cmwgPSBjb250ZW50cy5kZWNvZGUoJ3V0Zi04Jykuc3RyaXAoKQorICAgICAgICAgICAg ICAgICAgICByZXZpc2lvbiA9IHVybHBhcnNlKHVybCkucGF0aFsxOl0gICMgc3RyaXAgbGVhZGlu ZyAvCisgICAgICAgICAgICAgICAgICAgIGJyZWFrCisgICAgICAgIGVsc2U6CisgICAgICAgICAg ICByZXZpc2lvbiA9ICJyJXMiICUgc3VicHJvY2Vzcy5jaGVja19vdXRwdXQoKCJzdm52ZXJzaW9u IiksIHN0ZGVycj1kZXZudWxsKS5kZWNvZGUoJ3V0Zi04Jykuc3RyaXAoKQorCisgICAgcmV0dXJu IHJldmlzaW9uCiAKIGRlZiBtYWluKGFyZ3MpOgotICAgIHNjbSA9IFNDTURldGVjdG9yKEZpbGVT eXN0ZW0oKSwgRXhlY3V0aXZlKCkpLmRlZmF1bHRfc2NtKCkKLSAgICBzdm5fcmV2aXNpb24gPSBz Y20uaGVhZF9zdm5fcmV2aXNpb24oKQotICAgIGJ1aWxkX3JldmlzaW9uID0gInJ7fSIuZm9ybWF0 KHN2bl9yZXZpc2lvbikKKyAgICBidWlsZF9yZXZpc2lvbiA9IGdldF9idWlsZF9yZXZpc2lvbigp CiAKICAgICBmb3IgaW5fZmlsZSBpbiBhcmdzOgogICAgICAgICBmaWxlbmFtZSA9IG9zLnBhdGgu YmFzZW5hbWUoaW5fZmlsZSkK