Convert chromium.swarm to generate_buildbot_json.
[email protected], [email protected]
BUG=662541
Change-Id: I6ae85069dbc6ca615dcf1cde6e19946ed4bf781d
Reviewed-on: https://chromium-review.googlesource.com/818490
Commit-Queue: Dirk Pranke <[email protected]>
Reviewed-by: John Budorick <[email protected]>
Reviewed-by: Kenneth Russell <[email protected]>
Cr-Commit-Position: refs/heads/master@{#523005}diff --git a/testing/buildbot/chromium.swarm.json b/testing/buildbot/chromium.swarm.json
index 1c5d8a96..ad735403 100644
--- a/testing/buildbot/chromium.swarm.json
+++ b/testing/buildbot/chromium.swarm.json
@@ -1,4 +1,6 @@
{
+ "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
+ "AAAAA2 See generate_buildbot_json.py to make changes": {},
"Android N5 Swarm": {
"gtest_tests": [
{
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index 5f12c7cc..662688ee 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -580,6 +580,8 @@
'Marshmallow Phone Tester (rel)',
# chromium.clang
'ToTAndroidCFI',
+ # TODO(dpranke): on chromium.swarm, this is probably also an accident.
+ 'Android N5X Swarm',
],
'key_removals': {
'ToTAndroid x64': [
@@ -1041,6 +1043,12 @@
'Fuchsia x64 SANDBOX',
],
'modifications': {
+ # TODO(dpranke) - on chromium.swarm, remove this exception.
+ 'Android N5X Swarm': {
+ 'swarming': {
+ 'shards': 4,
+ },
+ },
'KitKat Tablet Tester': {
'swarming': {
'hard_timeout': 1200,
@@ -2764,7 +2772,7 @@
'shards': 2,
},
},
- # chromium.android
+ # chromium.memory
'Linux ASan LSan Tests (1)': {
'swarming': {
'shards': 2,
@@ -2780,6 +2788,12 @@
'shards': 2,
},
},
+ # chromium.swarm
+ 'Android N5X Swarm': {
+ 'swarming': {
+ 'shards': 8,
+ },
+ },
},
},
'url_unittests': {
@@ -3099,6 +3113,9 @@
'Nougat Phone Tester',
# chromium.clang
'ToTAndroid x64',
+ # On chromium.swarm, this should possibly be being run (or removed
+ # from Android N5X Swarm).
+ 'Android N5 Swarm',
],
'key_removals': {
# chromium.clang
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index 3f81d12..6cc1e62 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -325,6 +325,58 @@
'interactive_ui_tests': {},
},
+ 'chromium_swarm_android_gtests': {
+ 'base_unittests': {},
+ 'chrome_public_test_apk': {
+ 'swarming': {
+ 'shards': 14,
+ },
+ },
+ 'content_browsertests': {
+ 'swarming': {
+ 'shards': 10,
+ },
+ },
+ 'content_unittests': {
+ 'swarming': {
+ 'shards': 3,
+ },
+ },
+ 'content_shell_test_apk': {
+ 'swarming': {
+ 'shards': 3,
+ },
+ },
+ 'net_unittests': {
+ 'swarming': {
+ 'shards': 4,
+ },
+ },
+ 'unit_tests': {
+ 'swarming': {
+ 'shards': 5,
+ },
+ },
+ 'webview_instrumentation_test_apk': {
+ 'swarming': {
+ 'shards': 7,
+ },
+ },
+ },
+ 'chromium_swarm_desktop_gtests': {
+ 'base_unittests': {},
+ 'browser_tests': {
+ 'swarming': {
+ 'shards': 2,
+ },
+ },
+ 'content_browsertests': {},
+ 'content_unittests': {},
+ 'interactive_ui_tests': {},
+ 'net_unittests': {},
+ 'unit_tests': {},
+ },
+
'cronet_gtests': {
'cronet_sample_test_apk': {
'swarming': {
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index b764bdc5..583e177b 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -825,6 +825,56 @@
},
},
{
+ 'name': 'chromium.swarm',
+ 'machines': {
+ 'Android N5 Swarm': {
+ 'test_suites': {
+ 'gtest_tests': 'chromium_swarm_android_gtests',
+ },
+ 'swarming': {
+ 'dimension_sets': [
+ {
+ 'device_os': 'KTU84P',
+ 'device_type': 'hammerhead',
+ },
+ ],
+ 'expiration': 10800,
+ },
+ # 'os_type': 'android',
+ },
+ 'Android N5X Swarm': {
+ 'test_suites': {
+ 'gtest_tests': 'chromium_swarm_android_gtests',
+ },
+ 'swarming': {
+ 'dimension_sets': [
+ {
+ 'device_os': 'MMB29Q',
+ 'device_type': 'bullhead',
+ },
+ ],
+ 'expiration': 10800,
+ },
+ # 'os_type': 'android',
+ },
+ 'Linux Swarm': {
+ 'test_suites': {
+ 'gtest_tests': 'chromium_swarm_desktop_gtests',
+ },
+ },
+ 'Mac Swarm': {
+ 'test_suites': {
+ 'gtest_tests': 'chromium_swarm_desktop_gtests',
+ },
+ },
+ 'Windows Swarm': {
+ 'test_suites': {
+ 'gtest_tests': 'chromium_swarm_desktop_gtests',
+ },
+ },
+ },
+ },
+ {
'name': 'chromium.win',
'machines': {
'Win Builder': {
