217834 2020-10-16 10:22:05 -0700 [build.webkit.org] Use feature flag to support Buildbot 2 code 2021-02-08 07:37:49 -0800 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 175056 1 aakash_jain aakash_jain aakash_jain ap dewei_zhu jbedard ryanhaddad webkit-bug-importer oldest_to_newest 1698663 0 aakash_jain 2020-10-16 10:22:05 -0700 Use feature flag in build.webkit.org code to support both Buildbot 0.8 as well as Buildbot 2 code. Current code is for Buildbot 0.8. We are planning to update to latest Buildbot (https://bugs.webkit.org/show_bug.cgi?id=175056). 1698665 1 411595 aakash_jain 2020-10-16 10:25:08 -0700 Created attachment 411595 Patch 1698667 2 aakash_jain 2020-10-16 10:37:08 -0700 Tested on uat instance. 1698728 3 411608 aakash_jain 2020-10-16 13:28:00 -0700 Created attachment 411608 Patch 1698730 4 411608 jbedard 2020-10-16 13:36:22 -0700 Comment on attachment 411608 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=411608&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py:161 > + builder['category'] = category Weren't we setting the category before? This seems like a change in behavior for the current buildbot. 1698733 5 411608 aakash_jain 2020-10-16 13:43:45 -0700 Comment on attachment 411608 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=411608&action=review >> Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py:161 >> + builder['category'] = category > > Weren't we setting the category before? This seems like a change in behavior for the current buildbot. We were setting builder['category'] before as well. Now we are setting the 'category' variable and later assigning it to builder['category'], but only for old-buildbot-version. There shouldn't be any change in behavior for current buildbot (0.8.6p1). For new Buildbot version we will be using tags (in subsequent patch). As per http://docs.buildbot.net/latest/relnotes/0.9.0.html#changes-and-removals "Builders now have “tags” instead of a category. Builders can have multiple tags, allowing more flexible builder displays." 1699327 6 ews-feeder 2020-10-19 11:17:23 -0700 Committed r268674: <https://trac.webkit.org/changeset/268674> All reviewed patches have been landed. Closing bug and clearing flags on attachment 411608. 1699330 7 webkit-bug-importer 2020-10-19 11:18:26 -0700 <rdar://problem/70448398> 1699731 8 aakash_jain 2020-10-20 08:43:36 -0700 (In reply to Aakash Jain from comment #5) > For new Buildbot version we will be using tags (in subsequent patch). Adding tags for new Buildbot version in https://bugs.webkit.org/show_bug.cgi?id=217958 411595 2020-10-16 10:25:08 -0700 2020-10-16 13:27:57 -0700 Patch bug-217834-20201016132507.patch text/plain 5024 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2ODU5NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDIwLTEwLTE2ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbYnVpbGQud2Via2l0Lm9yZ10gVXNlIGZlYXR1cmUgZmxhZyB0byBzdXBw b3J0IEJ1aWxkYm90IDIgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE3ODM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9s b2FkQ29uZmlnLnB5OgorICAgICAgICAobG9hZEJ1aWxkZXJDb25maWcpOgorCiAyMDIwLTEwLTE2 ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbYnVpbGQu d2Via2l0Lm9yZ10gQWRkIGNvcHlyaWdodCBtZXNzYWdlIHRvIHN0ZXBzX3VuaXR0ZXN0LnB5Cklu ZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9sb2Fk Q29uZmlnLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL2xvYWRDb25maWcucHkJKHJldmlzaW9uIDI2ODU5NSkKKysrIFRvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL2xvYWRDb25maWcucHkJ KHdvcmtpbmcgY29weSkKQEAgLTIwLDcgKzIwLDEzIEBACiAjIE9SIFRPUlQgKElOQ0xVRElORyBO RUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNF CiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkg T0YgU1VDSCBEQU1BR0UuCiAKLWZyb20gYnVpbGRib3QuYnVpbGRzbGF2ZSBpbXBvcnQgQnVpbGRT bGF2ZQoraW1wb3J0IG9zCitVU0VfQlVJTERCT1RfVkVSU0lPTjIgPSBvcy5nZXRlbnYoJ1VTRV9C VUlMREJPVF9WRVJTSU9OMicpIGlzIG5vdCBOb25lCisKK2lmIFVTRV9CVUlMREJPVF9WRVJTSU9O MjoKKyAgICBmcm9tIGJ1aWxkYm90LndvcmtlciBpbXBvcnQgV29ya2VyCitlbHNlOgorICAgIGZy b20gYnVpbGRib3QuYnVpbGRzbGF2ZSBpbXBvcnQgQnVpbGRTbGF2ZQogZnJvbSBidWlsZGJvdC5z Y2hlZHVsZXIgaW1wb3J0IEFueUJyYW5jaFNjaGVkdWxlciwgVHJpZ2dlcmFibGUsIE5pZ2h0bHkK IGZyb20gYnVpbGRib3Quc2NoZWR1bGVycy5mb3JjZXNjaGVkIGltcG9ydCBGaXhlZFBhcmFtZXRl ciwgRm9yY2VTY2hlZHVsZXIsIFN0cmluZ1BhcmFtZXRlciwgQm9vbGVhblBhcmFtZXRlcgogZnJv bSBidWlsZGJvdC5zY2hlZHVsZXJzLmZpbHRlciBpbXBvcnQgQ2hhbmdlRmlsdGVyCkBAIC01OCw3 ICs2NCwxMCBAQCBkZWYgbG9hZEJ1aWxkZXJDb25maWcoYywgdGVzdF9tb2RlX2lzX2VuCiAgICAg ICAgIG9zLmVudmlyb25bJ1JFU1VMVFNfU0VSVkVSX0FQSV9LRVknXSA9IHJlc3VsdHNfc2VydmVy X2FwaV9rZXkKIAogICAgIGNvbmZpZyA9IGpzb24ubG9hZChvcGVuKCdjb25maWcuanNvbicpKQot ICAgIGNbJ3NsYXZlcyddID0gW0J1aWxkU2xhdmUod29ya2VyWyduYW1lJ10sIHBhc3N3b3Jkc1t3 b3JrZXJbJ25hbWUnXV0sIG1heF9idWlsZHM9MSkgZm9yIHdvcmtlciBpbiBjb25maWdbJ3dvcmtl cnMnXV0KKyAgICBpZiBVU0VfQlVJTERCT1RfVkVSU0lPTjI6CisgICAgICAgIGNbJ3dvcmtlcnMn XSA9IFtXb3JrZXIod29ya2VyWyduYW1lJ10sIHBhc3N3b3Jkcy5nZXQod29ya2VyWyduYW1lJ10s ICdwYXNzd29yZCcpLCBtYXhfYnVpbGRzPTEpIGZvciB3b3JrZXIgaW4gY29uZmlnWyd3b3JrZXJz J11dCisgICAgZWxzZToKKyAgICAgICAgY1snc2xhdmVzJ10gPSBbQnVpbGRTbGF2ZSh3b3JrZXJb J25hbWUnXSwgcGFzc3dvcmRzW3dvcmtlclsnbmFtZSddXSwgbWF4X2J1aWxkcz0xKSBmb3Igd29y a2VyIGluIGNvbmZpZ1snd29ya2VycyddXQogCiAgICAgY1snc2NoZWR1bGVycyddID0gW10KICAg ICBmb3Igc2NoZWR1bGVyIGluIGNvbmZpZ1snc2NoZWR1bGVycyddOgpAQCAtOTksNyArMTA4LDgg QEAgZGVmIGxvYWRCdWlsZGVyQ29uZmlnKGMsIHRlc3RfbW9kZV9pc19lbgogICAgICAgICAgICAg ICAgICAgICByYWlzZSBFeGNlcHRpb24oJ0J1aWxkZXIge30gaXMgZm9yIHBsYXRmb3JtIHt9IGJ1 dCBoYXMgd29ya2VyIHt9IGZvciBwbGF0Zm9ybSB7fSEnLmZvcm1hdChidWlsZGVyWyduYW1lJ10s IGJ1aWxkZXJbJ3BsYXRmb3JtJ10sIHdvcmtlclsnbmFtZSddLCB3b3JrZXJbJ3BsYXRmb3JtJ10p KQogICAgICAgICAgICAgICAgIGJyZWFrCiAKLSAgICAgICAgYnVpbGRlclsnc2xhdmVuYW1lcydd ID0gYnVpbGRlci5wb3AoJ3dvcmtlcm5hbWVzJykgICMgV29ya2Fyb3VuZCBmb3Igb2xkIGJ1aWxk Ym90IHRvIGFsbG93IHVzaW5nIHdvcmtlcm5hbWVzIGluIGNvbmZpZy5qc29uIGluc3RlYWQgb2Yg c2xhdmVuYW1lcworICAgICAgICBpZiBub3QgVVNFX0JVSUxEQk9UX1ZFUlNJT04yOgorICAgICAg ICAgICAgYnVpbGRlclsnc2xhdmVuYW1lcyddID0gYnVpbGRlci5wb3AoJ3dvcmtlcm5hbWVzJykK ICAgICAgICAgcGxhdGZvcm0gPSBidWlsZGVyWydwbGF0Zm9ybSddCiAKICAgICAgICAgZmFjdG9y eU5hbWUgPSBidWlsZGVyLnBvcCgnZmFjdG9yeScpCkBAIC0xMTgsMzIgKzEyOCwzNyBAQCBkZWYg bG9hZEJ1aWxkZXJDb25maWcoYywgdGVzdF9tb2RlX2lzX2VuCiAgICAgICAgIGlmIG5vdCBidWls ZGJvdF9pZGVudGlmaWVyc19yZS5tYXRjaChidWlsZGVyX25hbWUpOgogICAgICAgICAgICAgcmFp c2UgRXhjZXB0aW9uKCdCdWlsZGVyIG5hbWUgInt9IiBpcyBub3QgYSB2YWxpZCBidWlsZGJvdCBp ZGVudGlmaWVyLicuZm9ybWF0KGJ1aWxkZXJfbmFtZSkpCiAgICAgICAgIGZvciBzdGVwIGluIGJ1 aWxkZXJbImZhY3RvcnkiXS5zdGVwczoKLSAgICAgICAgICAgIHN0ZXBfbmFtZSA9IHN0ZXBbMF0u bmFtZQorICAgICAgICAgICAgaWYgVVNFX0JVSUxEQk9UX1ZFUlNJT04yOgorICAgICAgICAgICAg ICAgIHN0ZXBfbmFtZSA9IHN0ZXAuYnVpbGRTdGVwKCkubmFtZQorICAgICAgICAgICAgZWxzZToK KyAgICAgICAgICAgICAgICBzdGVwX25hbWUgPSBzdGVwWzBdLm5hbWUKICAgICAgICAgICAgIGlm IGxlbihzdGVwX25hbWUpID4gU1RFUF9OQU1FX0xFTkdUSF9MSU1JVDoKICAgICAgICAgICAgICAg ICByYWlzZSBFeGNlcHRpb24oJ3N0ZXAgbmFtZSAie30iIGlzIGxvbmdlciB0aGFuIG1heGltdW0g YWxsb3dlZCBieSBCdWlsZGJvdCAoe30gY2hhcmFjdGVycykuJy5mb3JtYXQoc3RlcF9uYW1lLCBT VEVQX05BTUVfTEVOR1RIX0xJTUlUKSkKICAgICAgICAgICAgIGlmIG5vdCBidWlsZGJvdF9pZGVu dGlmaWVyc19yZS5tYXRjaChzdGVwX25hbWUpOgogICAgICAgICAgICAgICAgIHJhaXNlIEV4Y2Vw dGlvbignc3RlcCBuYW1lICJ7fSIgaXMgbm90IGEgdmFsaWQgYnVpbGRib3QgaWRlbnRpZmllci4n LmZvcm1hdChzdGVwX25hbWUpKQogCiAgICAgICAgIGlmIHBsYXRmb3JtLnN0YXJ0c3dpdGgoJ21h YycpOgotICAgICAgICAgICAgYnVpbGRlclsiY2F0ZWdvcnkiXSA9ICdBcHBsZU1hYycKKyAgICAg ICAgICAgIGNhdGVnb3J5ID0gJ0FwcGxlTWFjJwogICAgICAgICBlbGlmIHBsYXRmb3JtLnN0YXJ0 c3dpdGgoJ2lvcycpOgotICAgICAgICAgICAgYnVpbGRlclsnY2F0ZWdvcnknXSA9ICdpT1MnCisg ICAgICAgICAgICBjYXRlZ29yeSA9ICdpT1MnCiAgICAgICAgIGVsaWYgcGxhdGZvcm0gPT0gJ3dp bic6Ci0gICAgICAgICAgICBidWlsZGVyWyJjYXRlZ29yeSJdID0gJ0FwcGxlV2luJworICAgICAg ICAgICAgY2F0ZWdvcnkgPSAnQXBwbGVXaW4nCiAgICAgICAgIGVsaWYgcGxhdGZvcm0uc3RhcnRz d2l0aCgnZ3RrJyk6Ci0gICAgICAgICAgICBidWlsZGVyWyJjYXRlZ29yeSJdID0gJ0dUSycKKyAg ICAgICAgICAgIGNhdGVnb3J5ID0gJ0dUSycKICAgICAgICAgZWxpZiBwbGF0Zm9ybS5zdGFydHN3 aXRoKCd3cGUnKToKLSAgICAgICAgICAgIGJ1aWxkZXJbImNhdGVnb3J5Il0gPSAnV1BFJworICAg ICAgICAgICAgY2F0ZWdvcnkgPSAnV1BFJwogICAgICAgICBlbGlmIHBsYXRmb3JtID09ICd3aW5j YWlybyc6Ci0gICAgICAgICAgICBidWlsZGVyWyJjYXRlZ29yeSJdID0gJ1dpbkNhaXJvJworICAg ICAgICAgICAgY2F0ZWdvcnkgPSAnV2luQ2Fpcm8nCiAgICAgICAgIGVsaWYgcGxhdGZvcm0uc3Rh cnRzd2l0aCgncGxheXN0YXRpb24nKToKLSAgICAgICAgICAgIGJ1aWxkZXJbImNhdGVnb3J5Il0g PSAnUGxheVN0YXRpb24nCisgICAgICAgICAgICBjYXRlZ29yeSA9ICdQbGF5U3RhdGlvbicKICAg ICAgICAgZWxzZToKLSAgICAgICAgICAgIGJ1aWxkZXJbImNhdGVnb3J5Il0gPSAnbWlzYycKKyAg ICAgICAgICAgIGNhdGVnb3J5ID0gJ21pc2MnCiAKLSAgICAgICAgaWYgKGJ1aWxkZXJbJ2NhdGVn b3J5J10gaW4gKCdBcHBsZU1hYycsICdBcHBsZVdpbicsICdpT1MnKSkgYW5kIGZhY3RvcnlOYW1l ICE9ICdCdWlsZEZhY3RvcnknOgorICAgICAgICBpZiAoY2F0ZWdvcnkgaW4gKCdBcHBsZU1hYycs ICdBcHBsZVdpbicsICdpT1MnKSkgYW5kIGZhY3RvcnlOYW1lICE9ICdCdWlsZEZhY3RvcnknOgog ICAgICAgICAgICAgYnVpbGRlclsnbmV4dEJ1aWxkJ10gPSBwaWNrTGF0ZXN0QnVpbGQKIAorICAg ICAgICBpZiBub3QgVVNFX0JVSUxEQk9UX1ZFUlNJT04yOgorICAgICAgICAgICAgYnVpbGRlclsn Y2F0ZWdvcnknXSA9IGNhdGVnb3J5CiAgICAgICAgIGNbJ2J1aWxkZXJzJ10uYXBwZW5kKGJ1aWxk ZXIpCiAKIAo= 411608 2020-10-16 13:28:00 -0700 2020-10-19 11:17:23 -0700 Patch bug-217834-20201016162758.patch text/plain 5072 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2ODYwOCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDIwLTEwLTE2ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbYnVpbGQud2Via2l0Lm9yZ10gVXNlIGZlYXR1cmUgZmxhZyB0byBzdXBw b3J0IEJ1aWxkYm90IDIgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE3ODM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9s b2FkQ29uZmlnLnB5OgorICAgICAgICAobG9hZEJ1aWxkZXJDb25maWcpOgorCiAyMDIwLTEwLTE2 ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBbVGVzdGluZ10gU3Vw cG9ydCBjb25maWd1cmluZyBhbnkgcHJlZmVyZW5jZSBmcm9tIHRlc3QgaGVhZGVycyBmb3IgV2Vi S2l0VGVzdFJ1bm5lcgpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvbG9hZENvbmZpZy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZl U3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9sb2FkQ29uZmlnLnB5CShyZXZpc2lvbiAy Njg2MDgpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZp Zy9sb2FkQ29uZmlnLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yMCw3ICsyMCwxMyBAQAogIyBPUiBU T1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdB WSBPVVQgT0YgVEhFIFVTRQogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0Yg VEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCi1mcm9tIGJ1aWxkYm90LmJ1aWxkc2xh dmUgaW1wb3J0IEJ1aWxkU2xhdmUKK2ltcG9ydCBvcworVVNFX0JVSUxEQk9UX1ZFUlNJT04yID0g b3MuZ2V0ZW52KCdVU0VfQlVJTERCT1RfVkVSU0lPTjInKSBpcyBub3QgTm9uZQorCitpZiBVU0Vf QlVJTERCT1RfVkVSU0lPTjI6CisgICAgZnJvbSBidWlsZGJvdC53b3JrZXIgaW1wb3J0IFdvcmtl cgorZWxzZToKKyAgICBmcm9tIGJ1aWxkYm90LmJ1aWxkc2xhdmUgaW1wb3J0IEJ1aWxkU2xhdmUK IGZyb20gYnVpbGRib3Quc2NoZWR1bGVyIGltcG9ydCBBbnlCcmFuY2hTY2hlZHVsZXIsIFRyaWdn ZXJhYmxlLCBOaWdodGx5CiBmcm9tIGJ1aWxkYm90LnNjaGVkdWxlcnMuZm9yY2VzY2hlZCBpbXBv cnQgRml4ZWRQYXJhbWV0ZXIsIEZvcmNlU2NoZWR1bGVyLCBTdHJpbmdQYXJhbWV0ZXIsIEJvb2xl YW5QYXJhbWV0ZXIKIGZyb20gYnVpbGRib3Quc2NoZWR1bGVycy5maWx0ZXIgaW1wb3J0IENoYW5n ZUZpbHRlcgpAQCAtNTgsNyArNjQsMTAgQEAgZGVmIGxvYWRCdWlsZGVyQ29uZmlnKGMsIGlzX3Rl c3RfbW9kZV9lbgogICAgICAgICBvcy5lbnZpcm9uWydSRVNVTFRTX1NFUlZFUl9BUElfS0VZJ10g PSByZXN1bHRzX3NlcnZlcl9hcGlfa2V5CiAKICAgICBjb25maWcgPSBqc29uLmxvYWQob3Blbign Y29uZmlnLmpzb24nKSkKLSAgICBjWydzbGF2ZXMnXSA9IFtCdWlsZFNsYXZlKHdvcmtlclsnbmFt ZSddLCBwYXNzd29yZHMuZ2V0KHdvcmtlclsnbmFtZSddLCAncGFzc3dvcmQnKSwgbWF4X2J1aWxk cz0xKSBmb3Igd29ya2VyIGluIGNvbmZpZ1snd29ya2VycyddXQorICAgIGlmIFVTRV9CVUlMREJP VF9WRVJTSU9OMjoKKyAgICAgICAgY1snd29ya2VycyddID0gW1dvcmtlcih3b3JrZXJbJ25hbWUn XSwgcGFzc3dvcmRzLmdldCh3b3JrZXJbJ25hbWUnXSwgJ3Bhc3N3b3JkJyksIG1heF9idWlsZHM9 MSkgZm9yIHdvcmtlciBpbiBjb25maWdbJ3dvcmtlcnMnXV0KKyAgICBlbHNlOgorICAgICAgICBj WydzbGF2ZXMnXSA9IFtCdWlsZFNsYXZlKHdvcmtlclsnbmFtZSddLCBwYXNzd29yZHMuZ2V0KHdv cmtlclsnbmFtZSddLCAncGFzc3dvcmQnKSwgbWF4X2J1aWxkcz0xKSBmb3Igd29ya2VyIGluIGNv bmZpZ1snd29ya2VycyddXQogCiAgICAgY1snc2NoZWR1bGVycyddID0gW10KICAgICBmb3Igc2No ZWR1bGVyIGluIGNvbmZpZ1snc2NoZWR1bGVycyddOgpAQCAtOTksNyArMTA4LDggQEAgZGVmIGxv YWRCdWlsZGVyQ29uZmlnKGMsIGlzX3Rlc3RfbW9kZV9lbgogICAgICAgICAgICAgICAgICAgICBy YWlzZSBFeGNlcHRpb24oJ0J1aWxkZXIge30gaXMgZm9yIHBsYXRmb3JtIHt9IGJ1dCBoYXMgd29y a2VyIHt9IGZvciBwbGF0Zm9ybSB7fSEnLmZvcm1hdChidWlsZGVyWyduYW1lJ10sIGJ1aWxkZXJb J3BsYXRmb3JtJ10sIHdvcmtlclsnbmFtZSddLCB3b3JrZXJbJ3BsYXRmb3JtJ10pKQogICAgICAg ICAgICAgICAgIGJyZWFrCiAKLSAgICAgICAgYnVpbGRlclsnc2xhdmVuYW1lcyddID0gYnVpbGRl ci5wb3AoJ3dvcmtlcm5hbWVzJykgICMgV29ya2Fyb3VuZCBmb3Igb2xkIGJ1aWxkYm90IHRvIGFs bG93IHVzaW5nIHdvcmtlcm5hbWVzIGluIGNvbmZpZy5qc29uIGluc3RlYWQgb2Ygc2xhdmVuYW1l cworICAgICAgICBpZiBub3QgVVNFX0JVSUxEQk9UX1ZFUlNJT04yOgorICAgICAgICAgICAgYnVp bGRlclsnc2xhdmVuYW1lcyddID0gYnVpbGRlci5wb3AoJ3dvcmtlcm5hbWVzJykKICAgICAgICAg cGxhdGZvcm0gPSBidWlsZGVyWydwbGF0Zm9ybSddCiAKICAgICAgICAgZmFjdG9yeU5hbWUgPSBi dWlsZGVyLnBvcCgnZmFjdG9yeScpCkBAIC0xMTgsMzIgKzEyOCwzNyBAQCBkZWYgbG9hZEJ1aWxk ZXJDb25maWcoYywgaXNfdGVzdF9tb2RlX2VuCiAgICAgICAgIGlmIG5vdCBidWlsZGJvdF9pZGVu dGlmaWVyc19yZS5tYXRjaChidWlsZGVyX25hbWUpOgogICAgICAgICAgICAgcmFpc2UgRXhjZXB0 aW9uKCdCdWlsZGVyIG5hbWUgInt9IiBpcyBub3QgYSB2YWxpZCBidWlsZGJvdCBpZGVudGlmaWVy LicuZm9ybWF0KGJ1aWxkZXJfbmFtZSkpCiAgICAgICAgIGZvciBzdGVwIGluIGJ1aWxkZXJbImZh Y3RvcnkiXS5zdGVwczoKLSAgICAgICAgICAgIHN0ZXBfbmFtZSA9IHN0ZXBbMF0ubmFtZQorICAg ICAgICAgICAgaWYgVVNFX0JVSUxEQk9UX1ZFUlNJT04yOgorICAgICAgICAgICAgICAgIHN0ZXBf bmFtZSA9IHN0ZXAuYnVpbGRTdGVwKCkubmFtZQorICAgICAgICAgICAgZWxzZToKKyAgICAgICAg ICAgICAgICBzdGVwX25hbWUgPSBzdGVwWzBdLm5hbWUKICAgICAgICAgICAgIGlmIGxlbihzdGVw X25hbWUpID4gU1RFUF9OQU1FX0xFTkdUSF9MSU1JVDoKICAgICAgICAgICAgICAgICByYWlzZSBF eGNlcHRpb24oJ3N0ZXAgbmFtZSAie30iIGlzIGxvbmdlciB0aGFuIG1heGltdW0gYWxsb3dlZCBi eSBCdWlsZGJvdCAoe30gY2hhcmFjdGVycykuJy5mb3JtYXQoc3RlcF9uYW1lLCBTVEVQX05BTUVf TEVOR1RIX0xJTUlUKSkKICAgICAgICAgICAgIGlmIG5vdCBidWlsZGJvdF9pZGVudGlmaWVyc19y ZS5tYXRjaChzdGVwX25hbWUpOgogICAgICAgICAgICAgICAgIHJhaXNlIEV4Y2VwdGlvbignc3Rl cCBuYW1lICJ7fSIgaXMgbm90IGEgdmFsaWQgYnVpbGRib3QgaWRlbnRpZmllci4nLmZvcm1hdChz dGVwX25hbWUpKQogCiAgICAgICAgIGlmIHBsYXRmb3JtLnN0YXJ0c3dpdGgoJ21hYycpOgotICAg ICAgICAgICAgYnVpbGRlclsiY2F0ZWdvcnkiXSA9ICdBcHBsZU1hYycKKyAgICAgICAgICAgIGNh dGVnb3J5ID0gJ0FwcGxlTWFjJwogICAgICAgICBlbGlmIHBsYXRmb3JtLnN0YXJ0c3dpdGgoJ2lv cycpOgotICAgICAgICAgICAgYnVpbGRlclsnY2F0ZWdvcnknXSA9ICdpT1MnCisgICAgICAgICAg ICBjYXRlZ29yeSA9ICdpT1MnCiAgICAgICAgIGVsaWYgcGxhdGZvcm0gPT0gJ3dpbic6Ci0gICAg ICAgICAgICBidWlsZGVyWyJjYXRlZ29yeSJdID0gJ0FwcGxlV2luJworICAgICAgICAgICAgY2F0 ZWdvcnkgPSAnQXBwbGVXaW4nCiAgICAgICAgIGVsaWYgcGxhdGZvcm0uc3RhcnRzd2l0aCgnZ3Rr Jyk6Ci0gICAgICAgICAgICBidWlsZGVyWyJjYXRlZ29yeSJdID0gJ0dUSycKKyAgICAgICAgICAg IGNhdGVnb3J5ID0gJ0dUSycKICAgICAgICAgZWxpZiBwbGF0Zm9ybS5zdGFydHN3aXRoKCd3cGUn KToKLSAgICAgICAgICAgIGJ1aWxkZXJbImNhdGVnb3J5Il0gPSAnV1BFJworICAgICAgICAgICAg Y2F0ZWdvcnkgPSAnV1BFJwogICAgICAgICBlbGlmIHBsYXRmb3JtID09ICd3aW5jYWlybyc6Ci0g ICAgICAgICAgICBidWlsZGVyWyJjYXRlZ29yeSJdID0gJ1dpbkNhaXJvJworICAgICAgICAgICAg Y2F0ZWdvcnkgPSAnV2luQ2Fpcm8nCiAgICAgICAgIGVsaWYgcGxhdGZvcm0uc3RhcnRzd2l0aCgn cGxheXN0YXRpb24nKToKLSAgICAgICAgICAgIGJ1aWxkZXJbImNhdGVnb3J5Il0gPSAnUGxheVN0 YXRpb24nCisgICAgICAgICAgICBjYXRlZ29yeSA9ICdQbGF5U3RhdGlvbicKICAgICAgICAgZWxz ZToKLSAgICAgICAgICAgIGJ1aWxkZXJbImNhdGVnb3J5Il0gPSAnbWlzYycKKyAgICAgICAgICAg IGNhdGVnb3J5ID0gJ21pc2MnCiAKLSAgICAgICAgaWYgKGJ1aWxkZXJbJ2NhdGVnb3J5J10gaW4g KCdBcHBsZU1hYycsICdBcHBsZVdpbicsICdpT1MnKSkgYW5kIGZhY3RvcnlOYW1lICE9ICdCdWls ZEZhY3RvcnknOgorICAgICAgICBpZiAoY2F0ZWdvcnkgaW4gKCdBcHBsZU1hYycsICdBcHBsZVdp bicsICdpT1MnKSkgYW5kIGZhY3RvcnlOYW1lICE9ICdCdWlsZEZhY3RvcnknOgogICAgICAgICAg ICAgYnVpbGRlclsnbmV4dEJ1aWxkJ10gPSBwaWNrTGF0ZXN0QnVpbGQKIAorICAgICAgICBpZiBu b3QgVVNFX0JVSUxEQk9UX1ZFUlNJT04yOgorICAgICAgICAgICAgYnVpbGRlclsnY2F0ZWdvcnkn XSA9IGNhdGVnb3J5CiAgICAgICAgIGNbJ2J1aWxkZXJzJ10uYXBwZW5kKGJ1aWxkZXIpCiAKIAo=