197319 2019-04-26 10:45:03 -0700 [ews-build] Do not print worker environment variables in each build step 2024-08-21 10:32:52 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=199405 https://bugs.webkit.org/show_bug.cgi?id=202698 https://bugs.webkit.org/show_bug.cgi?id=278470 InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap commit-queue dean_johnson ews-watchlist lforschler ryanhaddad webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1530743 0 aakash_jain 2019-04-26 10:45:03 -0700 By default Buildbot prints worker's environment variables in each build step. This is unnecessary and makes the logs hard to read. We should disable printing environment variable in most of the build steps. example (from https://ews-build.webkit.org/#/builders/9/builds/1071/steps/5/logs/stdio): environment: Apple_PubSub_Socket_Render=/private/tmp/com.apple.launchd.aTwloZVLIM/Render HOME=/Users/buildbot LOGNAME=buildbot OLDPWD=/Users/buildbot PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin PWD=/Volumes/Data/worker/API-Tests-iOS-Simulator-EWS/build PYPI_MIRRORS=pypi.apple.com SHELL=/bin/bash SHLVL=1 SSH_AUTH_SOCK=/private/tmp/com.apple.launchd.D4SBJF1v2I/Listeners TMPDIR=/var/folders/vr/hgrp98wj6w797xrk_t22t3vh0000gn/T/ USER=buildbot VERSIONER_PYTHON_PREFER_32_BIT=no VERSIONER_PYTHON_VERSION=2.7 XPC_FLAGS=0x0 XPC_SERVICE_NAME=0 _=/usr/local/bin/twistd __CF_USER_TEXT_ENCODING=0x1F5:0x0:0x0 using PTY: False 1530745 1 368335 aakash_jain 2019-04-26 10:46:52 -0700 Created attachment 368335 Patch 1530752 2 ews-watchlist 2019-04-26 10:50:17 -0700 Attachment 368335 did not pass style-queue: ERROR: Tools/BuildSlaveSupport/ews-build/steps.py:128: [ApplyPatch.__init__] Use of super on an old style class [pylint/E1002] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps.py:687: [ArchiveBuiltProduct.__init__] Use of super on an old style class [pylint/E1002] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps.py:729: [DownloadBuiltProduct.__init__] Use of super on an old style class [pylint/E1002] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps.py:742: [ExtractBuiltProduct.__init__] Use of super on an old style class [pylint/E1002] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps.py:756: [RunAPITests.__init__] Use of super on an old style class [pylint/E1002] [5] Total errors found: 5 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1530779 3 lforschler 2019-04-26 11:58:29 -0700 looks good to me, except for the style errors... (not sure if that is avoidable) 1530780 4 368335 dean_johnson 2019-04-26 11:59:54 -0700 Comment on attachment 368335 Patch Maybe it'd be worth setting logEnviron=False in a new base class that inherited from shell.ShellCommand? Such as: class MinimalLoggingShellCommand(shell.ShellCommand): logEnviron = False 1530781 5 dean_johnson 2019-04-26 12:04:07 -0700 If you decide not to wrap shell.ShellCommand, I think the style errors can be avoided by moving the logEnviron=False to member vars of each class you want them used for. It's also a bit more clear since that's how other (static) step configurations are set. 1548324 6 aakash_jain 2019-06-26 19:02:20 -0700 > class MinimalLoggingShellCommand(shell.ShellCommand): > logEnviron = False logEnviron can not be a class variable, it has to be passed an instance variable (passed in __init__). We noticed similar behavior with 'timeout' in https://github.com/buildbot/buildbot/issues/3887#issuecomment-356736827 1548332 7 372993 aakash_jain 2019-06-26 19:32:43 -0700 Created attachment 372993 Patch 1548489 8 372993 commit-queue 2019-06-27 09:10:08 -0700 Comment on attachment 372993 Patch Clearing flags on attachment: 372993 Committed r246882: <https://trac.webkit.org/changeset/246882> 1548490 9 commit-queue 2019-06-27 09:10:09 -0700 All reviewed patches have been landed. Closing bug. 1548491 10 webkit-bug-importer 2019-06-27 09:11:17 -0700 <rdar://problem/52263170> 368335 2019-04-26 10:46:52 -0700 2019-06-26 19:32:40 -0700 Patch bug-197319-20190426134651.patch text/plain 10667 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NDY5OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE5LTA0LTI2ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWJ1aWxkXSBEbyBub3QgcHJpbnQgd29ya2VyIGVudmlyb25tZW50 IHZhcmlhYmxlcyBpbiBlYWNoIGJ1aWxkIHN0ZXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzMxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBz LnB5OgorICAgICAgICAoQ2hlY2tPdXRTb3VyY2UuX19pbml0X18pOiBEaXNhYmxlZCBsb2dnaW5n IG9mIGVudmlyb25tZW50IHZhcmlhYmxlcy4KKyAgICAgICAgKEFwcGx5UGF0Y2guX19pbml0X18p OiBEaXR0by4KKyAgICAgICAgKEtpbGxPbGRQcm9jZXNzZXMuX19pbml0X18pOiBEaXR0by4KKyAg ICAgICAgKEFyY2hpdmVCdWlsdFByb2R1Y3QuX19pbml0X18pOiBEaXR0by4KKyAgICAgICAgKERv d25sb2FkQnVpbHRQcm9kdWN0Ll9faW5pdF9fKTogRGl0dG8uCisgICAgICAgIChFeHRyYWN0QnVp bHRQcm9kdWN0Ll9faW5pdF9fKTogRGl0dG8uCisgICAgICAgIChSdW5BUElUZXN0cy5fX2luaXRf Xyk6IERpdHRvLgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191 bml0dGVzdC5weTogVXBkYXRlZCB1bml0LXRlc3RzIGFjY29yZGluZ2x5LgorCiAyMDE5LTA0LTI2 ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAg QWRkIEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMpIGFuZCBuYW1lc3BhY2UgQ29udGVudEV4dGVu c2lvbnMgdG8gUmVzb3VyY2VMb2FkSW5mby5oCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9y dC9ld3MtYnVpbGQvc3RlcHMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CShyZXZpc2lvbiAyNDQ2OTYpCisrKyBUb29scy9CdWlsZFNs YXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJKHdvcmtpbmcgY29weSkKQEAgLTk2LDYgKzk2 LDcgQEAgY2xhc3MgQ2hlY2tPdXRTb3VyY2UoZ2l0LkdpdCk6CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXRyeT1zZWxmLkNIRUNLT1VUX0RFTEFZX0FO RF9NQVhfUkVUUklFU19QQUlSLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdGltZW91dD0yICogNjAgKiA2MCwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGFsd2F5c1VzZUxhdGVzdD1UcnVlLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1ldGhvZD0n Y2xlYW4nLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg cHJvZ3Jlc3M9VHJ1ZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICoqa3dhcmdzKQpAQCAtMTI0LDYgKzEyNSw5IEBAIGNsYXNzIEFwcGx5UGF0Y2goc2hl bGwuU2hlbGxDb21tYW5kLCBDb20KICAgICBoYWx0T25GYWlsdXJlID0gVHJ1ZQogICAgIGNvbW1h bmQgPSBbJ1Rvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5JywgJy0tZm9yY2UnLCAnLmJ1aWxkYm90LWRp ZmYnXQogCisgICAgZGVmIF9faW5pdF9fKHNlbGYsICoqa3dhcmdzKToKKyAgICAgICAgc3VwZXIo QXBwbHlQYXRjaCwgc2VsZikuX19pbml0X18odGltZW91dD01ICogNjAsIGxvZ0Vudmlyb249RmFs c2UsICoqa3dhcmdzKQorCiAgICAgZGVmIF9nZXRfcGF0Y2goc2VsZik6CiAgICAgICAgIHNvdXJj ZXN0YW1wID0gc2VsZi5idWlsZC5nZXRTb3VyY2VTdGFtcChzZWxmLmdldFByb3BlcnR5KCdjb2Rl YmFzZScsICcnKSkKICAgICAgICAgaWYgbm90IHNvdXJjZXN0YW1wIG9yIG5vdCBzb3VyY2VzdGFt cC5wYXRjaDoKQEAgLTYzNiw3ICs2NDAsNyBAQCBjbGFzcyBLaWxsT2xkUHJvY2Vzc2VzKHNoZWxs LkNvbXBpbGUpOgogICAgIGNvbW1hbmQgPSBbInB5dGhvbiIsICJUb29scy9CdWlsZFNsYXZlU3Vw cG9ydC9raWxsLW9sZC1wcm9jZXNzZXMiLCAiYnVpbGRib3QiXQogCiAgICAgZGVmIF9faW5pdF9f KHNlbGYsICoqa3dhcmdzKToKLSAgICAgICAgc3VwZXIoS2lsbE9sZFByb2Nlc3Nlcywgc2VsZiku X19pbml0X18odGltZW91dD02MCwgKiprd2FyZ3MpCisgICAgICAgIHN1cGVyKEtpbGxPbGRQcm9j ZXNzZXMsIHNlbGYpLl9faW5pdF9fKHRpbWVvdXQ9NjAsIGxvZ0Vudmlyb249RmFsc2UsICoqa3dh cmdzKQogCiAKIGNsYXNzIFJ1bldlYktpdFRlc3RzKHNoZWxsLlRlc3QpOgpAQCAtNjgwLDYgKzY4 NCw5IEBAIGNsYXNzIEFyY2hpdmVCdWlsdFByb2R1Y3Qoc2hlbGwuU2hlbGxDb20KICAgICBkZXNj cmlwdGlvbkRvbmUgPSBbJ0FyY2hpdmVkIGJ1aWx0IHByb2R1Y3QnXQogICAgIGhhbHRPbkZhaWx1 cmUgPSBUcnVlCiAKKyAgICBkZWYgX19pbml0X18oc2VsZiwgKiprd2FyZ3MpOgorICAgICAgICBz dXBlcihBcmNoaXZlQnVpbHRQcm9kdWN0LCBzZWxmKS5fX2luaXRfXyhsb2dFbnZpcm9uPUZhbHNl LCAqKmt3YXJncykKKwogCiBjbGFzcyBVcGxvYWRCdWlsdFByb2R1Y3QodHJhbnNmZXIuRmlsZVVw bG9hZCk6CiAgICAgbmFtZSA9ICd1cGxvYWQtYnVpbHQtcHJvZHVjdCcKQEAgLTcxOSw2ICs3MjYs OSBAQCBjbGFzcyBEb3dubG9hZEJ1aWx0UHJvZHVjdChzaGVsbC5TaGVsbENvCiAgICAgaGFsdE9u RmFpbHVyZSA9IFRydWUKICAgICBmbHVua09uRmFpbHVyZSA9IFRydWUKIAorICAgIGRlZiBfX2lu aXRfXyhzZWxmLCAqKmt3YXJncyk6CisgICAgICAgIHN1cGVyKERvd25sb2FkQnVpbHRQcm9kdWN0 LCBzZWxmKS5fX2luaXRfXyhsb2dFbnZpcm9uPUZhbHNlLCAqKmt3YXJncykKKwogCiBjbGFzcyBF eHRyYWN0QnVpbHRQcm9kdWN0KHNoZWxsLlNoZWxsQ29tbWFuZCk6CiAgICAgY29tbWFuZCA9IFsn cHl0aG9uJywgJ1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZScs CkBAIC03MjksNiArNzM5LDkgQEAgY2xhc3MgRXh0cmFjdEJ1aWx0UHJvZHVjdChzaGVsbC5TaGVs bENvbQogICAgIGhhbHRPbkZhaWx1cmUgPSBUcnVlCiAgICAgZmx1bmtPbkZhaWx1cmUgPSBUcnVl CiAKKyAgICBkZWYgX19pbml0X18oc2VsZiwgKiprd2FyZ3MpOgorICAgICAgICBzdXBlcihFeHRy YWN0QnVpbHRQcm9kdWN0LCBzZWxmKS5fX2luaXRfXyhsb2dFbnZpcm9uPUZhbHNlLCAqKmt3YXJn cykKKwogCiBjbGFzcyBSdW5BUElUZXN0cyhUZXN0V2l0aEZhaWx1cmVDb3VudCk6CiAgICAgbmFt ZSA9ICdydW4tYXBpLXRlc3RzJwpAQCAtNzQwLDYgKzc1Myw5IEBAIGNsYXNzIFJ1bkFQSVRlc3Rz KFRlc3RXaXRoRmFpbHVyZUNvdW50KToKICAgICAgICAgICAgICAgIFdpdGhQcm9wZXJ0aWVzKCct LSUoY29uZmlndXJhdGlvbilzJyksICctLXZlcmJvc2UnLCAnLS1qc29uLW91dHB1dD17MH0nLmZv cm1hdChqc29uRmlsZU5hbWUpXQogICAgIGZhaWxlZFRlc3RzRm9ybWF0U3RyaW5nID0gJyVkIGFw aSB0ZXN0JXMgZmFpbGVkIG9yIHRpbWVkIG91dCcKIAorICAgIGRlZiBfX2luaXRfXyhzZWxmLCAq Kmt3YXJncyk6CisgICAgICAgIHN1cGVyKFJ1bkFQSVRlc3RzLCBzZWxmKS5fX2luaXRfXyhsb2dF bnZpcm9uPUZhbHNlLCAqKmt3YXJncykKKwogICAgIGRlZiBzdGFydChzZWxmKToKICAgICAgICAg YXBwZW5kQ3VzdG9tQnVpbGRGbGFncyhzZWxmLCBzZWxmLmdldFByb3BlcnR5KCdwbGF0Zm9ybScp LCBzZWxmLmdldFByb3BlcnR5KCdmdWxsUGxhdGZvcm0nKSkKICAgICAgICAgcmV0dXJuIFRlc3RX aXRoRmFpbHVyZUNvdW50LnN0YXJ0KHNlbGYpCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9y dC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNDQ2OTYp CisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkJ KHdvcmtpbmcgY29weSkKQEAgLTQwNCw2ICs0MDQsNyBAQCBjbGFzcyBUZXN0S2lsbE9sZFByb2Nl c3NlcyhCdWlsZFN0ZXBNaXhpCiAgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCiAg ICAgICAgICAgICBFeHBlY3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCiAgICAgICAgICAgICAgICAg ICAgICAgICBjb21tYW5kPVsncHl0aG9uJywgJ1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2tpbGwt b2xkLXByb2Nlc3NlcycsICdidWlsZGJvdCddLAorICAgICAgICAgICAgICAgICAgICAgICAgbG9n RW52aXJvbj1GYWxzZSwKICAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVvdXQ9NjAsCiAgICAg ICAgICAgICAgICAgICAgICAgICApCiAgICAgICAgICAgICArIDAsCkBAIC00MTYsNiArNDE3LDcg QEAgY2xhc3MgVGVzdEtpbGxPbGRQcm9jZXNzZXMoQnVpbGRTdGVwTWl4aQogICAgICAgICBzZWxm LmV4cGVjdFJlbW90ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0n d2tkaXInLAogICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3B5dGhvbicsICdUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9raWxsLW9sZC1wcm9jZXNzZXMnLCAnYnVpbGRib3QnXSwKKyAg ICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCiAgICAgICAgICAgICAgICAg ICAgICAgICB0aW1lb3V0PTYwLAogICAgICAgICAgICAgICAgICAgICAgICAgKQogICAgICAgICAg ICAgKyBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PSdVbmV4cGVjdGVkIGVycm9yLicp CkBAIC05MjIsNiArOTI0LDcgQEAgY2xhc3MgVGVzdEFyY2hpdmVCdWlsdFByb2R1Y3QoQnVpbGRT dGVwTQogICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdjb25maWd1cmF0aW9uJywgJ3JlbGVhc2Un KQogICAgICAgICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0 U2hlbGwod29ya2Rpcj0nd2tkaXInLAorICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJv bj1GYWxzZSwKICAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydweXRob24nLCAnVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlJywgJy0tcGxhdGZvcm09 aW9zLXNpbXVsYXRvcicsICAnLS1yZWxlYXNlJywgJ2FyY2hpdmUnXSwKICAgICAgICAgICAgICAg ICAgICAgICAgICkKICAgICAgICAgICAgICsgMCwKQEAgLTkzNSw2ICs5MzgsNyBAQCBjbGFzcyBU ZXN0QXJjaGl2ZUJ1aWx0UHJvZHVjdChCdWlsZFN0ZXBNCiAgICAgICAgIHNlbGYuc2V0UHJvcGVy dHkoJ2NvbmZpZ3VyYXRpb24nLCAnZGVidWcnKQogICAgICAgICBzZWxmLmV4cGVjdFJlbW90ZUNv bW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAorICAgICAg ICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKICAgICAgICAgICAgICAgICAgICAg ICAgIGNvbW1hbmQ9WydweXRob24nLCAnVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQtcHJv ZHVjdC1hcmNoaXZlJywgJy0tcGxhdGZvcm09bWFjLXNpZXJyYScsICAnLS1kZWJ1ZycsICdhcmNo aXZlJ10sCiAgICAgICAgICAgICAgICAgICAgICAgICApCiAgICAgICAgICAgICArIEV4cGVjdFNo ZWxsLmxvZygnc3RkaW8nLCBzdGRvdXQ9J1VuZXhwZWN0ZWQgZmFpbHVyZS4nKQpAQCAtMTAxMiw2 ICsxMDE2LDcgQEAgY2xhc3MgVGVzdERvd25sb2FkQnVpbHRQcm9kdWN0KEJ1aWxkU3RlcAogICAg ICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaF9pZCcsICcxMjM0JykKICAgICAgICAgc2VsZi5l eHBlY3RSZW1vdGVDb21tYW5kcygKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3dr ZGlyJywKKyAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCiAgICAgICAg ICAgICAgICAgICAgICAgICBjb21tYW5kPVsncHl0aG9uJywgJ1Rvb2xzL0J1aWxkU2xhdmVTdXBw b3J0L2Rvd25sb2FkLWJ1aWx0LXByb2R1Y3QnLCAnLS1wbGF0Zm9ybT1pb3MnLCAgJy0tcmVsZWFz ZScsICdodHRwczovL2V3cy1idWlsZC53ZWJraXQub3JnL2FyY2hpdmVzL2lvcy1zaW11bGF0b3It MTIteDg2XzY0LXJlbGVhc2UvMTIzNC56aXAnXSwKICAgICAgICAgICAgICAgICAgICAgICAgICkK ICAgICAgICAgICAgICsgMCwKQEAgLTEwMjgsNiArMTAzMyw3IEBAIGNsYXNzIFRlc3REb3dubG9h ZEJ1aWx0UHJvZHVjdChCdWlsZFN0ZXAKICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgncGF0Y2hf aWQnLCAnMTIzNDU2JykKICAgICAgICAgc2VsZi5leHBlY3RSZW1vdGVDb21tYW5kcygKICAgICAg ICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywKKyAgICAgICAgICAgICAgICAgICAg ICAgIGxvZ0Vudmlyb249RmFsc2UsCiAgICAgICAgICAgICAgICAgICAgICAgICBjb21tYW5kPVsn cHl0aG9uJywgJ1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2Rvd25sb2FkLWJ1aWx0LXByb2R1Y3Qn LCAnLS1wbGF0Zm9ybT1tYWMnLCAgJy0tZGVidWcnLCAnaHR0cHM6Ly9ld3MtYnVpbGQud2Via2l0 Lm9yZy9hcmNoaXZlcy9tYWMtc2llcnJhLXg4Nl82NC1kZWJ1Zy8xMjM0NTYuemlwJ10sCiAgICAg ICAgICAgICAgICAgICAgICAgICApCiAgICAgICAgICAgICArIEV4cGVjdFNoZWxsLmxvZygnc3Rk aW8nLCBzdGRvdXQ9J1VuZXhwZWN0ZWQgZmFpbHVyZS4nKQpAQCAtMTA1MSw2ICsxMDU3LDcgQEAg Y2xhc3MgVGVzdEV4dHJhY3RCdWlsdFByb2R1Y3QoQnVpbGRTdGVwTQogICAgICAgICBzZWxmLnNl dFByb3BlcnR5KCdjb25maWd1cmF0aW9uJywgJ3JlbGVhc2UnKQogICAgICAgICBzZWxmLmV4cGVj dFJlbW90ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXIn LAorICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbW1hbmQ9WydweXRob24nLCAnVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbHQtcHJvZHVjdC1hcmNoaXZlJywgJy0tcGxhdGZvcm09aW9zLXNpbXVsYXRvcicsICAnLS1y ZWxlYXNlJywgJ2V4dHJhY3QnXSwKICAgICAgICAgICAgICAgICAgICAgICAgICkKICAgICAgICAg ICAgICsgMCwKQEAgLTEwNjQsNiArMTA3MSw3IEBAIGNsYXNzIFRlc3RFeHRyYWN0QnVpbHRQcm9k dWN0KEJ1aWxkU3RlcE0KICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnY29uZmlndXJhdGlvbics ICdkZWJ1ZycpCiAgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCiAgICAgICAgICAg ICBFeHBlY3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCisgICAgICAgICAgICAgICAgICAgICAgICBs b2dFbnZpcm9uPUZhbHNlLAogICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3B5dGhv bicsICdUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsdC1wcm9kdWN0LWFyY2hpdmUnLCAnLS1w bGF0Zm9ybT1tYWMtc2llcnJhJywgICctLWRlYnVnJywgJ2V4dHJhY3QnXSwKICAgICAgICAgICAg ICAgICAgICAgICAgICkKICAgICAgICAgICAgICsgRXhwZWN0U2hlbGwubG9nKCdzdGRpbycsIHN0 ZG91dD0nVW5leHBlY3RlZCBmYWlsdXJlLicpCkBAIC0xMDkwLDYgKzEwOTgsNyBAQCBjbGFzcyBU ZXN0UnVuQVBJVGVzdHMoQnVpbGRTdGVwTWl4aW5BZGRpCiAKICAgICAgICAgc2VsZi5leHBlY3RS ZW1vdGVDb21tYW5kcygKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywK KyAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCiAgICAgICAgICAgICAg ICAgICAgICAgICBjb21tYW5kPVsncHl0aG9uJywgJ1Rvb2xzL1NjcmlwdHMvcnVuLWFwaS10ZXN0 cycsICctLW5vLWJ1aWxkJywgJy0tcmVsZWFzZScsICctLXZlcmJvc2UnLCAnLS1qc29uLW91dHB1 dD17MH0nLmZvcm1hdChzZWxmLmpzb25GaWxlTmFtZSldLAogICAgICAgICAgICAgICAgICAgICAg ICAgbG9nZmlsZXM9eydqc29uJzogc2VsZi5qc29uRmlsZU5hbWV9LAogICAgICAgICAgICAgICAg ICAgICAgICAgKQpAQCAtMTExNyw2ICsxMTI2LDcgQEAgQWxsIHRlc3RzIHN1Y2Nlc3NmdWxseSBw YXNzZWQhCiAKICAgICAgICAgc2VsZi5leHBlY3RSZW1vdGVDb21tYW5kcygKICAgICAgICAgICAg IEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywKKyAgICAgICAgICAgICAgICAgICAgICAgIGxv Z0Vudmlyb249RmFsc2UsCiAgICAgICAgICAgICAgICAgICAgICAgICBjb21tYW5kPVsncHl0aG9u JywgJ1Rvb2xzL1NjcmlwdHMvcnVuLWFwaS10ZXN0cycsICctLW5vLWJ1aWxkJywgJy0tZGVidWcn LCAnLS12ZXJib3NlJywgJy0tanNvbi1vdXRwdXQ9ezB9Jy5mb3JtYXQoc2VsZi5qc29uRmlsZU5h bWUpLCAnLS1pb3Mtc2ltdWxhdG9yJ10sCiAgICAgICAgICAgICAgICAgICAgICAgICBsb2dmaWxl cz17J2pzb24nOiBzZWxmLmpzb25GaWxlTmFtZX0sCiAgICAgICAgICAgICAgICAgICAgICAgICAp CkBAIC0xMTQ0LDYgKzExNTQsNyBAQCBBbGwgdGVzdHMgc3VjY2Vzc2Z1bGx5IHBhc3NlZCEKIAog ICAgICAgICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0U2hl bGwod29ya2Rpcj0nd2tkaXInLAorICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1G YWxzZSwKICAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydweXRob24nLCAnVG9vbHMv U2NyaXB0cy9ydW4tYXBpLXRlc3RzJywgJy0tbm8tYnVpbGQnLCAnLS1kZWJ1ZycsICctLXZlcmJv c2UnLCAnLS1qc29uLW91dHB1dD17MH0nLmZvcm1hdChzZWxmLmpzb25GaWxlTmFtZSldLAogICAg ICAgICAgICAgICAgICAgICAgICAgbG9nZmlsZXM9eydqc29uJzogc2VsZi5qc29uRmlsZU5hbWV9 LAogICAgICAgICAgICAgICAgICAgICAgICAgKQpAQCAtMTE4NSw2ICsxMTk2LDcgQEAgVGVzdGlu ZyBjb21wbGV0ZWQsIEV4aXQgc3RhdHVzOiAzCiAKICAgICAgICAgc2VsZi5leHBlY3RSZW1vdGVD b21tYW5kcygKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywKKyAgICAg ICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCiAgICAgICAgICAgICAgICAgICAg ICAgICBjb21tYW5kPVsncHl0aG9uJywgJ1Rvb2xzL1NjcmlwdHMvcnVuLWFwaS10ZXN0cycsICct LW5vLWJ1aWxkJywgJy0tZGVidWcnLCAnLS12ZXJib3NlJywgJy0tanNvbi1vdXRwdXQ9ezB9Jy5m b3JtYXQoc2VsZi5qc29uRmlsZU5hbWUpXSwKICAgICAgICAgICAgICAgICAgICAgICAgIGxvZ2Zp bGVzPXsnanNvbic6IHNlbGYuanNvbkZpbGVOYW1lfSwKICAgICAgICAgICAgICAgICAgICAgICAg ICkKQEAgLTEyNDAsNiArMTI1Miw3IEBAIFRlc3RpbmcgY29tcGxldGVkLCBFeGl0IHN0YXR1czog MwogCiAgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCiAgICAgICAgICAgICBFeHBl Y3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCisgICAgICAgICAgICAgICAgICAgICAgICBsb2dFbnZp cm9uPUZhbHNlLAogICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3B5dGhvbicsICdU b29scy9TY3JpcHRzL3J1bi1hcGktdGVzdHMnLCAnLS1uby1idWlsZCcsICctLWRlYnVnJywgJy0t dmVyYm9zZScsICctLWpzb24tb3V0cHV0PXswfScuZm9ybWF0KHNlbGYuanNvbkZpbGVOYW1lKV0s CiAgICAgICAgICAgICAgICAgICAgICAgICBsb2dmaWxlcz17J2pzb24nOiBzZWxmLmpzb25GaWxl TmFtZX0sCiAgICAgICAgICAgICAgICAgICAgICAgICApCkBAIC0xMjU3LDYgKzEyNzAsNyBAQCBU ZXN0aW5nIGNvbXBsZXRlZCwgRXhpdCBzdGF0dXM6IDMKIAogICAgICAgICBzZWxmLmV4cGVjdFJl bW90ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAor ICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbW1hbmQ9WydweXRob24nLCAnVG9vbHMvU2NyaXB0cy9ydW4tYXBpLXRlc3Rz JywgJy0tbm8tYnVpbGQnLCAnLS1kZWJ1ZycsICctLXZlcmJvc2UnLCAnLS1qc29uLW91dHB1dD17 MH0nLmZvcm1hdChzZWxmLmpzb25GaWxlTmFtZSldLAogICAgICAgICAgICAgICAgICAgICAgICAg bG9nZmlsZXM9eydqc29uJzogc2VsZi5qc29uRmlsZU5hbWV9LAogICAgICAgICAgICAgICAgICAg ICAgICAgKQo= 372993 2019-06-26 19:32:43 -0700 2019-06-27 09:10:08 -0700 Patch bug-197319-20190626223242.patch text/plain 10747 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0Njg2NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE5LTA2LTI2ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWJ1aWxkXSBEbyBub3QgcHJpbnQgd29ya2VyIGVudmlyb25tZW50 IHZhcmlhYmxlcyBpbiBlYWNoIGJ1aWxkIHN0ZXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzMxOQorCisgICAgICAgIFJldmlld2VkIGJ5IEx1Y2Fz IEZvcnNjaGxlci4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVw cy5weToKKyAgICAgICAgKENoZWNrT3V0U291cmNlLl9faW5pdF9fKTogRGlzYWJsZWQgbG9nZ2lu ZyBvZiBlbnZpcm9ubWVudCB2YXJpYWJsZXMuCisgICAgICAgIChBcHBseVBhdGNoLl9faW5pdF9f KTogRGl0dG8uCisgICAgICAgIChLaWxsT2xkUHJvY2Vzc2VzLl9faW5pdF9fKTogRGl0dG8uCisg ICAgICAgIChBcmNoaXZlQnVpbHRQcm9kdWN0Ll9faW5pdF9fKTogRGl0dG8uCisgICAgICAgIChE b3dubG9hZEJ1aWx0UHJvZHVjdC5fX2luaXRfXyk6IERpdHRvLgorICAgICAgICAoRXh0cmFjdEJ1 aWx0UHJvZHVjdC5fX2luaXRfXyk6IERpdHRvLgorICAgICAgICAoUnVuQVBJVGVzdHMuX19pbml0 X18pOiBEaXR0by4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNf dW5pdHRlc3QucHk6IFVwZGF0ZWQgdW5pdC10ZXN0cyBhY2NvcmRpbmdseS4KKwogMjAxOS0wNi0y NiAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgW2V3cy1i dWlsZF0gQWRkIGNvbmZpZ3VyYXRpb24gYW5kIGFyY2hpdGVjdHVyZSBmb3IgV1BFIGFuZCBHVEsg YnVpbGRlcnMKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMu cHkJKHJldmlzaW9uIDI0Njg2NykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWls ZC9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAtOTYsNiArOTYsNyBAQCBjbGFzcyBDaGVja091 dFNvdXJjZShnaXQuR2l0KToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHJldHJ5PXNlbGYuQ0hFQ0tPVVRfREVMQVlfQU5EX01BWF9SRVRSSUVTX1BBSVIs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aW1lb3V0 PTIgKiA2MCAqIDYwLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgYWx3YXlzVXNlTGF0ZXN0PVRydWUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBsb2dFbnZpcm9uPUZhbHNlLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWV0aG9kPSdjbGVhbicsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcm9ncmVzcz1UcnVlLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKiprd2FyZ3MpCkBA IC0xNDEsNiArMTQyLDkgQEAgY2xhc3MgQXBwbHlQYXRjaChzaGVsbC5TaGVsbENvbW1hbmQsIENv bQogICAgIGhhbHRPbkZhaWx1cmUgPSBUcnVlCiAgICAgY29tbWFuZCA9IFsnVG9vbHMvU2NyaXB0 cy9zdm4tYXBwbHknLCAnLS1mb3JjZScsICcuYnVpbGRib3QtZGlmZiddCiAKKyAgICBkZWYgX19p bml0X18oc2VsZiwgKiprd2FyZ3MpOgorICAgICAgICBzdXBlcihBcHBseVBhdGNoLCBzZWxmKS5f X2luaXRfXyh0aW1lb3V0PTUgKiA2MCwgbG9nRW52aXJvbj1GYWxzZSwgKiprd2FyZ3MpCisKICAg ICBkZWYgX2dldF9wYXRjaChzZWxmKToKICAgICAgICAgc291cmNlc3RhbXAgPSBzZWxmLmJ1aWxk LmdldFNvdXJjZVN0YW1wKHNlbGYuZ2V0UHJvcGVydHkoJ2NvZGViYXNlJywgJycpKQogICAgICAg ICBpZiBub3Qgc291cmNlc3RhbXAgb3Igbm90IHNvdXJjZXN0YW1wLnBhdGNoOgpAQCAtNzYxLDcg Kzc2NSw3IEBAIGNsYXNzIEtpbGxPbGRQcm9jZXNzZXMoc2hlbGwuQ29tcGlsZSk6CiAgICAgY29t bWFuZCA9IFsncHl0aG9uJywgJ1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2tpbGwtb2xkLXByb2Nl c3NlcycsICdidWlsZGJvdCddCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgKiprd2FyZ3MpOgot ICAgICAgICBzdXBlcihLaWxsT2xkUHJvY2Vzc2VzLCBzZWxmKS5fX2luaXRfXyh0aW1lb3V0PTYw LCAqKmt3YXJncykKKyAgICAgICAgc3VwZXIoS2lsbE9sZFByb2Nlc3Nlcywgc2VsZikuX19pbml0 X18odGltZW91dD02MCwgbG9nRW52aXJvbj1GYWxzZSwgKiprd2FyZ3MpCiAKIAogY2xhc3MgUnVu V2ViS2l0VGVzdHMoc2hlbGwuVGVzdCk6CkBAIC04NDEsNiArODQ1LDkgQEAgY2xhc3MgQXJjaGl2 ZUJ1aWx0UHJvZHVjdChzaGVsbC5TaGVsbENvbQogICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsnQXJj aGl2ZWQgYnVpbHQgcHJvZHVjdCddCiAgICAgaGFsdE9uRmFpbHVyZSA9IFRydWUKIAorICAgIGRl ZiBfX2luaXRfXyhzZWxmLCAqKmt3YXJncyk6CisgICAgICAgIHN1cGVyKEFyY2hpdmVCdWlsdFBy b2R1Y3QsIHNlbGYpLl9faW5pdF9fKGxvZ0Vudmlyb249RmFsc2UsICoqa3dhcmdzKQorCiAKIGNs YXNzIFVwbG9hZEJ1aWx0UHJvZHVjdCh0cmFuc2Zlci5GaWxlVXBsb2FkKToKICAgICBuYW1lID0g J3VwbG9hZC1idWlsdC1wcm9kdWN0JwpAQCAtOTIwLDYgKzkyNyw5IEBAIGNsYXNzIERvd25sb2Fk QnVpbHRQcm9kdWN0KHNoZWxsLlNoZWxsQ28KICAgICAgICAgICAgIHJldHVybiB7dSdzdGVwJzog dSdGYWlsZWQgdG8gZG93bmxvYWQgYnVpbHQgcHJvZHVjdCBmcm9tIFMzJ30KICAgICAgICAgcmV0 dXJuIHN1cGVyKERvd25sb2FkQnVpbHRQcm9kdWN0LCBzZWxmKS5nZXRSZXN1bHRTdW1tYXJ5KCkK IAorICAgIGRlZiBfX2luaXRfXyhzZWxmLCAqKmt3YXJncyk6CisgICAgICAgIHN1cGVyKERvd25s b2FkQnVpbHRQcm9kdWN0LCBzZWxmKS5fX2luaXRfXyhsb2dFbnZpcm9uPUZhbHNlLCAqKmt3YXJn cykKKwogCiBjbGFzcyBFeHRyYWN0QnVpbHRQcm9kdWN0KHNoZWxsLlNoZWxsQ29tbWFuZCk6CiAg ICAgY29tbWFuZCA9IFsncHl0aG9uJywgJ1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWx0LXBy b2R1Y3QtYXJjaGl2ZScsCkBAIC05MzAsNiArOTQwLDkgQEAgY2xhc3MgRXh0cmFjdEJ1aWx0UHJv ZHVjdChzaGVsbC5TaGVsbENvbQogICAgIGhhbHRPbkZhaWx1cmUgPSBUcnVlCiAgICAgZmx1bmtP bkZhaWx1cmUgPSBUcnVlCiAKKyAgICBkZWYgX19pbml0X18oc2VsZiwgKiprd2FyZ3MpOgorICAg ICAgICBzdXBlcihFeHRyYWN0QnVpbHRQcm9kdWN0LCBzZWxmKS5fX2luaXRfXyhsb2dFbnZpcm9u PUZhbHNlLCAqKmt3YXJncykKKwogCiBjbGFzcyBSdW5BUElUZXN0cyhUZXN0V2l0aEZhaWx1cmVD b3VudCk6CiAgICAgbmFtZSA9ICdydW4tYXBpLXRlc3RzJwpAQCAtOTQxLDYgKzk1NCw5IEBAIGNs YXNzIFJ1bkFQSVRlc3RzKFRlc3RXaXRoRmFpbHVyZUNvdW50KToKICAgICAgICAgICAgICAgIFdp dGhQcm9wZXJ0aWVzKCctLSUoY29uZmlndXJhdGlvbilzJyksICctLXZlcmJvc2UnLCAnLS1qc29u LW91dHB1dD17MH0nLmZvcm1hdChqc29uRmlsZU5hbWUpXQogICAgIGZhaWxlZFRlc3RzRm9ybWF0 U3RyaW5nID0gJyVkIGFwaSB0ZXN0JXMgZmFpbGVkIG9yIHRpbWVkIG91dCcKIAorICAgIGRlZiBf X2luaXRfXyhzZWxmLCAqKmt3YXJncyk6CisgICAgICAgIHN1cGVyKFJ1bkFQSVRlc3RzLCBzZWxm KS5fX2luaXRfXyhsb2dFbnZpcm9uPUZhbHNlLCAqKmt3YXJncykKKwogICAgIGRlZiBzdGFydChz ZWxmKToKICAgICAgICAgYXBwZW5kQ3VzdG9tQnVpbGRGbGFncyhzZWxmLCBzZWxmLmdldFByb3Bl cnR5KCdwbGF0Zm9ybScpLCBzZWxmLmdldFByb3BlcnR5KCdmdWxsUGxhdGZvcm0nKSkKICAgICAg ICAgcmV0dXJuIFRlc3RXaXRoRmFpbHVyZUNvdW50LnN0YXJ0KHNlbGYpCkluZGV4OiBUb29scy9C dWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CShy ZXZpc2lvbiAyNDY4NjcpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3Rl cHNfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTQxMyw2ICs0MTMsNyBAQCBjbGFzcyBU ZXN0S2lsbE9sZFByb2Nlc3NlcyhCdWlsZFN0ZXBNaXhpCiAgICAgICAgIHNlbGYuZXhwZWN0UmVt b3RlQ29tbWFuZHMoCiAgICAgICAgICAgICBFeHBlY3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCiAg ICAgICAgICAgICAgICAgICAgICAgICBjb21tYW5kPVsncHl0aG9uJywgJ1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2tpbGwtb2xkLXByb2Nlc3NlcycsICdidWlsZGJvdCddLAorICAgICAgICAgICAg ICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKICAgICAgICAgICAgICAgICAgICAgICAgIHRp bWVvdXQ9NjAsCiAgICAgICAgICAgICAgICAgICAgICAgICApCiAgICAgICAgICAgICArIDAsCkBA IC00MjUsNiArNDI2LDcgQEAgY2xhc3MgVGVzdEtpbGxPbGRQcm9jZXNzZXMoQnVpbGRTdGVwTWl4 aQogICAgICAgICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0 U2hlbGwod29ya2Rpcj0nd2tkaXInLAogICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1b J3B5dGhvbicsICdUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9raWxsLW9sZC1wcm9jZXNzZXMnLCAn YnVpbGRib3QnXSwKKyAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCiAg ICAgICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PTYwLAogICAgICAgICAgICAgICAgICAgICAg ICAgKQogICAgICAgICAgICAgKyBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PSdVbmV4 cGVjdGVkIGVycm9yLicpCkBAIC0xMDAyLDYgKzEwMDQsNyBAQCBjbGFzcyBUZXN0QXJjaGl2ZUJ1 aWx0UHJvZHVjdChCdWlsZFN0ZXBNCiAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2NvbmZpZ3Vy YXRpb24nLCAncmVsZWFzZScpCiAgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCiAg ICAgICAgICAgICBFeHBlY3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCisgICAgICAgICAgICAgICAg ICAgICAgICBsb2dFbnZpcm9uPUZhbHNlLAogICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFu ZD1bJ3B5dGhvbicsICdUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsdC1wcm9kdWN0LWFyY2hp dmUnLCAnLS1wbGF0Zm9ybT1pb3Mtc2ltdWxhdG9yJywgICctLXJlbGVhc2UnLCAnYXJjaGl2ZSdd LAogICAgICAgICAgICAgICAgICAgICAgICAgKQogICAgICAgICAgICAgKyAwLApAQCAtMTAxNSw2 ICsxMDE4LDcgQEAgY2xhc3MgVGVzdEFyY2hpdmVCdWlsdFByb2R1Y3QoQnVpbGRTdGVwTQogICAg ICAgICBzZWxmLnNldFByb3BlcnR5KCdjb25maWd1cmF0aW9uJywgJ2RlYnVnJykKICAgICAgICAg c2VsZi5leHBlY3RSZW1vdGVDb21tYW5kcygKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtk aXI9J3drZGlyJywKKyAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCiAg ICAgICAgICAgICAgICAgICAgICAgICBjb21tYW5kPVsncHl0aG9uJywgJ1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZScsICctLXBsYXRmb3JtPW1hYy1zaWVycmEn LCAgJy0tZGVidWcnLCAnYXJjaGl2ZSddLAogICAgICAgICAgICAgICAgICAgICAgICAgKQogICAg ICAgICAgICAgKyBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PSdVbmV4cGVjdGVkIGZh aWx1cmUuJykKQEAgLTEwOTEsNiArMTA5NSw3IEBAIGNsYXNzIFRlc3REb3dubG9hZEJ1aWx0UHJv ZHVjdChCdWlsZFN0ZXAKICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgncGF0Y2hfaWQnLCAnMTIz NCcpCiAgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCiAgICAgICAgICAgICBFeHBl Y3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCisgICAgICAgICAgICAgICAgICAgICAgICBsb2dFbnZp cm9uPUZhbHNlLAogICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3B5dGhvbicsICdU b29scy9CdWlsZFNsYXZlU3VwcG9ydC9kb3dubG9hZC1idWlsdC1wcm9kdWN0JywgJy0tcmVsZWFz ZScsICdodHRwczovL3MzLXVzLXdlc3QtMi5hbWF6b25hd3MuY29tL2V3cy1hcmNoaXZlcy53ZWJr aXQub3JnL2lvcy1zaW11bGF0b3ItMTIteDg2XzY0LXJlbGVhc2UvMTIzNC56aXAnXSwKICAgICAg ICAgICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgICsgMCwKQEAgLTExMDYsNiArMTExMSw3 IEBAIGNsYXNzIFRlc3REb3dubG9hZEJ1aWx0UHJvZHVjdChCdWlsZFN0ZXAKICAgICAgICAgc2Vs Zi5zZXRQcm9wZXJ0eSgncGF0Y2hfaWQnLCAnMTIzNDU2JykKICAgICAgICAgc2VsZi5leHBlY3RS ZW1vdGVDb21tYW5kcygKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywK KyAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCiAgICAgICAgICAgICAg ICAgICAgICAgICBjb21tYW5kPVsncHl0aG9uJywgJ1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2Rv d25sb2FkLWJ1aWx0LXByb2R1Y3QnLCAnLS1kZWJ1ZycsICdodHRwczovL3MzLXVzLXdlc3QtMi5h bWF6b25hd3MuY29tL2V3cy1hcmNoaXZlcy53ZWJraXQub3JnL21hYy1zaWVycmEteDg2XzY0LWRl YnVnLzEyMzQ1Ni56aXAnXSwKICAgICAgICAgICAgICAgICAgICAgICAgICkKICAgICAgICAgICAg ICsgRXhwZWN0U2hlbGwubG9nKCdzdGRpbycsIHN0ZG91dD0nVW5leHBlY3RlZCBmYWlsdXJlLicp CkBAIC0xMTI5LDYgKzExMzUsNyBAQCBjbGFzcyBUZXN0RXh0cmFjdEJ1aWx0UHJvZHVjdChCdWls ZFN0ZXBNCiAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2NvbmZpZ3VyYXRpb24nLCAncmVsZWFz ZScpCiAgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCiAgICAgICAgICAgICBFeHBl Y3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCisgICAgICAgICAgICAgICAgICAgICAgICBsb2dFbnZp cm9uPUZhbHNlLAogICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3B5dGhvbicsICdU b29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsdC1wcm9kdWN0LWFyY2hpdmUnLCAnLS1wbGF0Zm9y bT1pb3Mtc2ltdWxhdG9yJywgICctLXJlbGVhc2UnLCAnZXh0cmFjdCddLAogICAgICAgICAgICAg ICAgICAgICAgICAgKQogICAgICAgICAgICAgKyAwLApAQCAtMTE0Miw2ICsxMTQ5LDcgQEAgY2xh c3MgVGVzdEV4dHJhY3RCdWlsdFByb2R1Y3QoQnVpbGRTdGVwTQogICAgICAgICBzZWxmLnNldFBy b3BlcnR5KCdjb25maWd1cmF0aW9uJywgJ2RlYnVnJykKICAgICAgICAgc2VsZi5leHBlY3RSZW1v dGVDb21tYW5kcygKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywKKyAg ICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCiAgICAgICAgICAgICAgICAg ICAgICAgICBjb21tYW5kPVsncHl0aG9uJywgJ1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWx0 LXByb2R1Y3QtYXJjaGl2ZScsICctLXBsYXRmb3JtPW1hYy1zaWVycmEnLCAgJy0tZGVidWcnLCAn ZXh0cmFjdCddLAogICAgICAgICAgICAgICAgICAgICAgICAgKQogICAgICAgICAgICAgKyBFeHBl Y3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PSdVbmV4cGVjdGVkIGZhaWx1cmUuJykKQEAgLTEy MTMsNiArMTIyMSw3IEBAIGNsYXNzIFRlc3RSdW5BUElUZXN0cyhCdWlsZFN0ZXBNaXhpbkFkZGkK IAogICAgICAgICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0 U2hlbGwod29ya2Rpcj0nd2tkaXInLAorICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJv bj1GYWxzZSwKICAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydweXRob24nLCAnVG9v bHMvU2NyaXB0cy9ydW4tYXBpLXRlc3RzJywgJy0tbm8tYnVpbGQnLCAnLS1yZWxlYXNlJywgJy0t dmVyYm9zZScsICctLWpzb24tb3V0cHV0PXswfScuZm9ybWF0KHNlbGYuanNvbkZpbGVOYW1lKV0s CiAgICAgICAgICAgICAgICAgICAgICAgICBsb2dmaWxlcz17J2pzb24nOiBzZWxmLmpzb25GaWxl TmFtZX0sCiAgICAgICAgICAgICAgICAgICAgICAgICApCkBAIC0xMjQwLDYgKzEyNDksNyBAQCBB bGwgdGVzdHMgc3VjY2Vzc2Z1bGx5IHBhc3NlZCEKIAogICAgICAgICBzZWxmLmV4cGVjdFJlbW90 ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAorICAg ICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbW1hbmQ9WydweXRob24nLCAnVG9vbHMvU2NyaXB0cy9ydW4tYXBpLXRlc3RzJywg Jy0tbm8tYnVpbGQnLCAnLS1kZWJ1ZycsICctLXZlcmJvc2UnLCAnLS1qc29uLW91dHB1dD17MH0n LmZvcm1hdChzZWxmLmpzb25GaWxlTmFtZSksICctLWlvcy1zaW11bGF0b3InXSwKICAgICAgICAg ICAgICAgICAgICAgICAgIGxvZ2ZpbGVzPXsnanNvbic6IHNlbGYuanNvbkZpbGVOYW1lfSwKICAg ICAgICAgICAgICAgICAgICAgICAgICkKQEAgLTEyNjcsNiArMTI3Nyw3IEBAIEFsbCB0ZXN0cyBz dWNjZXNzZnVsbHkgcGFzc2VkIQogCiAgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMo CiAgICAgICAgICAgICBFeHBlY3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCisgICAgICAgICAgICAg ICAgICAgICAgICBsb2dFbnZpcm9uPUZhbHNlLAogICAgICAgICAgICAgICAgICAgICAgICAgY29t bWFuZD1bJ3B5dGhvbicsICdUb29scy9TY3JpcHRzL3J1bi1hcGktdGVzdHMnLCAnLS1uby1idWls ZCcsICctLWRlYnVnJywgJy0tdmVyYm9zZScsICctLWpzb24tb3V0cHV0PXswfScuZm9ybWF0KHNl bGYuanNvbkZpbGVOYW1lKV0sCiAgICAgICAgICAgICAgICAgICAgICAgICBsb2dmaWxlcz17J2pz b24nOiBzZWxmLmpzb25GaWxlTmFtZX0sCiAgICAgICAgICAgICAgICAgICAgICAgICApCkBAIC0x MzA4LDYgKzEzMTksNyBAQCBUZXN0aW5nIGNvbXBsZXRlZCwgRXhpdCBzdGF0dXM6IDMKIAogICAg ICAgICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0U2hlbGwo d29ya2Rpcj0nd2tkaXInLAorICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxz ZSwKICAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydweXRob24nLCAnVG9vbHMvU2Ny aXB0cy9ydW4tYXBpLXRlc3RzJywgJy0tbm8tYnVpbGQnLCAnLS1kZWJ1ZycsICctLXZlcmJvc2Un LCAnLS1qc29uLW91dHB1dD17MH0nLmZvcm1hdChzZWxmLmpzb25GaWxlTmFtZSldLAogICAgICAg ICAgICAgICAgICAgICAgICAgbG9nZmlsZXM9eydqc29uJzogc2VsZi5qc29uRmlsZU5hbWV9LAog ICAgICAgICAgICAgICAgICAgICAgICAgKQpAQCAtMTM2Myw2ICsxMzc1LDcgQEAgVGVzdGluZyBj b21wbGV0ZWQsIEV4aXQgc3RhdHVzOiAzCiAKICAgICAgICAgc2VsZi5leHBlY3RSZW1vdGVDb21t YW5kcygKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywKKyAgICAgICAg ICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCiAgICAgICAgICAgICAgICAgICAgICAg ICBjb21tYW5kPVsncHl0aG9uJywgJ1Rvb2xzL1NjcmlwdHMvcnVuLWFwaS10ZXN0cycsICctLW5v LWJ1aWxkJywgJy0tZGVidWcnLCAnLS12ZXJib3NlJywgJy0tanNvbi1vdXRwdXQ9ezB9Jy5mb3Jt YXQoc2VsZi5qc29uRmlsZU5hbWUpXSwKICAgICAgICAgICAgICAgICAgICAgICAgIGxvZ2ZpbGVz PXsnanNvbic6IHNlbGYuanNvbkZpbGVOYW1lfSwKICAgICAgICAgICAgICAgICAgICAgICAgICkK QEAgLTEzODAsNiArMTM5Myw3IEBAIFRlc3RpbmcgY29tcGxldGVkLCBFeGl0IHN0YXR1czogMwog CiAgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCiAgICAgICAgICAgICBFeHBlY3RT aGVsbCh3b3JrZGlyPSd3a2RpcicsCisgICAgICAgICAgICAgICAgICAgICAgICBsb2dFbnZpcm9u PUZhbHNlLAogICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3B5dGhvbicsICdUb29s cy9TY3JpcHRzL3J1bi1hcGktdGVzdHMnLCAnLS1uby1idWlsZCcsICctLWRlYnVnJywgJy0tdmVy Ym9zZScsICctLWpzb24tb3V0cHV0PXswfScuZm9ybWF0KHNlbGYuanNvbkZpbGVOYW1lKV0sCiAg ICAgICAgICAgICAgICAgICAgICAgICBsb2dmaWxlcz17J2pzb24nOiBzZWxmLmpzb25GaWxlTmFt ZX0sCiAgICAgICAgICAgICAgICAgICAgICAgICApCg==