Auto-generate //testing/buildbot/chromium.json.
This CL converts the chromium waterfall config to be
auto-generated using the new generate_buildbot_json framework.
[email protected], [email protected]
BUG=662541
Change-Id: I56c403369b4e0811fe604930d8da97048d434eda
Reviewed-on: https://chromium-review.googlesource.com/809958
Reviewed-by: John Budorick <[email protected]>
Reviewed-by: Kenneth Russell <[email protected]>
Commit-Queue: Dirk Pranke <[email protected]>
Cr-Commit-Position: refs/heads/master@{#522339}diff --git a/testing/buildbot/generate_buildbot_json.py b/testing/buildbot/generate_buildbot_json.py
index a802afa..f70b30ad 100755
--- a/testing/buildbot/generate_buildbot_json.py
+++ b/testing/buildbot/generate_buildbot_json.py
@@ -309,7 +309,8 @@
test = self.dictionary_merge(test, modifications)
for k in self.get_test_key_removals(test_name, tester_name):
del test[k]
- self.clean_swarming_dictionary(test['swarming'])
+ if 'swarming' in test:
+ self.clean_swarming_dictionary(test['swarming'])
return test
def generate_gtest(self, waterfall, tester_name, tester_config, test_name,
@@ -378,6 +379,7 @@
'name': test_name,
'script': test_config['script']
}
+ result = self.update_and_cleanup_test(result, test_name, tester_name)
return result
def generate_junit_test(self, waterfall, tester_name, tester_config,
