[Flakiness Dashboard] Remove everything Chromium from the builders.json-generating script
https://bugs.webkit.org/show_bug.cgi?id=114603
Reviewed by Ryosuke Niwa.
* TestResultServer/generate_builders_json.py:
(insert_builder_and_test_data): Only process the 'layout-tests' steps, but force the name that's used
to represent these to be 'layout-test', for backwards compatibility.
(main): Remove all the build.chromium.org masters.
* TestResultServer/generate_builders_json_unittest.py: Clean up the Chromium-related test cases and update other ones.
(GenerateBuildersJsonTest.test_generate_json_data.dummy_fetch_json):
(GenerateBuildersJsonTest):
(GenerateBuildersJsonTest.test_generate_json_data):
* TestResultServer/static-dashboards/builders.jsonp: Updated after changes to the script, now only lists the
test-running builders from the webkit.org master.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@149611 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/TestResultServer/generate_builders_json.py b/Tools/TestResultServer/generate_builders_json.py
index 1cc1ec2..4368845 100644
--- a/Tools/TestResultServer/generate_builders_json.py
+++ b/Tools/TestResultServer/generate_builders_json.py
@@ -71,16 +71,12 @@
for step in fetch_json(cached_build_json_url(master_url, builder, latest_cached_build))['steps']:
step_name = step['name']
-
- # The chromium bots call this step webkit-tests, the webkit.org bots call it layout-test. :(
- # The files stored at webkit-test-results.appspot.com use layout-tests as the test suite name, so normalize to that.
- if step_name in ['layout-test', 'webkit_tests']:
- step_name = 'layout-tests'
-
- is_test = step_name == 'layout-tests' if master['name'] == 'webkit.org' else 'test' in step_name and 'archive' not in step_name
- if not is_test:
+ if step_name != 'layout-test':
continue
+ # Adjust for backwards compatibility
+ step_name = 'layout-tests'
+
if step_name not in tests_object:
tests_object[step_name] = {'builders': []}
tests_object[step_name]['builders'].append(builder)
@@ -97,22 +93,13 @@
logging.getLogger().setLevel(logging.DEBUG if options.verbose else logging.INFO)
masters = [
- {'name': 'ChromiumWin', 'url': 'http://build.chromium.org/p/chromium.win'},
- {'name': 'ChromiumMac', 'url': 'http://build.chromium.org/p/chromium.mac'},
- {'name': 'ChromiumLinux', 'url': 'http://build.chromium.org/p/chromium.linux'},
- {'name': 'ChromiumChromiumOS', 'url': 'http://build.chromium.org/p/chromium.chromiumos'},
- {'name': 'ChromiumGPU', 'url': 'http://build.chromium.org/p/chromium.gpu'},
- {'name': 'ChromiumGPUFYI', 'url': 'http://build.chromium.org/p/chromium.gpu.fyi'},
- {'name': 'ChromiumPerfAv', 'url': 'http://build.chromium.org/p/chromium.perf_av'},
- {'name': 'ChromiumWebkit', 'url': 'http://build.chromium.org/p/chromium.webkit'},
- {'name': 'ChromiumFYI', 'url': 'http://build.chromium.org/p/chromium.fyi'},
{'name': 'webkit.org', 'url': 'http://build.webkit.org'},
]
insert_builder_and_test_data(masters)
json_file_prefix = ('// This file is auto-generated by Tools/TestResultServer/generate_builders_json.py. It should not be manually modified.\n'
- '// It uses jsonp instead of proper json because we want to be able to load it from a file URL in Chrome for local testing.\n'
+ '// It uses jsonp instead of proper json because we want to be able to load it from a file URL for local testing.\n'
'LOAD_BUILDBOT_DATA(')
json_file_suffix = ');\n';
