Skip to content

GitLab

T
tangled
Commit b50ba21f authored by Ben Pastene's avatar Ben Pastene Committed by Commit Bot
Browse files
Options

Remove cros_browser_sanity_test from all CrOS bots. 

This suite was useful when we were first spinning up tests on CrOS, as
it provides a smoke check of the browser.

Since then, we've also integrated Tast tests. And as more Tast tests
have been written, they've grown to provide coverage of everything that
the sanity test provided. (eg: tests like ui.ChromeLogin check the
browser's log in flow, arc.* tests cover ARC functionality.)

These days, you'll never see the sanity test fail without also seeing
at least one Tast test failing.

Bug: None
Change-Id: I2a7db54bec15eac7bf909970cdf21946a306817b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518661
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#824084}
parent d78bb734
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 602 deletions
build/chromeos/test_runner.py
View file @ b50ba21f
...@@ -42,9 +42,6 @@ CHROMITE_PATH = os.path.abspath( ...@@ -42,9 +42,6 @@ CHROMITE_PATH = os.path.abspath(
CROS_RUN_TEST_PATH = os.path.abspath( CROS_RUN_TEST_PATH = os.path.abspath(
os.path.join(CHROMITE_PATH, 'bin', 'cros_run_test')) os.path.join(CHROMITE_PATH, 'bin', 'cros_run_test'))
# GN target that corresponds to the cros browser sanity test.
SANITY_TEST_TARGET = 'cros_browser_sanity_test'
# This is a special hostname that resolves to a different DUT in the lab # This is a special hostname that resolves to a different DUT in the lab
# depending on which lab machine you're on. # depending on which lab machine you're on.
LAB_DUT_HOSTNAME = 'variable_chromeos_device_hostname' LAB_DUT_HOSTNAME = 'variable_chromeos_device_hostname'
...@@ -620,70 +617,6 @@ class GTestTest(RemoteTest): ...@@ -620,70 +617,6 @@ class GTestTest(RemoteTest):
os.remove(self._on_device_script) os.remove(self._on_device_script)
class BrowserSanityTest(RemoteTest):
def __init__(self, args, unknown_args):
super(BrowserSanityTest, self).__init__(args, unknown_args)
# 10 min should be enough time for the sanity test to pass.
self._retries = 1
self._timeout = 600
@property
def suite_name(self):
return SANITY_TEST_TARGET
def build_test_command(self):
if '--gtest_filter=%s' % SANITY_TEST_TARGET in self._additional_args:
logging.info('GTest filtering not supported for the sanity test. The '
'--gtest_filter arg will be ignored.')
self._additional_args.remove('--gtest_filter=%s' % SANITY_TEST_TARGET)
if any(arg.startswith('--gtest_repeat') for arg in self._additional_args):
logging.info(
'--gtest_repeat not supported for sanity test. The arg will be '
'ignored.')
self._additional_args = [
arg for arg in self._additional_args
if not arg.startswith('--gtest_repeat')
]
if self._additional_args:
logging.error(
'Sanity test should not have additional args: These will be '
'ignored: %s', self._additional_args)
# VMs don't have the disk space for an unstripped version of Chrome
# instrumented for code coverage, so only strip in that case.
if not self._use_vm or not os.environ.get('LLVM_PROFILE_FILE'):
self._test_cmd.append('--nostrip')
device_test_script_contents = self.BASIC_SHELL_SCRIPT[:]
if self._llvm_profile_var:
device_test_script_contents += [
'echo "LLVM_PROFILE_FILE=%s" >> /etc/chrome_dev.conf' %
(self._llvm_profile_var)
]
# vm_sanity.py is the sanity test, which is baked into the device image.
device_test_script_contents.append('/usr/local/autotest/bin/vm_sanity.py')
self._on_device_script = self.write_test_script_to_disk(
device_test_script_contents)
self._test_cmd += [
'--files',
os.path.relpath(self._on_device_script),
# The sanity test smoke-checks the system browser, so deploy our
# locally-built chrome to the device before testing.
'--deploy',
'--mount',
'--build-dir',
os.path.relpath(self._path_to_outdir, CHROMIUM_SRC_PATH),
'--',
'./' + os.path.relpath(self._on_device_script, self._path_to_outdir)
]
def device_test(args, unknown_args): def device_test(args, unknown_args):
# cros_run_test has trouble with relative paths that go up directories, # cros_run_test has trouble with relative paths that go up directories,
# so cd to src/, which should be the root of all data deps. # so cd to src/, which should be the root of all data deps.
...@@ -694,8 +627,6 @@ def device_test(args, unknown_args): ...@@ -694,8 +627,6 @@ def device_test(args, unknown_args):
# fix to https://github.com/PyCQA/pylint/issues/710. # fix to https://github.com/PyCQA/pylint/issues/710.
if args.test_type == 'tast': if args.test_type == 'tast':
test = TastTest(args, unknown_args) test = TastTest(args, unknown_args)
elif args.test_exe == SANITY_TEST_TARGET:
test = BrowserSanityTest(args, unknown_args)
else: else:
test = GTestTest(args, unknown_args) test = GTestTest(args, unknown_args)
...@@ -866,12 +797,7 @@ def main(): ...@@ -866,12 +797,7 @@ def main():
'--test-exe', '--test-exe',
type=str, type=str,
required=True, required=True,
help='Path to test executable to run inside the device. If the value is ' help='Path to test executable to run inside the device.')
'%s, the sanity test that ships with the device image runs instead. '
'This test smokes-check the system browser (eg: loads a simple '
'webpage, executes some javascript), so a fully-built Chrome binary '
'that can get deployed to the device is expected to be available in '
'the out-dir.' % SANITY_TEST_TARGET)
# GTest args. Some are passed down to the test binary in the device. Others # GTest args. Some are passed down to the test binary in the device. Others
# are parsed here since they might need tweaking or special handling. # are parsed here since they might need tweaking or special handling.
......
chromeos/BUILD.gn
View file @ b50ba21f
...@@ -249,21 +249,6 @@ if (is_chromeos_device) { ...@@ -249,21 +249,6 @@ if (is_chromeos_device) {
deploy_chrome = true deploy_chrome = true
} }
# The sanity test's actual binary is baked into the OS image. All we need to
# do is build the test wrapper and build our own browser to push to the DUT
# before testing it.
generate_runner_script("cros_browser_sanity_test") {
testonly = true
test_exe = "cros_browser_sanity_test"
generated_script = "$root_build_dir/bin/run_cros_browser_sanity_test"
runtime_deps_file = "$root_out_dir/cros_browser_sanity_test.runtime_deps"
data_deps = [
":cros_chrome_deploy",
"//:chromiumos_preflight", # Builds the browser.
]
}
tast_test("chrome_login_tast_tests") { tast_test("chrome_login_tast_tests") {
tast_tests = [ tast_tests = [
"ui.ChromeLogin", "ui.ChromeLogin",
......
testing/buildbot/chrome.json
View file @ b50ba21f
...@@ -34,28 +34,6 @@ ...@@ -34,28 +34,6 @@
"test": "chrome_all_tast_tests", "test": "chrome_all_tast_tests",
"test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/" "test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/"
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/"
},
{ {
"args": [ "args": [
"--strip-chrome" "--strip-chrome"
...@@ -191,28 +169,6 @@ ...@@ -191,28 +169,6 @@
"test": "chrome_all_tast_tests", "test": "chrome_all_tast_tests",
"test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/" "test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/"
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/"
},
{ {
"merge": { "merge": {
"args": [], "args": [],
...@@ -860,28 +816,6 @@ ...@@ -860,28 +816,6 @@
"test": "chrome_all_tast_tests", "test": "chrome_all_tast_tests",
"test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/" "test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/"
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/"
},
{ {
"merge": { "merge": {
"args": [], "args": [],
...@@ -1515,28 +1449,6 @@ ...@@ -1515,28 +1449,6 @@
"test": "chrome_all_tast_tests", "test": "chrome_all_tast_tests",
"test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/" "test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/"
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/"
},
{ {
"merge": { "merge": {
"args": [], "args": [],
...@@ -2167,28 +2079,6 @@ ...@@ -2167,28 +2079,6 @@
"test": "chrome_all_tast_tests", "test": "chrome_all_tast_tests",
"test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/" "test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/"
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/"
},
{ {
"merge": { "merge": {
"args": [], "args": [],
...@@ -2819,28 +2709,6 @@ ...@@ -2819,28 +2709,6 @@
"test": "chrome_all_tast_tests", "test": "chrome_all_tast_tests",
"test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/" "test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/"
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/"
},
{ {
"merge": { "merge": {
"args": [], "args": [],
...@@ -3419,31 +3287,6 @@ ...@@ -3419,31 +3287,6 @@
"script": "//testing/trigger_scripts/chromeos_device_trigger.py" "script": "//testing/trigger_scripts/chromeos_device_trigger.py"
} }
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{ {
"args": [ "args": [
"--strip-chrome" "--strip-chrome"
...@@ -3589,31 +3432,6 @@ ...@@ -3589,31 +3432,6 @@
"script": "//testing/trigger_scripts/chromeos_device_trigger.py" "script": "//testing/trigger_scripts/chromeos_device_trigger.py"
} }
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{ {
"args": [ "args": [
"--strip-chrome" "--strip-chrome"
...@@ -3759,31 +3577,6 @@ ...@@ -3759,31 +3577,6 @@
"script": "//testing/trigger_scripts/chromeos_device_trigger.py" "script": "//testing/trigger_scripts/chromeos_device_trigger.py"
} }
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{ {
"args": [ "args": [
"--strip-chrome" "--strip-chrome"
...@@ -3929,31 +3722,6 @@ ...@@ -3929,31 +3722,6 @@
"script": "//testing/trigger_scripts/chromeos_device_trigger.py" "script": "//testing/trigger_scripts/chromeos_device_trigger.py"
} }
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{ {
"args": [ "args": [
"--strip-chrome" "--strip-chrome"
...@@ -4099,31 +3867,6 @@ ...@@ -4099,31 +3867,6 @@
"script": "//testing/trigger_scripts/chromeos_device_trigger.py" "script": "//testing/trigger_scripts/chromeos_device_trigger.py"
} }
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{ {
"args": [ "args": [
"--strip-chrome" "--strip-chrome"
...@@ -4269,31 +4012,6 @@ ...@@ -4269,31 +4012,6 @@
"script": "//testing/trigger_scripts/chromeos_device_trigger.py" "script": "//testing/trigger_scripts/chromeos_device_trigger.py"
} }
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "kevin",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{ {
"args": [ "args": [
"--strip-chrome" "--strip-chrome"
...@@ -4377,31 +4095,6 @@ ...@@ -4377,31 +4095,6 @@
"script": "//testing/trigger_scripts/chromeos_device_trigger.py" "script": "//testing/trigger_scripts/chromeos_device_trigger.py"
} }
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "kevin",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{ {
"args": [ "args": [
"--strip-chrome" "--strip-chrome"
...@@ -4485,31 +4178,6 @@ ...@@ -4485,31 +4178,6 @@
"script": "//testing/trigger_scripts/chromeos_device_trigger.py" "script": "//testing/trigger_scripts/chromeos_device_trigger.py"
} }
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "kevin",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{ {
"args": [ "args": [
"--strip-chrome" "--strip-chrome"
...@@ -4593,31 +4261,6 @@ ...@@ -4593,31 +4261,6 @@
"script": "//testing/trigger_scripts/chromeos_device_trigger.py" "script": "//testing/trigger_scripts/chromeos_device_trigger.py"
} }
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "kevin",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{ {
"args": [ "args": [
"--strip-chrome" "--strip-chrome"
...@@ -4701,31 +4344,6 @@ ...@@ -4701,31 +4344,6 @@
"script": "//testing/trigger_scripts/chromeos_device_trigger.py" "script": "//testing/trigger_scripts/chromeos_device_trigger.py"
} }
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "kevin",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{ {
"args": [ "args": [
"--strip-chrome" "--strip-chrome"
......
testing/buildbot/chromium.chromiumos.json
View file @ b50ba21f
...@@ -236,42 +236,6 @@ ...@@ -236,42 +236,6 @@
"test": "chrome_all_tast_tests", "test": "chrome_all_tast_tests",
"test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/" "test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/"
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests"
}
],
"named_caches": [
{
"name": "cros_vm",
"path": "magic_cros_vm_cache"
}
],
"optional_dimensions": {
"60": [
{
"caches": "cros_vm"
}
]
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/"
},
{ {
"merge": { "merge": {
"args": [], "args": [],
...@@ -1240,31 +1204,6 @@ ...@@ -1240,31 +1204,6 @@
"trigger_script": { "trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py" "script": "//testing/trigger_scripts/chromeos_device_trigger.py"
} }
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "kevin",
"os": "ChromeOS",
"pool": "chromium.tests"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
} }
], ],
"isolated_scripts": [ "isolated_scripts": [
......
testing/buildbot/gn_isolate_map.pyl
View file @ b50ba21f
...@@ -723,14 +723,6 @@ ...@@ -723,14 +723,6 @@
"label": "//components/cronet/ios:cronet_unittests_ios", "label": "//components/cronet/ios:cronet_unittests_ios",
"type": "console_test_launcher", "type": "console_test_launcher",
}, },
"cros_browser_sanity_test": {
"label": "//chromeos:cros_browser_sanity_test",
"type": "generated_script",
"args": [
"--logs-dir=${ISOLATED_OUTDIR}",
"cros_browser_sanity_test",
],
},
"crypto_unittests": { "crypto_unittests": {
"label": "//crypto:crypto_unittests", "label": "//crypto:crypto_unittests",
"type": "console_test_launcher", "type": "console_test_launcher",
......
testing/buildbot/internal.chromeos.fyi.json
View file @ b50ba21f
...@@ -29,28 +29,6 @@ ...@@ -29,28 +29,6 @@
"test": "chrome_all_tast_tests", "test": "chrome_all_tast_tests",
"test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/" "test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/"
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r|kevin",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/"
},
{ {
"args": [ "args": [
"--strip-chrome" "--strip-chrome"
...@@ -131,32 +109,6 @@ ...@@ -131,32 +109,6 @@
"script": "//testing/trigger_scripts/chromeos_device_trigger.py" "script": "//testing/trigger_scripts/chromeos_device_trigger.py"
} }
}, },
{
"experiment_percentage": 100,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"resultdb": {
"enable": false
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{ {
"args": [ "args": [
"--strip-chrome" "--strip-chrome"
......
testing/buildbot/test_suite_exceptions.pyl
View file @ b50ba21f
...@@ -1196,13 +1196,6 @@ ...@@ -1196,13 +1196,6 @@
}, },
}, },
}, },
'cros_browser_sanity_test': {
'modifications': {
'chromeos-eve-arc-r-chrome': {
'experiment_percentage': 100, # https://crbug.com/1114741
},
},
},
'dawn_end2end_tests': { 'dawn_end2end_tests': {
'remove_from': [ 'remove_from': [
'Linux FYI Release (AMD R7 240)', # https://crbug.com/915430 'Linux FYI Release (AMD R7 240)', # https://crbug.com/915430
......
testing/buildbot/test_suites.pyl
View file @ b50ba21f
...@@ -449,12 +449,6 @@ ...@@ -449,12 +449,6 @@
'enable': False, 'enable': False,
}, },
}, },
'cros_browser_sanity_test': {
# TODO(crbug.com/1140593): Re-enable resultdb.
'resultdb': {
'enable': False,
}
},
'disk_usage_tast_test': { 'disk_usage_tast_test': {
"args": [ "args": [
# Stripping gives more accurate disk usage data. # Stripping gives more accurate disk usage data.
......
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