82996 2012-04-02 19:36:28 -0700 Chromium testers should extract builds instead of building on their own 2012-04-23 00:00:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa abarth dglazkov ossy rgabor simon.fraser tony wsiegrist oldest_to_newest 594148 0 rniwa 2012-04-02 19:36:28 -0700 Chromium testers should extract builds instead of building on their own 594157 1 135262 rniwa 2012-04-02 20:03:08 -0700 Created attachment 135262 Patch 594158 2 135262 rniwa 2012-04-02 20:05:25 -0700 Comment on attachment 135262 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135262&action=review > Tools/BuildSlaveSupport/download-built-product:39 > + parser.add_option("--platform", dest="platform") > + parser.add_option("--debug", action="store_const", const="debug", dest="configuration") > + parser.add_option("--release", action="store_const", const="release", dest="configuration") Note that platform and configuration are not used at the moment. They're here for the forward compatibility. 594688 3 135262 tony 2012-04-03 11:35:43 -0700 Comment on attachment 135262 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135262&action=review > Tools/BuildSlaveSupport/built-product-archive:219 > + elif platform == 'chromium': > + removeDirectoryIfExists(configurationBuildDirectory) > + os.makedirs(configurationBuildDirectory) > + return unzipArchive(configurationBuildDirectory, configuration) This is the same as the qt, gtk, efl branch. Can we merge them? Would also be nice to do the removeDir/makedirs before the if. 594703 4 rniwa 2012-04-03 11:55:16 -0700 Thanks for the review. (In reply to comment #3) > This is the same as the qt, gtk, efl branch. Can we merge them? Would also be nice to do the removeDir/makedirs before the if. Will do. 594708 5 rniwa 2012-04-03 11:58:26 -0700 Committed r113067: <http://trac.webkit.org/changeset/113067> 594745 6 ossy 2012-04-03 12:28:32 -0700 Reopen, because it broke our Qt ARM tester bot on http://build.webkit.sed.hu http://build.webkit.sed.hu/builders/ARMv5%20Linux%20Qt%20Release%20%28Test%29/builds/6274 It's too late for me now, but I can check it tomorrow what happened. 594764 7 rniwa 2012-04-03 12:48:20 -0700 (In reply to comment #6) > Reopen, because it broke our Qt ARM tester bot on http://build.webkit.sed.hu > > http://build.webkit.sed.hu/builders/ARMv5%20Linux%20Qt%20Release%20%28Test%29/builds/6274 > > It's too late for me now, but I can check it tomorrow what happened. Yeah, addressing Tony's comment (calling removeDirectoryIfExists outside if) resulted in some bug :( It should be fixed in http://trac.webkit.org/changeset/113071. 594769 8 ossy 2012-04-03 12:51:42 -0700 (In reply to comment #7) > Yeah, addressing Tony's comment (calling removeDirectoryIfExists outside if) resulted in some bug :( It should be fixed in http://trac.webkit.org/changeset/113071. Unfortunately it didn't fix. Traceback (most recent call last): File "./Tools/BuildSlaveSupport/built-product-archive", line 218, in <module> sys.exit(main()) File "./Tools/BuildSlaveSupport/built-product-archive", line 61, in main return extractBuiltProduct(options.configuration, options.platform) File "./Tools/BuildSlaveSupport/built-product-archive", line 213, in extractBuiltProduct os.makedirs(configurationBuildDirectory) File "/usr/lib/python2.6/os.py", line 157, in makedirs mkdir(name, mode) OSError: [Errno 17] File exists: '/home/webkitbuildbot/slaves/armReleaseTest/buildslave/arm-qt-linux-release-arm-test/build/WebKitBuild/Release' 594772 9 ossy 2012-04-03 12:53:47 -0700 Oh, I think I should modify our master.cfg too after this change - http://trac.webkit.org/changeset/113067/trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 594795 10 rniwa 2012-04-03 13:16:05 -0700 (In reply to comment #9) > Oh, I think I should modify our master.cfg too after this change - http://trac.webkit.org/changeset/113067/trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg Ah, yes. You may need to adjust your master.cfg if you're using WebKIt's BuildSlaveSupport scripts. 594824 11 ossy 2012-04-03 13:36:10 -0700 I fixed our master.cfg and it works now. 594934 12 rniwa 2012-04-03 15:01:39 -0700 Build fixes: http://trac.webkit.org/changeset/113071 http://trac.webkit.org/changeset/113072 http://trac.webkit.org/changeset/113074 http://trac.webkit.org/changeset/113077 http://trac.webkit.org/changeset/113079 http://trac.webkit.org/changeset/113094 595287 13 rniwa 2012-04-04 00:28:26 -0700 More build fixes: http://trac.webkit.org/changeset/113115 http://trac.webkit.org/changeset/113124 http://trac.webkit.org/changeset/113128 http://trac.webkit.org/changeset/113134 http://trac.webkit.org/changeset/113144 135262 2012-04-02 20:03:08 -0700 2012-04-03 11:35:43 -0700 Patch bug-82996-20120402200306.patch text/plain 14071 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDExMjk3NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI4IEBACisyMDEyLTA0LTAyICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIENocm9taXVtIHRlc3RlcnMgc2hvdWxkIGV4dHJhY3QgYnVpbGRzIGluc3RlYWQg b2YgYnVpbGRpbmcgb24gdGhlaXIgb3duCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04Mjk5NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE1ha2UgQ2hyb21pdW0gYnVpbGRlcnMgdHJpZ2dnZXIgQ2hyb21pdW0g dGVzdGVycyBhbmQgbWFrZSB0ZXN0ZXJzIGRvd25sb2FkIGFuZCBleHRyYWN0IGJ1aWxkcworICAg ICAgICBmcm9tIHRoZSBidWlsZGJvdCBtYXN0ZXIgaW5zdGVhZCBvZiBidWlsZGluZyBiaW5hcmll cyBvbiB0aGVpciBvd24uCisKKyAgICAgICAgQWRkIGRvd25sb2FkLWJ1aWx0LXByb2R1Y3QgdG8g d3JhcCBjdXJsIHVzZWQgaW4gdGhlIGRvd25sb2FkLWJ1aWx0LXByb2R1Y3Qgc3RlcCBzaW5jZSBX aW5kb3dzCisgICAgICAgIGRvZXMgbm90IHByb3ZpZGUgImN1cmwiIG5hdGl2ZWx5LgorCisgICAg ICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpz b246IEFkZCBuZXcgdHJpZ2dlcmFibGVzIGZvciBDaHJvbWl1bSB0ZXN0ZXJzIGFuZCBtYWtlCisg ICAgICAgIENocm9taXVtIGJ1aWxkZXJzIHRyaWdnZXIgdGhlbS4gQWxzbyBjaGFuZ2UgdGhlIHR5 cGUgb2YgQ2hyb21pdW0gdGVzdGVycyBmcm9tIE5ld0J1aWxkQW5kVGVzdCB0byBUZXN0LgorICAg ICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5j Zmc6CisgICAgICAgIChEb3dubG9hZEJ1aWx0UHJvZHVjdCk6IENhbGwgZG93bmxvYWQtYnVpbHQt cHJvZHVjdCBpbnN0ZWFkIG9mIGN1cmwuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bHQtcHJvZHVjdC1hcmNoaXZlOgorICAgICAgICAoY3JlYXRlWmlwKTogRG9uJ3QgemlwIHRoZSBw YXJlbnQgY29uZmlndXJhdGlvbiBidWlsZCBkaXJlY3RvcnkgbGlrZSAicmVsZWFzZSIgYW5kICJk ZWJ1ZyIuIFdoaWxlIE1hYyBwb3J0CisgICAgICAgIG5lZWRzIHRoaXMgYmVoYXZpb3IgZm9yIGNv bXBhdGliaWxpdHkgcmVhc29ucywgQ2hyb21pdW0gTWFjIHBvcnQgZG9lc24ndCB3YW50IHRoaXMg YmVoYXZpb3IuCisgICAgICAgIChhcmNoaXZlQnVpbHRQcm9kdWN0KTogWmlwIHRoZSBjb25maWd1 cmF0aW9uIGJ1aWxkIGRpcmVjdG9yeSBvbiBNYWMgcG9ydC4KKyAgICAgICAgKHVuemlwQXJjaGl2 ZSk6IEV4dHJhY3RlZC4gVXNlIGRpdHRvIG9uIE1hYywgdW56aXAgb24gbGludXggYW5kIGN5Z3dp biwgYW5kIHppcGZpbGUgcGFja2FnZSBvbiBXaW5kb3dzLgorICAgICAgICAoZXh0cmFjdEJ1aWx0 UHJvZHVjdCk6IFJlZmFjdG9yIHRoZSBjb2RlIHRvIHVzZSByZW1vdmVEaXJlY3RvcnlJZkV4aXN0 cyBhbmQgdW56aXBBcmNoaXZlLiBTdXBwb3J0IENocm9taXVtLgorICAgICAgICAqIEJ1aWxkU2xh dmVTdXBwb3J0L2Rvd25sb2FkLWJ1aWx0LXByb2R1Y3Q6IEFkZGVkIHRvIHdyYXAgY3VybCB3aGlj aCBpc24ndCBhdmFpbGFibGUgb24gV2luZG93cy4KKwogMjAxMi0wNC0wMiAgT2phbiBWYWZhaSAg PG9qYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEZpeCBzbmFmdSBpbiByMTEyOTcxLiBXZSB3 ZXJlIG5ldmVyIGNhbGxpbmcgcGFyc2VQYXJhbWV0ZXIgZm9yIGJ1aWxkZXIuCkluZGV4OiBUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsdC1wcm9kdWN0LWFyY2hpdmUKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlCShyZXZpc2lvbiAx MTI5MjgpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsdC1wcm9kdWN0LWFyY2hpdmUJ KHdvcmtpbmcgY29weSkKQEAgLTEwNSw3ICsxMDUsNyBAQCBkZWYgY3JlYXRlWmlwKGRpcmVjdG9y eVRvWmlwLCBjb25maWd1cmF0CiAgICAgICAgICAgICByYWlzZQogCiAgICAgaWYgc3lzLnBsYXRm b3JtID09ICdkYXJ3aW4nOgotICAgICAgICByZXR1cm4gc3VicHJvY2Vzcy5jYWxsKFsiZGl0dG8i LCAiLWMiLCAiLWsiLCAiLS1rZWVwUGFyZW50IiwgIi0tc2VxdWVzdGVyUnNyYyIsIGRpcmVjdG9y eVRvWmlwLCBhcmNoaXZlRmlsZV0pCisgICAgICAgIHJldHVybiBzdWJwcm9jZXNzLmNhbGwoWyJk aXR0byIsICItYyIsICItayIsICItLXNlcXVlc3RlclJzcmMiLCBkaXJlY3RvcnlUb1ppcCwgYXJj aGl2ZUZpbGVdKQogICAgIGVsaWYgc3lzLnBsYXRmb3JtID09ICdjeWd3aW4nOgogICAgICAgICBy ZXR1cm4gc3VicHJvY2Vzcy5jYWxsKFsiemlwIiwgIi1yIiwgYXJjaGl2ZUZpbGUsICJiaW4iXSwg Y3dkPWRpcmVjdG9yeVRvWmlwKQogICAgIGVsaWYgc3lzLnBsYXRmb3JtID09ICd3aW4zMic6CkBA IC0xMjEsNyArMTIxLDcgQEAgZGVmIGFyY2hpdmVCdWlsdFByb2R1Y3QoY29uZmlndXJhdGlvbiwg cAogICAgIGNvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeSA9IG9zLnBhdGguam9pbihfYnVpbGRE aXJlY3RvcnksIGNvbmZpZ3VyYXRpb24udGl0bGUoKSkKIAogICAgIGlmIHBsYXRmb3JtID09ICdt YWMnOgotICAgICAgICByZXR1cm4gY3JlYXRlWmlwKGNvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9y eSwgY29uZmlndXJhdGlvbikKKyAgICAgICAgcmV0dXJuIGNyZWF0ZVppcChfYnVpbGREaXJlY3Rv cnksIGNvbmZpZ3VyYXRpb24pCiAgICAgZWxpZiBwbGF0Zm9ybSA9PSAnd2luJzoKICAgICAgICAg YmluRGlyZWN0b3J5ID0gb3MucGF0aC5qb2luKGNvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeSwg ImJpbiIpCiAgICAgICAgIHRoaW5EaXJlY3RvcnkgPSBvcy5wYXRoLmpvaW4oY29uZmlndXJhdGlv bkJ1aWxkRGlyZWN0b3J5LCAidGhpbiIpCkBAIC0xNjcsMjcgKzE2NywzOSBAQCBkZWYgYXJjaGl2 ZUJ1aWx0UHJvZHVjdChjb25maWd1cmF0aW9uLCBwCiAgICAgICAgIGNvcHlCdWlsZEZpbGVzKGNv bmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeSwgdGhpbkRpcmVjdG9yeSkKICAgICAgICAgaWYgY3Jl YXRlWmlwKHRoaW5EaXJlY3RvcnksIGNvbmZpZ3VyYXRpb24pOgogICAgICAgICAgICAgcmV0dXJu IDEKLSAgICAgICAgCisKKworZGVmIHVuemlwQXJjaGl2ZShkaXJlY3RvcnlUb0V4dHJhY3RUbywg Y29uZmlndXJhdGlvbik6CisgICAgYXJjaGl2ZURpciA9IG9zLnBhdGguYWJzcGF0aChvcy5wYXRo LmpvaW4ob3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKSwgIi4uIiwgIi4uIiwgIldlYktpdEJ1aWxk IikpCisgICAgYXNzZXJ0IG9zLnBhdGguaXNkaXIoYXJjaGl2ZURpcikKKyAgICBhcmNoaXZlRmls ZSA9IG9zLnBhdGguam9pbihhcmNoaXZlRGlyLCBjb25maWd1cmF0aW9uICsgIi56aXAiKQorCisg ICAgaWYgc3lzLnBsYXRmb3JtID09ICdkYXJ3aW4nOgorICAgICAgICBpZiBzdWJwcm9jZXNzLmNh bGwoWyJkaXR0byIsICIteCIsICItayIsIGFyY2hpdmVGaWxlLCBkaXJlY3RvcnlUb0V4dHJhY3RU b10pOgorICAgICAgICAgICAgcmV0dXJuIDEKKyAgICBlbGlmIHN5cy5wbGF0Zm9ybSA9PSAnY3ln d2luJyBvciBzeXMucGxhdGZvcm0uc3RhcnRzd2l0aCgnbGludXgnKToKKyAgICAgICAgaWYgc3Vi cHJvY2Vzcy5jYWxsKFsidW56aXAiLCAiLW8iLCBhcmNoaXZlRmlsZV0sIGN3ZD1kaXJlY3RvcnlU b0V4dHJhY3RUbyk6CisgICAgICAgICAgICByZXR1cm4gMQorICAgIGVsaWYgc3lzLnBsYXRmb3Jt ID09ICd3aW4zMic6CisgICAgICAgIGFyY2hpdmUgPSB6aXBmaWxlLlppcEZpbGUoYXJjaGl2ZUZp bGUsICJyIikKKyAgICAgICAgYXJjaGl2ZS5leHRyYWN0YWxsKGRpcmVjdG9yeVRvRXh0cmFjdFRv KQorCisgICAgb3MudW5saW5rKGFyY2hpdmVGaWxlKQorCiAKIGRlZiBleHRyYWN0QnVpbHRQcm9k dWN0KGNvbmZpZ3VyYXRpb24sIHBsYXRmb3JtKToKLSAgICBhc3NlcnQgcGxhdGZvcm0gaW4gKCdt YWMnLCAnd2luJywgJ3F0JywgJ2d0aycsICdlZmwnKQorICAgIGFzc2VydCBwbGF0Zm9ybSBpbiAo J21hYycsICd3aW4nLCAncXQnLCAnZ3RrJywgJ2VmbCcsICdjaHJvbWl1bScpCiAKICAgICBhcmNo aXZlRmlsZSA9IG9zLnBhdGguam9pbihfYnVpbGREaXJlY3RvcnksIGNvbmZpZ3VyYXRpb24gKyAi LnppcCIpCiAgICAgY29uZmlndXJhdGlvbkJ1aWxkRGlyZWN0b3J5ID0gb3MucGF0aC5qb2luKF9i dWlsZERpcmVjdG9yeSwgY29uZmlndXJhdGlvbi50aXRsZSgpKQogCiAgICAgaWYgcGxhdGZvcm0g PT0gJ21hYyc6Ci0gICAgICAgIGlmIG9zLnBhdGguaXNkaXIoY29uZmlndXJhdGlvbkJ1aWxkRGly ZWN0b3J5KToKLSAgICAgICAgICAgIHNodXRpbC5ybXRyZWUoY29uZmlndXJhdGlvbkJ1aWxkRGly ZWN0b3J5KQotCi0gICAgICAgIGlmIHN1YnByb2Nlc3MuY2FsbChbImRpdHRvIiwgIi14IiwgIi1r IiwgYXJjaGl2ZUZpbGUsIF9idWlsZERpcmVjdG9yeV0pOgotICAgICAgICAgICAgcmV0dXJuIDEK LSAgICAgICAgb3MudW5saW5rKGFyY2hpdmVGaWxlKQotCisgICAgICAgIHJlbW92ZURpcmVjdG9y eUlmRXhpc3RzKF9idWlsZERpcmVjdG9yeSkKKyAgICAgICAgb3MubWFrZWRpcnMoX2J1aWxkRGly ZWN0b3J5KQorICAgICAgICByZXR1cm4gdW56aXBBcmNoaXZlKF9idWlsZERpcmVjdG9yeSwgY29u ZmlndXJhdGlvbikKICAgICBlbGlmIHBsYXRmb3JtID09ICd3aW4nOgogICAgICAgICBiaW5EaXJl Y3RvcnkgPSBvcy5wYXRoLmpvaW4oY29uZmlndXJhdGlvbkJ1aWxkRGlyZWN0b3J5LCAiYmluIikK LSAgICAgICAgaWYgb3MucGF0aC5pc2RpcihiaW5EaXJlY3RvcnkpOgotICAgICAgICAgICAgc2h1 dGlsLnJtdHJlZShiaW5EaXJlY3RvcnkpCi0KKyAgICAgICAgcmVtb3ZlRGlyZWN0b3J5SWZFeGlz dHMoYmluRGlyZWN0b3J5KQogICAgICAgICBvcy5tYWtlZGlycyhiaW5EaXJlY3RvcnkpCiAKICAg ICAgICAgc2FmYXJpUGF0aCA9IHN1YnByb2Nlc3MuUG9wZW4oJ2N5Z3BhdGggLXcgIiRQUk9HUkFN RklMRVMiL1NhZmFyaScsCkBAIC0xOTYsMTYgKzIwOCwxNiBAQCBkZWYgZXh0cmFjdEJ1aWx0UHJv ZHVjdChjb25maWd1cmF0aW9uLCBwCiAgICAgICAgIGlmIHN1YnByb2Nlc3MuY2FsbCgnY3AgLVIg IiVzIi8qLmRsbCAiJXMiLyoucmVzb3VyY2VzICVzJyAlIChzYWZhcmlQYXRoLCBzYWZhcmlQYXRo LCBiaW5EaXJlY3RvcnkpLCBzaGVsbD1UcnVlKToKICAgICAgICAgICAgIHJldHVybiAxCiAKLSAg ICAgICAgaWYgc3VicHJvY2Vzcy5jYWxsKFsidW56aXAiLCAiLW8iLCBhcmNoaXZlRmlsZV0sIGN3 ZD1jb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnkpOgotICAgICAgICAgICAgcmV0dXJuIDEKLQor ICAgICAgICByZXR1cm4gdW56aXBBcmNoaXZlKGNvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeSwg Y29uZmlndXJhdGlvbikKICAgICBlbGlmIHBsYXRmb3JtID09ICdxdCcgb3IgcGxhdGZvcm0gPT0g J2d0aycgb3IgcGxhdGZvcm0gPT0gJ2VmbCc6Ci0gICAgICAgIGlmIG9zLnBhdGguaXNkaXIoY29u ZmlndXJhdGlvbkJ1aWxkRGlyZWN0b3J5KToKLSAgICAgICAgICAgIHNodXRpbC5ybXRyZWUoY29u ZmlndXJhdGlvbkJ1aWxkRGlyZWN0b3J5KQorICAgICAgICByZW1vdmVEaXJlY3RvcnlJZkV4aXN0 cyhjb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnkpCisgICAgICAgIG9zLm1ha2VkaXJzKGNvbmZp Z3VyYXRpb25CdWlsZERpcmVjdG9yeSkKKyAgICAgICAgcmV0dXJuIHVuemlwQXJjaGl2ZShjb25m aWd1cmF0aW9uQnVpbGREaXJlY3RvcnksIGNvbmZpZ3VyYXRpb24pCisgICAgZWxpZiBwbGF0Zm9y bSA9PSAnY2hyb21pdW0nOgorICAgICAgICByZW1vdmVEaXJlY3RvcnlJZkV4aXN0cyhjb25maWd1 cmF0aW9uQnVpbGREaXJlY3RvcnkpCisgICAgICAgIG9zLm1ha2VkaXJzKGNvbmZpZ3VyYXRpb25C dWlsZERpcmVjdG9yeSkKKyAgICAgICAgcmV0dXJuIHVuemlwQXJjaGl2ZShjb25maWd1cmF0aW9u QnVpbGREaXJlY3RvcnksIGNvbmZpZ3VyYXRpb24pCiAKLSAgICAgICAgaWYgc3VicHJvY2Vzcy5j YWxsKFsidW56aXAiLCAiLW8iLCBhcmNoaXZlRmlsZSwgIi1kIiwgY29uZmlndXJhdGlvbkJ1aWxk RGlyZWN0b3J5XSwgY3dkPV9idWlsZERpcmVjdG9yeSk6Ci0gICAgICAgICAgICByZXR1cm4gMQot ICAgICAgICBvcy51bmxpbmsoYXJjaGl2ZUZpbGUpCiAKIGlmIF9fbmFtZV9fID09ICdfX21haW5f Xyc6CiAgICAgc3lzLmV4aXQobWFpbigpKQpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv ZG93bmxvYWQtYnVpbHQtcHJvZHVjdAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3Vw cG9ydC9kb3dubG9hZC1idWlsdC1wcm9kdWN0CShyZXZpc2lvbiAwKQorKysgVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvZG93bmxvYWQtYnVpbHQtcHJvZHVjdAkocmV2aXNpb24gMCkKQEAgLTAsMCAr MSw1NiBAQAorIyEvdXNyL2Jpbi9weXRob24KKyMKKyMgQ29weXJpZ2h0IChDKSAyMDA5IEFwcGxl IEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAoQykgMjAxMiBHb29nbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisj IGFyZSBtZXQ6CisjCisjIDEuICBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCBy ZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLiAKKyMgMi4gIFJlZGlzdHJpYnV0 aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Cisj ICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRp c2NsYWltZXIgaW4gdGhlCisjICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlh bHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLiAKKyMKKyMgVEhJUyBTT0ZUV0FSRSBJ UyBQUk9WSURFRCBCWSBBUFBMRSBBTkQgSVRTIENPTlRSSUJVVE9SUyAiQVMgSVMiIEFORCBBTlkK KyMgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLCBUSEUgSU1QTElFRAorIyBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFCisjIERJU0NMQUlNRUQuIElOIE5P IEVWRU5UIFNIQUxMIEFQUExFIE9SIElUUyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkK KyMgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBD T05TRVFVRU5USUFMIERBTUFHRVMKKyMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQ Uk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOworIyBMT1NTIE9GIFVT RSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENB VVNFRCBBTkQKKyMgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJB Q1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9S IE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GCisjIFRISVMg U09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCisKKworaW1wb3J0IG9wdHBhcnNlCitpbXBvcnQgb3MKK2ltcG9ydCBzdWJwcm9jZXNzCitp bXBvcnQgc3lzCitpbXBvcnQgdXJsbGliCisKKworZGVmIG1haW4oKToKKyAgICBwYXJzZXIgPSBv cHRwYXJzZS5PcHRpb25QYXJzZXIoInVzYWdlOiAlcHJvZyBbb3B0aW9uc10gW3VybF0iKQorICAg IHBhcnNlci5hZGRfb3B0aW9uKCItLXBsYXRmb3JtIiwgZGVzdD0icGxhdGZvcm0iKQorICAgIHBh cnNlci5hZGRfb3B0aW9uKCItLWRlYnVnIiwgYWN0aW9uPSJzdG9yZV9jb25zdCIsIGNvbnN0PSJk ZWJ1ZyIsIGRlc3Q9ImNvbmZpZ3VyYXRpb24iKQorICAgIHBhcnNlci5hZGRfb3B0aW9uKCItLXJl bGVhc2UiLCBhY3Rpb249InN0b3JlX2NvbnN0IiwgY29uc3Q9InJlbGVhc2UiLCBkZXN0PSJjb25m aWd1cmF0aW9uIikKKworICAgIG9wdGlvbnMsICh1cmwsICkgPSBwYXJzZXIucGFyc2VfYXJncygp CisKKyAgICBhcmNoaXZlRGlyID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGguam9pbihvcy5wYXRo LmRpcm5hbWUoX19maWxlX18pLCAiLi4iLCAiLi4iLCAiV2ViS2l0QnVpbGQiKSkKKyAgICBpZiBu b3Qgb3MucGF0aC5pc2RpcihhcmNoaXZlRGlyKToKKyAgICAgICAgb3MubWFrZWRpcnMoYXJjaGl2 ZURpcikKKyAgICBhcmNoaXZlUGF0aCA9IG9zLnBhdGguam9pbihhcmNoaXZlRGlyLCAiJXMuemlw IiAlIG9wdGlvbnMuY29uZmlndXJhdGlvbikKKworICAgIGlmIHN5cy5wbGF0Zm9ybSA9PSAnd2lu MzInOiAgIyBjdXJsIGlzIG5vdCBhdmFpbGJsZSBvbiBXaW5kb3dzIChvdXRzaWRlIG9mIGN5Z3dp bikKKyAgICAgICAgdXJsbGliLnVybHJldHJpZXZlKHVybCwgYXJjaGl2ZVBhdGgpCisgICAgICAg IHJldHVybiAwCisKKyAgICByZXR1cm4gc3VicHJvY2Vzcy5jYWxsKFsiY3VybCIsICItLWZhaWwi LCAiLS1vdXRwdXQiLCBhcmNoaXZlUGF0aCwgdXJsXSkKKworCitpZiBfX25hbWVfXyA9PSAnX19t YWluX18nOgorICAgIHN5cy5leGl0KG1haW4oKSkKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBw b3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL2NvbmZpZy5qc29uCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL2NvbmZpZy5qc29u CShyZXZpc2lvbiAxMTI5MjgpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9jb25maWcuanNvbgkod29ya2luZyBjb3B5KQpAQCAtMjI3LDExICsyMjcs MTEgQEAKICAgICAgICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICAgICJuYW1l IjogIkNocm9taXVtIFdpbiBSZWxlYXNlIiwgInR5cGUiOiAiQnVpbGQiLCAiYnVpbGRkaXIiOiAi Y2hyb21pdW0td2luLXJlbGVhc2UiLAogICAgICAgICAgICAgICAgICAgICAgICJwbGF0Zm9ybSI6 ICJjaHJvbWl1bS13aW4iLCAiY29uZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwgImFyY2hpdGVjdHVy ZXMiOiBbImkzODYiXSwKLSAgICAgICAgICAgICAgICAgICAgICAidXBsb2FkIjogdHJ1ZSwKKyAg ICAgICAgICAgICAgICAgICAgICAidHJpZ2dlcnMiOiBbImNocm9taXVtLXdpbi1yZWxlYXNlLXRl c3RzIl0sCiAgICAgICAgICAgICAgICAgICAgICAgInNsYXZlbmFtZXMiOiBbImdvb2dsZS13aW5k b3dzLTEiXQogICAgICAgICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgICAgICAgICB7Ci0g ICAgICAgICAgICAgICAgICAgICAgIm5hbWUiOiAiQ2hyb21pdW0gV2luIFJlbGVhc2UgKFRlc3Rz KSIsICJ0eXBlIjogIk5ld0J1aWxkQW5kVGVzdCIsICJidWlsZGRpciI6ICJjaHJvbWl1bS13aW4t cmVsZWFzZS10ZXN0cyIsCisgICAgICAgICAgICAgICAgICAgICAgIm5hbWUiOiAiQ2hyb21pdW0g V2luIFJlbGVhc2UgKFRlc3RzKSIsICJ0eXBlIjogIlRlc3QiLCAiYnVpbGRkaXIiOiAiY2hyb21p dW0td2luLXJlbGVhc2UtdGVzdHMiLAogICAgICAgICAgICAgICAgICAgICAgICJwbGF0Zm9ybSI6 ICJjaHJvbWl1bS13aW4iLCAiY29uZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwgImFyY2hpdGVjdHVy ZXMiOiBbImkzODYiXSwKICAgICAgICAgICAgICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsiZ29v Z2xlLXdpbmRvd3MtMiJdCiAgICAgICAgICAgICAgICAgICAgIH0sCkBAIC0yNDMsMTEgKzI0Mywx MSBAQAogICAgICAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgICAgICAgIm5hbWUi OiAiQ2hyb21pdW0gTWFjIFJlbGVhc2UiLCAidHlwZSI6ICJCdWlsZCIsICJidWlsZGRpciI6ICJj aHJvbWl1bS1tYWMtcmVsZWFzZSIsCiAgICAgICAgICAgICAgICAgICAgICAgInBsYXRmb3JtIjog ImNocm9taXVtLW1hYyIsICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLCAiYXJjaGl0ZWN0dXJl cyI6IFsiaTM4NiJdLAotICAgICAgICAgICAgICAgICAgICAgICJ1cGxvYWQiOiB0cnVlLAorICAg ICAgICAgICAgICAgICAgICAgICJ0cmlnZ2VycyI6IFsiY2hyb21pdW0tbWFjLXJlbGVhc2UtdGVz dHMiXSwKICAgICAgICAgICAgICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsiZ29vZ2xlLW1hYy0x IiwgImdvb2dsZS1tYWMtMyJdCiAgICAgICAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAg ICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJDaHJvbWl1bSBNYWMgUmVs ZWFzZSAoVGVzdHMpIiwgInR5cGUiOiAiTmV3QnVpbGRBbmRUZXN0IiwgImJ1aWxkZGlyIjogImNo cm9taXVtLW1hYy1yZWxlYXNlLXRlc3RzIiwKKyAgICAgICAgICAgICAgICAgICAgICAibmFtZSI6 ICJDaHJvbWl1bSBNYWMgUmVsZWFzZSAoVGVzdHMpIiwgInR5cGUiOiAiVGVzdCIsICJidWlsZGRp ciI6ICJjaHJvbWl1bS1tYWMtcmVsZWFzZS10ZXN0cyIsCiAgICAgICAgICAgICAgICAgICAgICAg InBsYXRmb3JtIjogImNocm9taXVtLW1hYyIsICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLCAi YXJjaGl0ZWN0dXJlcyI6IFsiaTM4NiJdLAogICAgICAgICAgICAgICAgICAgICAgICJzbGF2ZW5h bWVzIjogWyJnb29nbGUtbWFjLTIiLCAiZ29vZ2xlLW1hYy00Il0KICAgICAgICAgICAgICAgICAg ICAgfSwKQEAgLTI1OSwxMSArMjU5LDExIEBACiAgICAgICAgICAgICAgICAgICAgIHsKICAgICAg ICAgICAgICAgICAgICAgICAibmFtZSI6ICJDaHJvbWl1bSBMaW51eCBSZWxlYXNlIiwgInR5cGUi OiAiQnVpbGQiLCAiYnVpbGRkaXIiOiAiY2hyb21pdW0tbGludXgtcmVsZWFzZSIsCiAgICAgICAg ICAgICAgICAgICAgICAgInBsYXRmb3JtIjogImNocm9taXVtLWxpbnV4IiwgImNvbmZpZ3VyYXRp b24iOiAicmVsZWFzZSIsICJhcmNoaXRlY3R1cmVzIjogWyJpMzg2Il0sCi0gICAgICAgICAgICAg ICAgICAgICAgInVwbG9hZCI6IHRydWUsCisgICAgICAgICAgICAgICAgICAgICAgInRyaWdnZXJz IjogWyJjaHJvbWl1bS1saW51eC1yZWxlYXNlLXRlc3RzIl0sCiAgICAgICAgICAgICAgICAgICAg ICAgInNsYXZlbmFtZXMiOiBbImdvb2dsZS1saW51eC0xIl0KICAgICAgICAgICAgICAgICAgICAg fSwKICAgICAgICAgICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICAgICAgICJuYW1lIjog IkNocm9taXVtIExpbnV4IFJlbGVhc2UgKFRlc3RzKSIsICJ0eXBlIjogIk5ld0J1aWxkQW5kVGVz dCIsICJidWlsZGRpciI6ICJjaHJvbWl1bS1saW51eC1yZWxlYXNlLXRlc3RzIiwKKyAgICAgICAg ICAgICAgICAgICAgICAibmFtZSI6ICJDaHJvbWl1bSBMaW51eCBSZWxlYXNlIChUZXN0cykiLCAi dHlwZSI6ICJUZXN0IiwgImJ1aWxkZGlyIjogImNocm9taXVtLWxpbnV4LXJlbGVhc2UtdGVzdHMi LAogICAgICAgICAgICAgICAgICAgICAgICJwbGF0Zm9ybSI6ICJjaHJvbWl1bS1saW51eCIsICJj b25maWd1cmF0aW9uIjogInJlbGVhc2UiLCAiYXJjaGl0ZWN0dXJlcyI6IFsiaTM4NiJdLAogICAg ICAgICAgICAgICAgICAgICAgICJzbGF2ZW5hbWVzIjogWyJnb29nbGUtbGludXgtMiJdCiAgICAg ICAgICAgICAgICAgICAgIH0sCkBAIC0zNTUsNiArMzU1LDE1IEBACiAgICAgICAgICAgICAgICAg ICAgIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgInR5cGUiOiAiVHJpZ2dlcmFibGUiLCAibmFt ZSI6ICJ3aW4tcmVsZWFzZS10ZXN0cy13azIiLAogICAgICAgICAgICAgICAgICAgICAgICJidWls ZGVyTmFtZXMiOiBbIldpbmRvd3MgNyBSZWxlYXNlIChXZWJLaXQyIFRlc3RzKSJdCisgICAgICAg ICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgICAgIHsgInR5cGUiOiAiVHJpZ2dlcmFi bGUiLCAibmFtZSI6ICJjaHJvbWl1bS13aW4tcmVsZWFzZS10ZXN0cyIsCisgICAgICAgICAgICAg ICAgICAgICAgImJ1aWxkZXJOYW1lcyI6IFsiQ2hyb21pdW0gV2luIFJlbGVhc2UgKFRlc3RzKSJd CisgICAgICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgICAgIHsgInR5cGUiOiAi VHJpZ2dlcmFibGUiLCAibmFtZSI6ICJjaHJvbWl1bS1tYWMtcmVsZWFzZS10ZXN0cyIsCisgICAg ICAgICAgICAgICAgICAgICAgImJ1aWxkZXJOYW1lcyI6IFsiQ2hyb21pdW0gTWFjIFJlbGVhc2Ug KFRlc3RzKSJdCisgICAgICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgICAgIHsg InR5cGUiOiAiVHJpZ2dlcmFibGUiLCAibmFtZSI6ICJjaHJvbWl1bS1saW51eC1yZWxlYXNlLXRl c3RzIiwKKyAgICAgICAgICAgICAgICAgICAgICAiYnVpbGRlck5hbWVzIjogWyJDaHJvbWl1bSBM aW51eCBSZWxlYXNlIChUZXN0cykiXQogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg ICAgICAgICBdCiB9CkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQu b3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBw b3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcJKHJldmlzaW9uIDExMjkyOCkK KysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rl ci5jZmcJKHdvcmtpbmcgY29weSkKQEAgLTIzNCw3ICsyMzQsOSBAQCBjbGFzcyBVcGxvYWRCdWls dFByb2R1Y3QodHJhbnNmZXIuRmlsZVVwCiAKIAogY2xhc3MgRG93bmxvYWRCdWlsdFByb2R1Y3Qo c2hlbGwuU2hlbGxDb21tYW5kKToKLSAgICBjb21tYW5kID0gWyJjdXJsIiwgIi0tZmFpbCIsICIt LW91dHB1dCIsIFdpdGhQcm9wZXJ0aWVzKCJXZWJLaXRCdWlsZC8lKGNvbmZpZ3VyYXRpb24pcy56 aXAiKSwgV2l0aFByb3BlcnRpZXMoY1siYnVpbGRib3RVUkwiXSArICJhcmNoaXZlcy8lKGZ1bGxQ bGF0Zm9ybSlzLSUoYXJjaGl0ZWN0dXJlKXMtJShjb25maWd1cmF0aW9uKXMvJShnb3RfcmV2aXNp b24pcy56aXAiKV0KKyAgICBjb21tYW5kID0gWyJweXRob24iLCAiLi9Ub29scy9CdWlsZFNsYXZl U3VwcG9ydC9kb3dubG9hZC1idWlsdC1wcm9kdWN0IiwKKyAgICAgICAgV2l0aFByb3BlcnRpZXMo Ii0tcGxhdGZvcm09JShwbGF0Zm9ybSlzIiksIFdpdGhQcm9wZXJ0aWVzKCItLSUoY29uZmlndXJh dGlvbilzIiksCisgICAgICAgIFdpdGhQcm9wZXJ0aWVzKGNbImJ1aWxkYm90VVJMIl0gKyAiYXJj aGl2ZXMvJShmdWxsUGxhdGZvcm0pcy0lKGFyY2hpdGVjdHVyZSlzLSUoY29uZmlndXJhdGlvbilz LyUoZ290X3JldmlzaW9uKXMuemlwIildCiAgICAgbmFtZSA9ICJkb3dubG9hZC1idWlsdC1wcm9k dWN0IgogICAgIGRlc2NyaXB0aW9uID0gWyJkb3dubG9hZGluZyBidWlsdCBwcm9kdWN0Il0KICAg ICBkZXNjcmlwdGlvbkRvbmUgPSBbImRvd25sb2FkZWQgYnVpbHQgcHJvZHVjdCJdCg==