Skip to content

GitLab

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

Remove all unittest suites from betty-pi-arc bot. 

betty-pi-arc should be identical to betty, but with a newer version of
android. Since basic gtest unittest suites shouldn't interact with that
level of the system, running them on both the vanilla betty and betty-pi-arc
bots is redundant.

Also rename & refactor several chromeos suites in test_suites.pyl to make
things clearer.

Bug: 1000513
Change-Id: I7755323689bb85f11174132267927c46e4885a42
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1867207Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707138}
parent 2312f55d
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 598 deletions
testing/buildbot/chrome.json
View file @ a40a5526
......@@ -565,98 +565,6 @@
"chromiumos_preflight"
],
"gtest_tests": [
{
"args": [
"--ozone-platform=headless"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "aura_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "base_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "cacheinvalidation_unittests"
},
{
"args": [
"--test-launcher-jobs=1",
"--gtest_filter=-*UsingRealWebcam_CaptureMjpeg*"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "capture_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "cc_unittests"
},
{
"merge": {
"args": [],
......@@ -675,23 +583,6 @@
},
"test": "chrome_all_tast_tests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "color_unittests"
},
{
"merge": {
"args": [],
......@@ -708,408 +599,6 @@
]
},
"test": "cros_browser_sanity_test"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "crypto_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "display_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "google_apis_unittests"
},
{
"args": [
"--stop-ui",
"--dbus-stub",
"--gtest_filter=SplitViewTest.SplitViewResize"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "interactive_ui_tests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "ipc_tests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "jingle_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "latency_unittests"
},
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.media_unittests.filter"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "media_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "midi_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "mojo_unittests"
},
{
"args": [
"--vpython-dir=../../vpython_dir_linux_amd64"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/vpython/linux-amd64",
"location": "vpython_dir_linux_amd64",
"revision": "git_revision:9a931a5307c46b16b1c12e01e8239d4a73830b89"
}
],
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
],
"shards": 3
},
"test": "net_unittests"
},
{
"args": [
"--stop-ui"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "ozone_gl_unittests"
},
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.ozone_unittests.filter"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "ozone_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "pdf_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "printing_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "profile_provider_unittest"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "sandbox_linux_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "sql_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
]
},
"test": "url_unittests"
}
],
"isolated_scripts": [
{
"args": [
"--browser=cros-chrome",
"--remote=127.0.0.1",
"--remote-ssh-port=9222",
"--xvfb"
],
"isolate_name": "telemetry_perf_unittests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "telemetry_perf_unittests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
],
"idempotent": false,
"shards": 6
}
},
{
"args": [
"--jobs=1",
"--browser=cros-chrome",
"--remote=127.0.0.1",
"--remote-ssh-port=9222"
],
"isolate_name": "telemetry_unittests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "telemetry_unittests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chrome.tests.cros-vm"
}
],
"idempotent": false,
"shards": 24
}
}
]
},
......
testing/buildbot/test_suites.pyl
View file @ a40a5526
......@@ -371,6 +371,15 @@
'chromedriver_replay_unittests': {},
},
'chromeos_browser_integration_tests': {
'chrome_all_tast_tests': {
'swarming': {
'idempotent': False, # https://crbug.com/923426#c27
},
},
'cros_browser_sanity_test': {},
},
'chromeos_device_all_chrome_tast_tests_informational': {
'chrome_all_tast_tests_informational': {
'swarming': {
......@@ -387,11 +396,78 @@
},
},
# Tests that run in Chrome OS VMs.
# GTests to run on Chrome OS devices, but not Chrome OS VMs. Any differences
# between this and chromeos_system_friendly_gtests below should only be due
# to resource constraints (ie: not enough devices).
'chromeos_device_only_gtests': {
'base_unittests': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.base_unittests.filter',
],
},
},
'chromeos_isolated_scripts': {
'telemetry_perf_unittests': {
'args': [
'--browser=cros-chrome',
# By default, CrOS VMs' ssh servers listen on local port 9222.
'--remote=127.0.0.1',
'--remote-ssh-port=9222',
'--xvfb'
],
'swarming': {
'idempotent': False, # https://crbug.com/549140
'shards': 6,
},
},
'telemetry_unittests': {
'args': [
'--jobs=1',
'--browser=cros-chrome',
# By default, CrOS VMs' ssh servers listen on local port 9222.
'--remote=127.0.0.1',
'--remote-ssh-port=9222',
],
'swarming': {
'idempotent': False, # https://crbug.com/549140
'shards': 24,
},
},
},
'chromeos_remote_device_isolated_tests': {
'telemetry_perf_unittests': {
'args': [
'--browser=cros-chrome',
# The magic hostname that resolves to a CrOS device in the test lab.
'--remote=variable_chromeos_device_hostname',
'--xvfb',
],
'swarming': {
'idempotent': False, # https://crbug.com/549140
},
},
'telemetry_unittests': {
'args': [
'--browser=cros-chrome',
# The magic hostname that resolves to a CrOS device in the test lab.
'--remote=variable_chromeos_device_hostname',
'--jobs=1',
],
'swarming': {
'idempotent': False, # https://crbug.com/549140
'shards': 10,
},
},
},
# Tests that run on Chrome OS systems (ie: VMs, Chromebooks), *not*
# linux-chromeos.
# NOTE: We only want a small subset of test suites here, because most
# suites assume that they stub out the underlying device hardware.
# https://crbug.com/865693
'chromeos_device_friendly_gtests': {
'chromeos_system_friendly_gtests': {
'aura_unittests': {
'args': [
'--ozone-platform=headless',
......@@ -408,13 +484,7 @@
],
},
'cc_unittests': {},
'chrome_all_tast_tests': {
'swarming': {
'idempotent': False, # https://crbug.com/923426#c27
},
},
'color_unittests': {},
'cros_browser_sanity_test': {},
'crypto_unittests': {},
'display_unittests': {},
'google_apis_unittests': {},
......@@ -467,7 +537,7 @@
'url_unittests': {},
},
'chromeos_device_friendly_gtests_experimental': {
'chromeos_system_friendly_gtests_experimental': {
'chrome_all_tast_tests_informational': {
'swarming': {
'idempotent': False, # https://crbug.com/923426#c27
......@@ -496,75 +566,6 @@
},
},
'chromeos_device_tests': {
'base_unittests': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.base_unittests.filter',
],
},
'chrome_all_tast_tests': {
'swarming': {
'idempotent': False, # https://crbug.com/923426#c27
},
},
'cros_browser_sanity_test': {},
},
'chromeos_isolated_scripts': {
'telemetry_perf_unittests': {
'args': [
'--browser=cros-chrome',
# By default, CrOS VMs' ssh servers listen on local port 9222.
'--remote=127.0.0.1',
'--remote-ssh-port=9222',
'--xvfb'
],
'swarming': {
'idempotent': False, # https://crbug.com/549140
'shards': 6,
},
},
'telemetry_unittests': {
'args': [
'--jobs=1',
'--browser=cros-chrome',
# By default, CrOS VMs' ssh servers listen on local port 9222.
'--remote=127.0.0.1',
'--remote-ssh-port=9222',
],
'swarming': {
'idempotent': False, # https://crbug.com/549140
'shards': 24,
},
},
},
'chromeos_remote_device_isolated_tests': {
'telemetry_perf_unittests': {
'args': [
'--browser=cros-chrome',
# The magic hostname that resolves to a CrOS device in the test lab.
'--remote=variable_chromeos_device_hostname',
'--xvfb',
],
'swarming': {
'idempotent': False, # https://crbug.com/549140
},
},
'telemetry_unittests': {
'args': [
'--browser=cros-chrome',
# The magic hostname that resolves to a CrOS device in the test lab.
'--remote=variable_chromeos_device_hostname',
'--jobs=1',
],
'swarming': {
'idempotent': False, # https://crbug.com/549140
'shards': 10,
},
},
},
'chromium_android_asan_gtests': {
# TODO(kbr): reduce duplication among these tests, and with other
# test suites.
......@@ -5301,6 +5302,16 @@
'bfcache_linux_specific_gtests',
],
'chromeos_device_gtests': [
'chromeos_browser_integration_tests',
'chromeos_device_only_gtests',
],
'chromeos_vm_gtests': [
'chromeos_browser_integration_tests',
'chromeos_system_friendly_gtests',
],
'chromium_android_gtests': [
'android_smoke_tests',
'android_specific_chromium_gtests', # Already includes gl_gtests.
......
testing/buildbot/waterfalls.pyl
View file @ a40a5526
......@@ -22,7 +22,7 @@
'chromiumos_preflight',
],
'test_suites': {
'gtest_tests': 'chromeos_device_friendly_gtests',
'gtest_tests': 'chromeos_vm_gtests',
'isolated_scripts': 'chromeos_isolated_scripts',
},
'swarming': {
......@@ -40,8 +40,7 @@
'chromiumos_preflight',
],
'test_suites': {
'gtest_tests': 'chromeos_device_friendly_gtests',
'isolated_scripts': 'chromeos_isolated_scripts',
'gtest_tests': 'chromeos_browser_integration_tests',
},
'swarming': {
'dimension_sets': [
......@@ -58,7 +57,7 @@
'chromiumos_preflight',
],
'test_suites': {
'gtest_tests': 'chromeos_device_tests',
'gtest_tests': 'chromeos_device_gtests',
},
'swarming': {
'dimension_sets': [
......@@ -76,7 +75,7 @@
'chromiumos_preflight',
],
'test_suites': {
'gtest_tests': 'chromeos_device_tests',
'gtest_tests': 'chromeos_device_gtests',
},
'swarming': {
'dimension_sets': [
......@@ -762,7 +761,7 @@
'os_type': 'chromeos',
'test_suites': {
'gpu_telemetry_tests': 'gpu_chromeos_telemetry_tests',
'gtest_tests': 'chromeos_device_friendly_gtests',
'gtest_tests': 'chromeos_vm_gtests',
'isolated_scripts': 'chromeos_isolated_scripts',
},
'swarming': {
......@@ -801,7 +800,7 @@
],
},
'test_suites': {
'gtest_tests': 'chromeos_device_tests',
'gtest_tests': 'chromeos_device_gtests',
'isolated_scripts': 'chromeos_remote_device_isolated_tests',
},
'os_type': 'chromeos',
......@@ -1676,7 +1675,7 @@
'chromiumos_preflight',
],
'test_suites': {
'gtest_tests': 'chromeos_device_friendly_gtests_experimental',
'gtest_tests': 'chromeos_system_friendly_gtests_experimental',
},
'swarming': {
'dimension_sets': [
......@@ -1717,7 +1716,7 @@
'code-coverage',
],
'test_suites': {
'gtest_tests': 'chromeos_device_friendly_gtests',
'gtest_tests': 'chromeos_vm_gtests',
},
'swarming': {
'dimension_sets': [
......
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