<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185578] trunk/Websites/perf.webkit.org</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185578">185578</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-15 21:49:29 -0700 (Mon, 15 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Perf dashboard should be able to list iOS versions as well as OS X versions
https://bugs.webkit.org/show_bug.cgi?id=146003
Reviewed by Stephanie Lewis.
Generalized pull-osx.py so that it can run an arbitrary shell command to fetch OS versions based on
information specified in config.json.
* tools/pull-os-versions.py: Renamed from pull-osx.py.
(main): Use available_builds_from_command when 'customCommands' is specified.
(available_builds_from_command): Added. Executes a shell command to fetch a list of available builds.
(fetch_available_builds): Now takes the repository name.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgtoolspullosversionspy">trunk/Websites/perf.webkit.org/tools/pull-os-versions.py</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgtoolspullosxpy">trunk/Websites/perf.webkit.org/tools/pull-osx.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesperfwebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/ChangeLog (185577 => 185578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2015-06-16 02:11:41 UTC (rev 185577)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2015-06-16 04:49:29 UTC (rev 185578)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-06-15 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ Perf dashboard should be able to list iOS versions as well as OS X versions
+ https://bugs.webkit.org/show_bug.cgi?id=146003
+
+ Reviewed by Stephanie Lewis.
+
+ Generalized pull-osx.py so that it can run an arbitrary shell command to fetch OS versions based on
+ information specified in config.json.
+
+ * tools/pull-os-versions.py: Renamed from pull-osx.py.
+ (main): Use available_builds_from_command when 'customCommands' is specified.
+ (available_builds_from_command): Added. Executes a shell command to fetch a list of available builds.
+ (fetch_available_builds): Now takes the repository name.
+
+2015-06-15 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Removed a superfluous console.log per Chris's comment.
</span><span class="cx">
</span><span class="cx"> * public/v2/app.js:
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgtoolspullosversionspyfromrev185577trunkWebsitesperfwebkitorgtoolspullosxpy"></a>
<div class="copfile"><h4>Copied: trunk/Websites/perf.webkit.org/tools/pull-os-versions.py (from rev 185577, trunk/Websites/perf.webkit.org/tools/pull-osx.py) (0 => 185578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/tools/pull-os-versions.py (rev 0)
+++ trunk/Websites/perf.webkit.org/tools/pull-os-versions.py 2015-06-16 04:49:29 UTC (rev 185578)
</span><span class="lines">@@ -0,0 +1,108 @@
</span><ins>+#!/usr/bin/python
+
+import argparse
+import json
+import re
+import sys
+import subprocess
+import time
+import urllib
+import urllib2
+
+from xml.dom.minidom import parseString as parseXmlString
+from util import submit_commits
+from util import text_content
+
+
+HTTP_AUTH_HANDLERS = {
+ 'basic': urllib2.HTTPBasicAuthHandler,
+ 'digest': urllib2.HTTPDigestAuthHandler,
+}
+
+
+def main(argv):
+ parser = argparse.ArgumentParser()
+ parser.add_argument('--config', required=True, help='Path to a config JSON file')
+ args = parser.parse_args()
+
+ with open(args.config) as config_file:
+ config = json.load(config_file)
+
+ setup_auth(config['server'])
+
+ submission_size = config['submissionSize']
+ reported_revisions = set()
+
+ while True:
+ if 'customCommands' in config:
+ available_builds = []
+ for command in config['customCommands']:
+ print "Executing", ' '.join(command['command'])
+ available_builds += available_builds_from_command(config['repositoryName'], command['command'], command['linesToIgnore'])
+ print "Got %d builds" % len(available_builds)
+ else:
+ url = config['buildSourceURL']
+ print "Fetching available builds from", url
+ available_builds = fetch_available_builds(config['repositoryName'], url, config['trainVersionMap'])
+
+ available_builds = filter(lambda commit: commit['revision'] not in reported_revisions, available_builds)
+ print "%d builds available" % len(available_builds)
+
+ while available_builds:
+ commits_to_submit = available_builds[:submission_size]
+ revisions_to_report = map(lambda commit: commit['revision'], commits_to_submit)
+ print "Submitting builds (%d remaining):" % len(available_builds), json.dumps(revisions_to_report)
+ available_builds = available_builds[submission_size:]
+
+ submit_commits(commits_to_submit, config['server']['url'], config['slave']['name'], config['slave']['password'])
+ reported_revisions |= set(revisions_to_report)
+
+ time.sleep(config['submissionInterval'])
+
+ print "Sleeping for %d seconds", config['fetchInterval']
+ time.sleep(config['fetchInterval'])
+
+
+def setup_auth(server):
+ auth = server.get('auth')
+ if not auth:
+ return
+
+ password_manager = urllib2.HTTPPasswordMgr()
+ password_manager.add_password(realm=auth['realm'], uri=server['url'], user=auth['username'], passwd=auth['password'])
+ auth_handler = HTTP_AUTH_HANDLERS[auth['type']](password_manager)
+ urllib2.install_opener(urllib2.build_opener(auth_handler))
+
+
+def available_builds_from_command(repository_name, command, lines_to_ignore):
+ try:
+ output = subprocess.check_output(command, stderr=subprocess.STDOUT)
+ except subprocess.CalledProcessError as error:
+ print "Failed:", str(error)
+
+ regex = re.compile(lines_to_ignore)
+ return [{'repository': repository_name, 'revision': line} for line in output.split('\n') if not regex.match(line)]
+
+
+def fetch_available_builds(repository_name, url, train_version_map):
+ output = urllib2.urlopen(url).read()
+ try:
+ xml = parseXmlString(output)
+ except Exception, error:
+ raise Exception(error, output)
+ available_builds = []
+ for image in xml.getElementsByTagName('baseASR'):
+ id = text_content(image.getElementsByTagName('id')[0])
+ train = text_content(image.getElementsByTagName('train')[0])
+ build = text_content(image.getElementsByTagName('build')[0])
+ if train not in train_version_map:
+ continue
+ available_builds.append({
+ 'repository': repository_name,
+ 'revision': train_version_map[train] + ' ' + build})
+
+ return available_builds
+
+
+if __name__ == "__main__":
+ main(sys.argv)
</ins></span></pre></div>
<a id="trunkWebsitesperfwebkitorgtoolspullosxpy"></a>
<div class="delfile"><h4>Deleted: trunk/Websites/perf.webkit.org/tools/pull-osx.py (185577 => 185578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/tools/pull-osx.py 2015-06-16 02:11:41 UTC (rev 185577)
+++ trunk/Websites/perf.webkit.org/tools/pull-osx.py 2015-06-16 04:49:29 UTC (rev 185578)
</span><span class="lines">@@ -1,87 +0,0 @@
</span><del>-#!/usr/bin/python
-
-import argparse
-import json
-import sys
-import time
-import urllib
-import urllib2
-
-from xml.dom.minidom import parseString as parseXmlString
-from util import submit_commits
-from util import text_content
-
-
-HTTP_AUTH_HANDLERS = {
- 'basic': urllib2.HTTPBasicAuthHandler,
- 'digest': urllib2.HTTPDigestAuthHandler,
-}
-
-
-def main(argv):
- parser = argparse.ArgumentParser()
- parser.add_argument('--config', required=True, help='Path to a config JSON file')
- args = parser.parse_args()
-
- with open(args.config) as config_file:
- config = json.load(config_file)
-
- setup_auth(config['server'])
-
- url = config['buildSourceURL']
- submission_size = config['submissionSize']
- reported_revisions = set()
-
- while True:
- print "Fetching available builds from %s" % url
- available_builds = fetch_available_builds(url, config['trainVersionMap'])
- available_builds = filter(lambda commit: commit['revision'] not in reported_revisions, available_builds)
- print "%d builds available" % len(available_builds)
-
- while True:
- commits_to_submit = available_builds[:submission_size]
- revisions_to_report = map(lambda commit: commit['revision'], commits_to_submit)
- print "Submitting builds (%d remaining):" % len(available_builds), json.dumps(revisions_to_report)
- available_builds = available_builds[submission_size:]
-
- submit_commits(commits_to_submit, config['server']['url'], config['slave']['name'], config['slave']['password'])
- reported_revisions |= set(revisions_to_report)
-
- time.sleep(config['submissionInterval'])
-
- time.sleep(config['fetchInterval'])
-
-
-def setup_auth(server):
- auth = server.get('auth')
- if not auth:
- return
-
- password_manager = urllib2.HTTPPasswordMgr()
- password_manager.add_password(realm=auth['realm'], uri=server['url'], user=auth['username'], passwd=auth['password'])
- auth_handler = HTTP_AUTH_HANDLERS[auth['type']](password_manager)
- urllib2.install_opener(urllib2.build_opener(auth_handler))
-
-
-def fetch_available_builds(url, train_version_map):
- output = urllib2.urlopen(url).read()
- try:
- xml = parseXmlString(output)
- except Exception, error:
- raise Exception(error, output)
- available_builds = []
- for image in xml.getElementsByTagName('baseASR'):
- id = text_content(image.getElementsByTagName('id')[0])
- train = text_content(image.getElementsByTagName('train')[0])
- build = text_content(image.getElementsByTagName('build')[0])
- if train not in train_version_map:
- continue
- available_builds.append({
- 'repository': 'OS X',
- 'revision': train_version_map[train] + ' ' + build})
-
- return available_builds
-
-
-if __name__ == "__main__":
- main(sys.argv)
</del></span></pre>
</div>
</div>
</body>
</html>