138878 2014-11-19 12:28:35 -0800 The buildbot dashboard should be compatible with buildbot-0.8.9 2014-11-19 15:58:19 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dburkart webkit-unassigned ap commit-queue mrowe oldest_to_newest 1049868 0 dburkart 2014-11-19 12:28:35 -0800 The dashboard should be compatible with 0.8.9 as well as older versions of buildbot to support both internal and open source infrastructure. Specifically, the logic for retrieving revisions from the buildbot instance is broken when used against buildbot-0.8.9. 1049874 1 241879 dburkart 2014-11-19 12:49:11 -0800 Created attachment 241879 Patch to make the dashboard compatible with 0.8.9 revision info 1049877 2 commit-queue 2014-11-19 12:51:58 -0800 Attachment 241879 did not pass style-queue: ERROR: Tools/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1049878 3 241880 dburkart 2014-11-19 12:53:11 -0800 Created attachment 241880 Add bug to changelog entry 1049893 4 241883 dburkart 2014-11-19 13:39:00 -0800 Created attachment 241883 Simplify previous patch to isolate the issue 1049933 5 241883 mrowe 2014-11-19 15:03:50 -0800 Comment on attachment 241883 Simplify previous patch to isolate the issue View in context: https://bugs.webkit.org/attachment.cgi?id=241883&action=review > Tools/ChangeLog:3 > + Make the dashboard compatible with buildbot-0.8.9 revision info. This doesn't really describe the issue since the dashboard was already compatible with v0.8.9. This is teaching it to cope with the fact that different masters may have different names for the codebases. > Tools/ChangeLog:9 > + (isMultiCodebaseGotRevisionProperty): This is no longer modified in your patch. > Tools/ChangeLog:10 > + (parseRevisionProperty): Changed. Needs a description of what's changed and why. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:104 > + if (typeof value === "object") { Shouldn't this check be: if (isMultiCodebaseGotRevisionProperty(property)) { > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:109 > + if (key in value) { > + value = value[key]; > + } else { > + value = value[fallbackKey]; > + } This could be: value = value[key] || value[fallbackKey]; Or if you want to be paranoid about falsey values: value = (key in value) ? value[key] : value[fallbackKey]; 1049936 6 241894 dburkart 2014-11-19 15:16:55 -0800 Created attachment 241894 Dashboard patch Updated patch with Mark's suggestions. 1049960 7 241894 mrowe 2014-11-19 15:53:57 -0800 Comment on attachment 241894 Dashboard patch View in context: https://bugs.webkit.org/attachment.cgi?id=241894&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:106 > + if (isMultiCodebaseGotRevisionProperty(property)) { > + value = (key in value) ? value[key] : value[fallbackKey]; > + } The braces are not necessary around the body of this if statement since it's only a single line. 1049966 8 dburkart 2014-11-19 15:58:19 -0800 Committed in r176361. 241879 2014-11-19 12:49:11 -0800 2014-11-19 12:53:11 -0800 Patch to make the dashboard compatible with 0.8.9 revision info dashboard.patch text/plain 3690 dburkart SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3NjMzMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE0LTExLTE5ICBEYW5hIEJ1cmthcnQgIDxkYnVya2FydEBhcHBsZS5jb20+ CisKKyAgICAgICAgTWFrZSB0aGUgZGFzaGJvYXJkIGNvbXBhdGlibGUgd2l0aCBidWlsZGJvdC0w LjguOSByZXZpc2lvbiBpbmZvLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv cHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RJdGVyYXRpb24uanM6CisgICAg ICAgIChpc011bHRpQ29kZWJhc2VHb3RSZXZpc2lvblByb3BlcnR5KToKKyAgICAgICAgKHBhcnNl UmV2aXNpb25Qcm9wZXJ0eSk6IENoYW5nZWQuCisKIDIwMTQtMTEtMTkgIENocmlzIEZsZWl6YWNo ICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogU2NyZWVuIGJyYWlsbGUgaW5w dXQgZG9lc24ndCB3b3JrIG9uIGZvcm1zLgpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVp bGRib3RJdGVyYXRpb24uanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVp bGRib3RJdGVyYXRpb24uanMJKHJldmlzaW9uIDE3NjMyOSkKKysrIFRvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3Jp cHRzL0J1aWxkYm90SXRlcmF0aW9uLmpzCSh3b3JraW5nIGNvcHkpCkBAIC05MywxNSArOTMsMjQg QEAgQnVpbGRib3RJdGVyYXRpb24uRXZlbnQgPSB7CiAvLyBTZWUgPGh0dHA6Ly9kb2NzLmJ1aWxk Ym90Lm5ldC8wLjguOC9tYW51YWwvY2ZnLXByb3BlcnRpZXMuaHRtbD4uCiBmdW5jdGlvbiBpc011 bHRpQ29kZWJhc2VHb3RSZXZpc2lvblByb3BlcnR5KHByb3BlcnR5KQogewotICAgIHJldHVybiBw cm9wZXJ0eVswXSA9PT0gImdvdF9yZXZpc2lvbiIgJiYgdHlwZW9mIHByb3BlcnR5WzFdID09PSAi b2JqZWN0IjsKKyAgICByZXR1cm4gcHJvcGVydHlbMF0gPT09ICJnb3RfcmV2aXNpb24iICYmICgo dHlwZW9mIHByb3BlcnR5WzFdID09PSAib2JqZWN0IiAmJiBwcm9wZXJ0eVsxXVsiV2ViS2l0Il0g JiYgcHJvcGVydHlbMV1bIkludGVybmFsIl0pIHx8IHByb3BlcnR5WzJdID09PSAiQ2hlY2tPdXRP cGVuU291cmNlIik7CiB9CiAKLWZ1bmN0aW9uIHBhcnNlUmV2aXNpb25Qcm9wZXJ0eShwcm9wZXJ0 eSwga2V5KQorZnVuY3Rpb24gcGFyc2VSZXZpc2lvblByb3BlcnR5KHByb3BlcnR5LCBrZXksIGZh bGxiYWNrS2V5KQogewogICAgIGlmICghcHJvcGVydHkpCiAgICAgICAgIHJldHVybiBudWxsOwog ICAgIHZhciB2YWx1ZSA9IHByb3BlcnR5WzFdOwotICAgIHJldHVybiBwYXJzZUludChpc011bHRp Q29kZWJhc2VHb3RSZXZpc2lvblByb3BlcnR5KHByb3BlcnR5KSA/IHZhbHVlW2tleV0gOiB2YWx1 ZSwgMTApOworCisgICAgaWYgKHR5cGVvZiB2YWx1ZSA9PT0gIm9iamVjdCIpIHsKKyAgICAgICAg aWYgKGtleSBpbiB2YWx1ZSkgeworICAgICAgICAgICAgdmFsdWUgPSB2YWx1ZVtrZXldOworICAg ICAgICB9IGVsc2UgeworICAgICAgICAgICAgdmFsdWUgPSB2YWx1ZVtmYWxsYmFja0tleV07Cisg ICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4gcGFyc2VJbnQodmFsdWUpOwogfQogCiBCdWls ZGJvdEl0ZXJhdGlvbi5wcm90b3R5cGUgPSB7CkBAIC0yNTIsMTEgKzI2MSwxMSBAQCBCdWlsZGJv dEl0ZXJhdGlvbi5wcm90b3R5cGUgPSB7CiAgICAgICAgIC8vIHJldmlzaW9uLiBUaGVyZWZvcmUs IHdlIG9ubHkgbG9vayBhdCBnb3RfcmV2aXNpb24gdG8gZXh0cmFjdCB0aGUgSW50ZXJuYWwgcmV2 aXNpb24gd2hlbiBpdCdzCiAgICAgICAgIC8vIGEgZGljdGlvbmFyeS4KIAotICAgICAgICB2YXIg b3BlblNvdXJjZVJldmlzaW9uUHJvcGVydHkgPSBkYXRhLnByb3BlcnRpZXMuZmluZEZpcnN0KGZ1 bmN0aW9uKHByb3BlcnR5KSB7IHJldHVybiBwcm9wZXJ0eVswXSA9PT0gImdvdF9yZXZpc2lvbiIg fHwgcHJvcGVydHlbMF0gPT09ICJyZXZpc2lvbiIgfHwgcHJvcGVydHlbMF0gPT09ICJvcGVuc291 cmNlX2dvdF9yZXZpc2lvbiI7IH0pOwotICAgICAgICB0aGlzLm9wZW5Tb3VyY2VSZXZpc2lvbiA9 IHBhcnNlUmV2aXNpb25Qcm9wZXJ0eShvcGVuU291cmNlUmV2aXNpb25Qcm9wZXJ0eSwgIldlYktp dCIpOworICAgICAgICB2YXIgb3BlblNvdXJjZVJldmlzaW9uUHJvcGVydHkgPSBkYXRhLnByb3Bl cnRpZXMuZmluZEZpcnN0KGZ1bmN0aW9uKHByb3BlcnR5KSB7IHJldHVybiAocHJvcGVydHlbMF0g PT09ICJnb3RfcmV2aXNpb24iICYmIHByb3BlcnR5WzJdID09PSAiQ2hlY2tvdXRXZWJLaXQiKSB8 fCAoKHByb3BlcnR5WzBdID09PSAiZ290X3JldmlzaW9uIiB8fCBwcm9wZXJ0eVswXSA9PT0gInJl dmlzaW9uIiB8fCBwcm9wZXJ0eVswXSA9PT0gIm9wZW5zb3VyY2VfZ290X3JldmlzaW9uIikgJiYg cHJvcGVydHlbMl0gIT09ICJDaGVja091dEludGVybmFsU291cmNlIik7IH0pOworICAgICAgICB0 aGlzLm9wZW5Tb3VyY2VSZXZpc2lvbiA9IHBhcnNlUmV2aXNpb25Qcm9wZXJ0eShvcGVuU291cmNl UmV2aXNpb25Qcm9wZXJ0eSwgIldlYktpdCIsICJvcGVuc291cmNlIik7CiAKLSAgICAgICAgdmFy IGludGVybmFsUmV2aXNpb25Qcm9wZXJ0eSA9IGRhdGEucHJvcGVydGllcy5maW5kRmlyc3QoZnVu Y3Rpb24ocHJvcGVydHkpIHsgcmV0dXJuIHByb3BlcnR5WzBdID09PSAiaW50ZXJuYWxfZ290X3Jl dmlzaW9uIiB8fCBpc011bHRpQ29kZWJhc2VHb3RSZXZpc2lvblByb3BlcnR5KHByb3BlcnR5KTsg fSk7Ci0gICAgICAgIHRoaXMuaW50ZXJuYWxSZXZpc2lvbiA9IHBhcnNlUmV2aXNpb25Qcm9wZXJ0 eShpbnRlcm5hbFJldmlzaW9uUHJvcGVydHksICJJbnRlcm5hbCIpOworICAgICAgICB2YXIgaW50 ZXJuYWxSZXZpc2lvblByb3BlcnR5ID0gZGF0YS5wcm9wZXJ0aWVzLmZpbmRGaXJzdChmdW5jdGlv bihwcm9wZXJ0eSkgeyByZXR1cm4gKHByb3BlcnR5WzBdID09PSAiZ290X3JldmlzaW9uIiAmJiBw cm9wZXJ0eVsyXSA9PT0gIkNoZWNrT3V0SW50ZXJuYWxTb3VyY2UiKSB8fCBwcm9wZXJ0eVswXSA9 PT0gImludGVybmFsX2dvdF9yZXZpc2lvbiIgfHwgaXNNdWx0aUNvZGViYXNlR290UmV2aXNpb25Q cm9wZXJ0eShwcm9wZXJ0eSk7IH0pOworICAgICAgICB0aGlzLmludGVybmFsUmV2aXNpb24gPSBw YXJzZVJldmlzaW9uUHJvcGVydHkoaW50ZXJuYWxSZXZpc2lvblByb3BlcnR5LCAiSW50ZXJuYWwi LCAiaW50ZXJuYWwiKTsKIAogICAgICAgICBmdW5jdGlvbiBzb3VyY2VTdGFtcENoYW5nZXMoc291 cmNlU3RhbXApIHsKICAgICAgICAgICAgIHZhciByZXN1bHQgPSBbXTsK 241880 2014-11-19 12:53:11 -0800 2014-11-19 13:39:00 -0800 Add bug to changelog entry dashboard.patch text/plain 3746 dburkart SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3NjMzMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE0LTExLTE5ICBEYW5hIEJ1cmthcnQgIDxkYnVya2FydEBhcHBsZS5jb20+ CisKKyAgICAgICAgTWFrZSB0aGUgZGFzaGJvYXJkIGNvbXBhdGlibGUgd2l0aCBidWlsZGJvdC0w LjguOSByZXZpc2lvbiBpbmZvLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTM4ODc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9w dWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdEl0ZXJhdGlvbi5qczoKKyAgICAg ICAgKGlzTXVsdGlDb2RlYmFzZUdvdFJldmlzaW9uUHJvcGVydHkpOgorICAgICAgICAocGFyc2VS ZXZpc2lvblByb3BlcnR5KTogQ2hhbmdlZC4KKwogMjAxNC0xMS0xOSAgQ2hyaXMgRmxlaXphY2gg IDxjZmxlaXphY2hAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBTY3JlZW4gYnJhaWxsZSBpbnB1 dCBkb2Vzbid0IHdvcmsgb24gZm9ybXMuCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9i dWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWls ZGJvdEl0ZXJhdGlvbi5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9i dWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWls ZGJvdEl0ZXJhdGlvbi5qcwkocmV2aXNpb24gMTc2MzI5KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvQnVpbGRib3RJdGVyYXRpb24uanMJKHdvcmtpbmcgY29weSkKQEAgLTkzLDE1ICs5MywyNCBA QCBCdWlsZGJvdEl0ZXJhdGlvbi5FdmVudCA9IHsKIC8vIFNlZSA8aHR0cDovL2RvY3MuYnVpbGRi b3QubmV0LzAuOC44L21hbnVhbC9jZmctcHJvcGVydGllcy5odG1sPi4KIGZ1bmN0aW9uIGlzTXVs dGlDb2RlYmFzZUdvdFJldmlzaW9uUHJvcGVydHkocHJvcGVydHkpCiB7Ci0gICAgcmV0dXJuIHBy b3BlcnR5WzBdID09PSAiZ290X3JldmlzaW9uIiAmJiB0eXBlb2YgcHJvcGVydHlbMV0gPT09ICJv YmplY3QiOworICAgIHJldHVybiBwcm9wZXJ0eVswXSA9PT0gImdvdF9yZXZpc2lvbiIgJiYgKCh0 eXBlb2YgcHJvcGVydHlbMV0gPT09ICJvYmplY3QiICYmIHByb3BlcnR5WzFdWyJXZWJLaXQiXSAm JiBwcm9wZXJ0eVsxXVsiSW50ZXJuYWwiXSkgfHwgcHJvcGVydHlbMl0gPT09ICJDaGVja091dE9w ZW5Tb3VyY2UiKTsKIH0KIAotZnVuY3Rpb24gcGFyc2VSZXZpc2lvblByb3BlcnR5KHByb3BlcnR5 LCBrZXkpCitmdW5jdGlvbiBwYXJzZVJldmlzaW9uUHJvcGVydHkocHJvcGVydHksIGtleSwgZmFs bGJhY2tLZXkpCiB7CiAgICAgaWYgKCFwcm9wZXJ0eSkKICAgICAgICAgcmV0dXJuIG51bGw7CiAg ICAgdmFyIHZhbHVlID0gcHJvcGVydHlbMV07Ci0gICAgcmV0dXJuIHBhcnNlSW50KGlzTXVsdGlD b2RlYmFzZUdvdFJldmlzaW9uUHJvcGVydHkocHJvcGVydHkpID8gdmFsdWVba2V5XSA6IHZhbHVl LCAxMCk7CisKKyAgICBpZiAodHlwZW9mIHZhbHVlID09PSAib2JqZWN0IikgeworICAgICAgICBp ZiAoa2V5IGluIHZhbHVlKSB7CisgICAgICAgICAgICB2YWx1ZSA9IHZhbHVlW2tleV07CisgICAg ICAgIH0gZWxzZSB7CisgICAgICAgICAgICB2YWx1ZSA9IHZhbHVlW2ZhbGxiYWNrS2V5XTsKKyAg ICAgICAgfQorICAgIH0KKworICAgIHJldHVybiBwYXJzZUludCh2YWx1ZSk7CiB9CiAKIEJ1aWxk Ym90SXRlcmF0aW9uLnByb3RvdHlwZSA9IHsKQEAgLTI1MiwxMSArMjYxLDExIEBAIEJ1aWxkYm90 SXRlcmF0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgLy8gcmV2aXNpb24uIFRoZXJlZm9yZSwg d2Ugb25seSBsb29rIGF0IGdvdF9yZXZpc2lvbiB0byBleHRyYWN0IHRoZSBJbnRlcm5hbCByZXZp c2lvbiB3aGVuIGl0J3MKICAgICAgICAgLy8gYSBkaWN0aW9uYXJ5LgogCi0gICAgICAgIHZhciBv cGVuU291cmNlUmV2aXNpb25Qcm9wZXJ0eSA9IGRhdGEucHJvcGVydGllcy5maW5kRmlyc3QoZnVu Y3Rpb24ocHJvcGVydHkpIHsgcmV0dXJuIHByb3BlcnR5WzBdID09PSAiZ290X3JldmlzaW9uIiB8 fCBwcm9wZXJ0eVswXSA9PT0gInJldmlzaW9uIiB8fCBwcm9wZXJ0eVswXSA9PT0gIm9wZW5zb3Vy Y2VfZ290X3JldmlzaW9uIjsgfSk7Ci0gICAgICAgIHRoaXMub3BlblNvdXJjZVJldmlzaW9uID0g cGFyc2VSZXZpc2lvblByb3BlcnR5KG9wZW5Tb3VyY2VSZXZpc2lvblByb3BlcnR5LCAiV2ViS2l0 Iik7CisgICAgICAgIHZhciBvcGVuU291cmNlUmV2aXNpb25Qcm9wZXJ0eSA9IGRhdGEucHJvcGVy dGllcy5maW5kRmlyc3QoZnVuY3Rpb24ocHJvcGVydHkpIHsgcmV0dXJuIChwcm9wZXJ0eVswXSA9 PT0gImdvdF9yZXZpc2lvbiIgJiYgcHJvcGVydHlbMl0gPT09ICJDaGVja291dFdlYktpdCIpIHx8 ICgocHJvcGVydHlbMF0gPT09ICJnb3RfcmV2aXNpb24iIHx8IHByb3BlcnR5WzBdID09PSAicmV2 aXNpb24iIHx8IHByb3BlcnR5WzBdID09PSAib3BlbnNvdXJjZV9nb3RfcmV2aXNpb24iKSAmJiBw cm9wZXJ0eVsyXSAhPT0gIkNoZWNrT3V0SW50ZXJuYWxTb3VyY2UiKTsgfSk7CisgICAgICAgIHRo aXMub3BlblNvdXJjZVJldmlzaW9uID0gcGFyc2VSZXZpc2lvblByb3BlcnR5KG9wZW5Tb3VyY2VS ZXZpc2lvblByb3BlcnR5LCAiV2ViS2l0IiwgIm9wZW5zb3VyY2UiKTsKIAotICAgICAgICB2YXIg aW50ZXJuYWxSZXZpc2lvblByb3BlcnR5ID0gZGF0YS5wcm9wZXJ0aWVzLmZpbmRGaXJzdChmdW5j dGlvbihwcm9wZXJ0eSkgeyByZXR1cm4gcHJvcGVydHlbMF0gPT09ICJpbnRlcm5hbF9nb3RfcmV2 aXNpb24iIHx8IGlzTXVsdGlDb2RlYmFzZUdvdFJldmlzaW9uUHJvcGVydHkocHJvcGVydHkpOyB9 KTsKLSAgICAgICAgdGhpcy5pbnRlcm5hbFJldmlzaW9uID0gcGFyc2VSZXZpc2lvblByb3BlcnR5 KGludGVybmFsUmV2aXNpb25Qcm9wZXJ0eSwgIkludGVybmFsIik7CisgICAgICAgIHZhciBpbnRl cm5hbFJldmlzaW9uUHJvcGVydHkgPSBkYXRhLnByb3BlcnRpZXMuZmluZEZpcnN0KGZ1bmN0aW9u KHByb3BlcnR5KSB7IHJldHVybiAocHJvcGVydHlbMF0gPT09ICJnb3RfcmV2aXNpb24iICYmIHBy b3BlcnR5WzJdID09PSAiQ2hlY2tPdXRJbnRlcm5hbFNvdXJjZSIpIHx8IHByb3BlcnR5WzBdID09 PSAiaW50ZXJuYWxfZ290X3JldmlzaW9uIiB8fCBpc011bHRpQ29kZWJhc2VHb3RSZXZpc2lvblBy b3BlcnR5KHByb3BlcnR5KTsgfSk7CisgICAgICAgIHRoaXMuaW50ZXJuYWxSZXZpc2lvbiA9IHBh cnNlUmV2aXNpb25Qcm9wZXJ0eShpbnRlcm5hbFJldmlzaW9uUHJvcGVydHksICJJbnRlcm5hbCIs ICJpbnRlcm5hbCIpOwogCiAgICAgICAgIGZ1bmN0aW9uIHNvdXJjZVN0YW1wQ2hhbmdlcyhzb3Vy Y2VTdGFtcCkgewogICAgICAgICAgICAgdmFyIHJlc3VsdCA9IFtdOwo= 241883 2014-11-19 13:39:00 -0800 2014-11-19 15:16:55 -0800 Simplify previous patch to isolate the issue dashboard.patch text/plain 3534 dburkart SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3NjMzMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE0LTExLTE5ICBEYW5hIEJ1cmthcnQgIDxkYnVya2FydEBhcHBsZS5jb20+ CisKKyAgICAgICAgTWFrZSB0aGUgZGFzaGJvYXJkIGNvbXBhdGlibGUgd2l0aCBidWlsZGJvdC0w LjguOSByZXZpc2lvbiBpbmZvLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTM4ODc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9w dWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdEl0ZXJhdGlvbi5qczoKKyAgICAg ICAgKGlzTXVsdGlDb2RlYmFzZUdvdFJldmlzaW9uUHJvcGVydHkpOgorICAgICAgICAocGFyc2VS ZXZpc2lvblByb3BlcnR5KTogQ2hhbmdlZC4KKwogMjAxNC0xMS0xOSAgQ2hyaXMgRmxlaXphY2gg IDxjZmxlaXphY2hAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBTY3JlZW4gYnJhaWxsZSBpbnB1 dCBkb2Vzbid0IHdvcmsgb24gZm9ybXMuCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9i dWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWls ZGJvdEl0ZXJhdGlvbi5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9i dWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWls ZGJvdEl0ZXJhdGlvbi5qcwkocmV2aXNpb24gMTc2MzI5KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvQnVpbGRib3RJdGVyYXRpb24uanMJKHdvcmtpbmcgY29weSkKQEAgLTk2LDEyICs5NiwxOSBA QCBmdW5jdGlvbiBpc011bHRpQ29kZWJhc2VHb3RSZXZpc2lvblByb3BlCiAgICAgcmV0dXJuIHBy b3BlcnR5WzBdID09PSAiZ290X3JldmlzaW9uIiAmJiB0eXBlb2YgcHJvcGVydHlbMV0gPT09ICJv YmplY3QiOwogfQogCi1mdW5jdGlvbiBwYXJzZVJldmlzaW9uUHJvcGVydHkocHJvcGVydHksIGtl eSkKK2Z1bmN0aW9uIHBhcnNlUmV2aXNpb25Qcm9wZXJ0eShwcm9wZXJ0eSwga2V5LCBmYWxsYmFj a0tleSkKIHsKICAgICBpZiAoIXByb3BlcnR5KQogICAgICAgICByZXR1cm4gbnVsbDsKICAgICB2 YXIgdmFsdWUgPSBwcm9wZXJ0eVsxXTsKLSAgICByZXR1cm4gcGFyc2VJbnQoaXNNdWx0aUNvZGVi YXNlR290UmV2aXNpb25Qcm9wZXJ0eShwcm9wZXJ0eSkgPyB2YWx1ZVtrZXldIDogdmFsdWUsIDEw KTsKKyAgICBpZiAodHlwZW9mIHZhbHVlID09PSAib2JqZWN0IikgeworICAgICAgICBpZiAoa2V5 IGluIHZhbHVlKSB7CisgICAgICAgICAgICB2YWx1ZSA9IHZhbHVlW2tleV07CisgICAgICAgIH0g ZWxzZSB7CisgICAgICAgICAgICB2YWx1ZSA9IHZhbHVlW2ZhbGxiYWNrS2V5XTsKKyAgICAgICAg fQorICAgIH0KKyAgICByZXR1cm4gcGFyc2VJbnQodmFsdWUpOwogfQogCiBCdWlsZGJvdEl0ZXJh dGlvbi5wcm90b3R5cGUgPSB7CkBAIC0yNDIsOCArMjQ5LDYgQEAgQnVpbGRib3RJdGVyYXRpb24u cHJvdG90eXBlID0gewogICAgICAgICAvLwogICAgICAgICAvLyBbImdvdF9yZXZpc2lvbiIseyJJ bnRlcm5hbCI6IjEzNTciLCJXZWJLaXRPcGVuU291cmNlIjoiMjQ2OCJ9LCJTb3VyY2UiXQogICAg ICAgICAvLyBPUgotICAgICAgICAvLyBbImdvdF9yZXZpc2lvbiIsIjI0NjhfMTM1NyIsIlNvdXJj ZSJdCi0gICAgICAgIC8vIE9SCiAgICAgICAgIC8vIFsiZ290X3JldmlzaW9uIiwiMjQ2OCIsIlNv dXJjZSJdCiAgICAgICAgIC8vCiAgICAgICAgIC8vIFdoZW4gZXh0cmFjdGluZyB0aGUgT3BlblNv dXJjZSByZXZpc2lvbiBmcm9tIHByb3BlcnR5IGdvdF9yZXZpc2lvbiB3ZSBkb24ndCBuZWVkIHRv IGNoZWNrIHdoZXRoZXIgdGhlCkBAIC0yNTIsMTEgKzI1NywxMSBAQCBCdWlsZGJvdEl0ZXJhdGlv bi5wcm90b3R5cGUgPSB7CiAgICAgICAgIC8vIHJldmlzaW9uLiBUaGVyZWZvcmUsIHdlIG9ubHkg bG9vayBhdCBnb3RfcmV2aXNpb24gdG8gZXh0cmFjdCB0aGUgSW50ZXJuYWwgcmV2aXNpb24gd2hl biBpdCdzCiAgICAgICAgIC8vIGEgZGljdGlvbmFyeS4KIAotICAgICAgICB2YXIgb3BlblNvdXJj ZVJldmlzaW9uUHJvcGVydHkgPSBkYXRhLnByb3BlcnRpZXMuZmluZEZpcnN0KGZ1bmN0aW9uKHBy b3BlcnR5KSB7IHJldHVybiBwcm9wZXJ0eVswXSA9PT0gImdvdF9yZXZpc2lvbiIgfHwgcHJvcGVy dHlbMF0gPT09ICJyZXZpc2lvbiIgfHwgcHJvcGVydHlbMF0gPT09ICJvcGVuc291cmNlX2dvdF9y ZXZpc2lvbiI7IH0pOwotICAgICAgICB0aGlzLm9wZW5Tb3VyY2VSZXZpc2lvbiA9IHBhcnNlUmV2 aXNpb25Qcm9wZXJ0eShvcGVuU291cmNlUmV2aXNpb25Qcm9wZXJ0eSwgIldlYktpdCIpOworICAg ICAgICB2YXIgb3BlblNvdXJjZVJldmlzaW9uUHJvcGVydHkgPSBkYXRhLnByb3BlcnRpZXMuZmlu ZEZpcnN0KGZ1bmN0aW9uKHByb3BlcnR5KSB7IHJldHVybiBwcm9wZXJ0eVswXSA9PT0gImdvdF9y ZXZpc2lvbiI7IH0pOworICAgICAgICB0aGlzLm9wZW5Tb3VyY2VSZXZpc2lvbiA9IHBhcnNlUmV2 aXNpb25Qcm9wZXJ0eShvcGVuU291cmNlUmV2aXNpb25Qcm9wZXJ0eSwgIldlYktpdCIsICJvcGVu c291cmNlIik7CiAKLSAgICAgICAgdmFyIGludGVybmFsUmV2aXNpb25Qcm9wZXJ0eSA9IGRhdGEu cHJvcGVydGllcy5maW5kRmlyc3QoZnVuY3Rpb24ocHJvcGVydHkpIHsgcmV0dXJuIHByb3BlcnR5 WzBdID09PSAiaW50ZXJuYWxfZ290X3JldmlzaW9uIiB8fCBpc011bHRpQ29kZWJhc2VHb3RSZXZp c2lvblByb3BlcnR5KHByb3BlcnR5KTsgfSk7Ci0gICAgICAgIHRoaXMuaW50ZXJuYWxSZXZpc2lv biA9IHBhcnNlUmV2aXNpb25Qcm9wZXJ0eShpbnRlcm5hbFJldmlzaW9uUHJvcGVydHksICJJbnRl cm5hbCIpOworICAgICAgICB2YXIgaW50ZXJuYWxSZXZpc2lvblByb3BlcnR5ID0gZGF0YS5wcm9w ZXJ0aWVzLmZpbmRGaXJzdChmdW5jdGlvbihwcm9wZXJ0eSkgeyByZXR1cm4gaXNNdWx0aUNvZGVi YXNlR290UmV2aXNpb25Qcm9wZXJ0eShwcm9wZXJ0eSk7IH0pOworICAgICAgICB0aGlzLmludGVy bmFsUmV2aXNpb24gPSBwYXJzZVJldmlzaW9uUHJvcGVydHkoaW50ZXJuYWxSZXZpc2lvblByb3Bl cnR5LCAiSW50ZXJuYWwiLCAiaW50ZXJuYWwiKTsKIAogICAgICAgICBmdW5jdGlvbiBzb3VyY2VT dGFtcENoYW5nZXMoc291cmNlU3RhbXApIHsKICAgICAgICAgICAgIHZhciByZXN1bHQgPSBbXTsK 241894 2014-11-19 15:16:55 -0800 2014-11-19 15:53:57 -0800 Dashboard patch parseRevisionProperty.patch text/plain 3627 dburkart SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3NjMzMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDE0LTExLTE5ICBEYW5hIEJ1cmthcnQgIDxkYnVya2FydEBhcHBsZS5jb20+ CisKKyAgICAgICAgV29yayBhcm91bmQgdGhlIGZhY3QgdGhhdCBkaWZmZXJlbnQgbWFzdGVycyBt YXkgaGF2ZSBkaWZmZXJlbnQgbmFtZXMgZm9yIHRoZWlyIGNvZGViYXNlcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODg3OAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVp bGRib3RJdGVyYXRpb24uanM6CisgICAgICAgIChwYXJzZVJldmlzaW9uUHJvcGVydHkpOiBDaGFu Z2VkLgorICAgICAgICBUYWtlIGEgImZhbGxiYWNrIGtleSIgaW4gYWRkaXRpb24gdG8gdGhlIHBy aW1hcnkga2V5LCBzbyB3ZSBjYW4gZGVhbCB3aXRoIGluY29uc2lzdGVuY2llcyBpbgorICAgICAg ICBvcGVuc291cmNlIC8gaW50ZXJuYWwgY29kZWJhc2UgbmFtaW5nIGNvbnZlbnRpb24uCisKIDIw MTQtMTEtMTkgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAg ICBBWDogU2NyZWVuIGJyYWlsbGUgaW5wdXQgZG9lc24ndCB3b3JrIG9uIGZvcm1zLgpJbmRleDog VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0 bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RJdGVyYXRpb24uanMKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0 bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RJdGVyYXRpb24uanMJKHJldmlzaW9uIDE3NjMy OSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1 YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90SXRlcmF0aW9uLmpzCSh3b3JraW5n IGNvcHkpCkBAIC05NiwxMiArOTYsMTUgQEAgZnVuY3Rpb24gaXNNdWx0aUNvZGViYXNlR290UmV2 aXNpb25Qcm9wZQogICAgIHJldHVybiBwcm9wZXJ0eVswXSA9PT0gImdvdF9yZXZpc2lvbiIgJiYg dHlwZW9mIHByb3BlcnR5WzFdID09PSAib2JqZWN0IjsKIH0KIAotZnVuY3Rpb24gcGFyc2VSZXZp c2lvblByb3BlcnR5KHByb3BlcnR5LCBrZXkpCitmdW5jdGlvbiBwYXJzZVJldmlzaW9uUHJvcGVy dHkocHJvcGVydHksIGtleSwgZmFsbGJhY2tLZXkpCiB7CiAgICAgaWYgKCFwcm9wZXJ0eSkKICAg ICAgICAgcmV0dXJuIG51bGw7CiAgICAgdmFyIHZhbHVlID0gcHJvcGVydHlbMV07Ci0gICAgcmV0 dXJuIHBhcnNlSW50KGlzTXVsdGlDb2RlYmFzZUdvdFJldmlzaW9uUHJvcGVydHkocHJvcGVydHkp ID8gdmFsdWVba2V5XSA6IHZhbHVlLCAxMCk7CisgICAgaWYgKGlzTXVsdGlDb2RlYmFzZUdvdFJl dmlzaW9uUHJvcGVydHkocHJvcGVydHkpKSB7CisgICAgICAgIHZhbHVlID0gKGtleSBpbiB2YWx1 ZSkgPyB2YWx1ZVtrZXldIDogdmFsdWVbZmFsbGJhY2tLZXldOworICAgIH0KKyAgICByZXR1cm4g cGFyc2VJbnQodmFsdWUpOwogfQogCiBCdWlsZGJvdEl0ZXJhdGlvbi5wcm90b3R5cGUgPSB7CkBA IC0yNDIsOCArMjQ1LDYgQEAgQnVpbGRib3RJdGVyYXRpb24ucHJvdG90eXBlID0gewogICAgICAg ICAvLwogICAgICAgICAvLyBbImdvdF9yZXZpc2lvbiIseyJJbnRlcm5hbCI6IjEzNTciLCJXZWJL aXRPcGVuU291cmNlIjoiMjQ2OCJ9LCJTb3VyY2UiXQogICAgICAgICAvLyBPUgotICAgICAgICAv LyBbImdvdF9yZXZpc2lvbiIsIjI0NjhfMTM1NyIsIlNvdXJjZSJdCi0gICAgICAgIC8vIE9SCiAg ICAgICAgIC8vIFsiZ290X3JldmlzaW9uIiwiMjQ2OCIsIlNvdXJjZSJdCiAgICAgICAgIC8vCiAg ICAgICAgIC8vIFdoZW4gZXh0cmFjdGluZyB0aGUgT3BlblNvdXJjZSByZXZpc2lvbiBmcm9tIHBy b3BlcnR5IGdvdF9yZXZpc2lvbiB3ZSBkb24ndCBuZWVkIHRvIGNoZWNrIHdoZXRoZXIgdGhlCkBA IC0yNTIsMTEgKzI1MywxMSBAQCBCdWlsZGJvdEl0ZXJhdGlvbi5wcm90b3R5cGUgPSB7CiAgICAg ICAgIC8vIHJldmlzaW9uLiBUaGVyZWZvcmUsIHdlIG9ubHkgbG9vayBhdCBnb3RfcmV2aXNpb24g dG8gZXh0cmFjdCB0aGUgSW50ZXJuYWwgcmV2aXNpb24gd2hlbiBpdCdzCiAgICAgICAgIC8vIGEg ZGljdGlvbmFyeS4KIAotICAgICAgICB2YXIgb3BlblNvdXJjZVJldmlzaW9uUHJvcGVydHkgPSBk YXRhLnByb3BlcnRpZXMuZmluZEZpcnN0KGZ1bmN0aW9uKHByb3BlcnR5KSB7IHJldHVybiBwcm9w ZXJ0eVswXSA9PT0gImdvdF9yZXZpc2lvbiIgfHwgcHJvcGVydHlbMF0gPT09ICJyZXZpc2lvbiIg fHwgcHJvcGVydHlbMF0gPT09ICJvcGVuc291cmNlX2dvdF9yZXZpc2lvbiI7IH0pOwotICAgICAg ICB0aGlzLm9wZW5Tb3VyY2VSZXZpc2lvbiA9IHBhcnNlUmV2aXNpb25Qcm9wZXJ0eShvcGVuU291 cmNlUmV2aXNpb25Qcm9wZXJ0eSwgIldlYktpdCIpOworICAgICAgICB2YXIgb3BlblNvdXJjZVJl dmlzaW9uUHJvcGVydHkgPSBkYXRhLnByb3BlcnRpZXMuZmluZEZpcnN0KGZ1bmN0aW9uKHByb3Bl cnR5KSB7IHJldHVybiBwcm9wZXJ0eVswXSA9PT0gImdvdF9yZXZpc2lvbiI7IH0pOworICAgICAg ICB0aGlzLm9wZW5Tb3VyY2VSZXZpc2lvbiA9IHBhcnNlUmV2aXNpb25Qcm9wZXJ0eShvcGVuU291 cmNlUmV2aXNpb25Qcm9wZXJ0eSwgIldlYktpdCIsICJvcGVuc291cmNlIik7CiAKLSAgICAgICAg dmFyIGludGVybmFsUmV2aXNpb25Qcm9wZXJ0eSA9IGRhdGEucHJvcGVydGllcy5maW5kRmlyc3Qo ZnVuY3Rpb24ocHJvcGVydHkpIHsgcmV0dXJuIHByb3BlcnR5WzBdID09PSAiaW50ZXJuYWxfZ290 X3JldmlzaW9uIiB8fCBpc011bHRpQ29kZWJhc2VHb3RSZXZpc2lvblByb3BlcnR5KHByb3BlcnR5 KTsgfSk7Ci0gICAgICAgIHRoaXMuaW50ZXJuYWxSZXZpc2lvbiA9IHBhcnNlUmV2aXNpb25Qcm9w ZXJ0eShpbnRlcm5hbFJldmlzaW9uUHJvcGVydHksICJJbnRlcm5hbCIpOworICAgICAgICB2YXIg aW50ZXJuYWxSZXZpc2lvblByb3BlcnR5ID0gZGF0YS5wcm9wZXJ0aWVzLmZpbmRGaXJzdChmdW5j dGlvbihwcm9wZXJ0eSkgeyByZXR1cm4gaXNNdWx0aUNvZGViYXNlR290UmV2aXNpb25Qcm9wZXJ0 eShwcm9wZXJ0eSk7IH0pOworICAgICAgICB0aGlzLmludGVybmFsUmV2aXNpb24gPSBwYXJzZVJl dmlzaW9uUHJvcGVydHkoaW50ZXJuYWxSZXZpc2lvblByb3BlcnR5LCAiSW50ZXJuYWwiLCAiaW50 ZXJuYWwiKTsKIAogICAgICAgICBmdW5jdGlvbiBzb3VyY2VTdGFtcENoYW5nZXMoc291cmNlU3Rh bXApIHsKICAgICAgICAgICAgIHZhciByZXN1bHQgPSBbXTsK