Commit 5bab27a2 authored by evliu's avatar evliu Committed by Commit Bot

Define tests to be run for SODA

This CL defines the SODA tests to be run in the internal SODA waterfall.

Bug: 1124873
Change-Id: I57296bb239dba6c03ef0e231ed30e8d043a35e50
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2406591Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Commit-Queue: Evan Liu <evliu@google.com>
Cr-Commit-Position: refs/heads/master@{#806796}
parent 3d6f8921
...@@ -4033,6 +4033,34 @@ ...@@ -4033,6 +4033,34 @@
} }
] ]
}, },
"soda-linux": {
"additional_compile_targets": [
"unit_tests"
],
"gtest_tests": [
{
"args": [
"--gtest_filter=SodaClient*"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Linux",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "unit_tests",
"test_id_prefix": "ninja://chrome/test:unit_tests/"
}
]
},
"win-chrome": { "win-chrome": {
"additional_compile_targets": [ "additional_compile_targets": [
"chrome", "chrome",
......
...@@ -1442,7 +1442,7 @@ class BBJSONGenerator(object): ...@@ -1442,7 +1442,7 @@ class BBJSONGenerator(object):
def get_internal_waterfalls(self): def get_internal_waterfalls(self):
# Similar to get_builders_that_do_not_actually_exist above, but for # Similar to get_builders_that_do_not_actually_exist above, but for
# waterfalls defined in internal configs. # waterfalls defined in internal configs.
return ['chrome', 'chrome.pgo'] return ['chrome', 'chrome.pgo', 'internal.soda']
def check_input_file_consistency(self, verbose=False): def check_input_file_consistency(self, verbose=False):
self.check_input_files_sorting(verbose) self.check_input_files_sorting(verbose)
......
{
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {},
"soda-linux": {
"additional_compile_targets": [
"unit_tests"
],
"gtest_tests": [
{
"args": [
"--gtest_filter=SodaClient*"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Linux",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "unit_tests",
"test_id_prefix": "ninja://chrome/test:unit_tests/"
}
]
}
}
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
'android_ar_gtests': { 'android_ar_gtests': {
'monochrome_public_test_ar_apk': {}, 'monochrome_public_test_ar_apk': {},
}, },
'android_ddready_vr_gtests': { 'android_ddready_vr_gtests': {
'chrome_public_test_vr_apk-ddready-cardboard': { 'chrome_public_test_vr_apk-ddready-cardboard': {
'args': [ 'args': [
...@@ -3998,7 +3997,11 @@ ...@@ -3998,7 +3997,11 @@
'results_handler': 'layout tests', 'results_handler': 'layout tests',
}, },
}, },
'soda_gtests': {
'unit_tests': {
'args': ['--gtest_filter=SodaClient*'],
},
},
# TODO(https://crbug.com/1057802): Remove these tests once Out-of-Process # TODO(https://crbug.com/1057802): Remove these tests once Out-of-Process
# Storage is on by default. # Storage is on by default.
'storage_service_gtests': { 'storage_service_gtests': {
......
...@@ -5514,6 +5514,30 @@ ...@@ -5514,6 +5514,30 @@
}, },
}, },
}, },
{
'project': 'chrome',
'bucket': 'ci',
'name': 'internal.soda',
'machines': {
'soda-linux': {
'additional_compile_targets': [
'unit_tests',
],
'test_suites': {
'gtest_tests': 'soda_gtests',
},
'swarming': {
'dimension_sets': [
{
'os': 'Linux',
'pool': 'chrome.tests',
},
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com",
},
},
},
},
{ {
'project': 'chromium', 'project': 'chromium',
'bucket': 'try', 'bucket': 'try',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment