Enable chrome_java_test_wpr_tests & webkit_unit_tests on MM emu CQ
These two test suites run fine since added in crrev.com/c/2659416. Now enabled them on android-marshmallow-x86-rel, and remove them from arm64-rel and x86-rel-non-cq builders. Also reorder the test group used by android-marshmallow-x86-rel to make it easier to adjust test suites in the future. Bug: 1127110, 1060399 Change-Id: I94374c9944633910cf66bdfcf271abc019e2e2b6 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2679941 Reviewed-by: Ben Pastene <bpastene@chromium.org> Commit-Queue: Haiyang Pan <hypan@google.com> Cr-Commit-Position: refs/heads/master@{#851390}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
b5f3931630
commit
90ed7c64e1
testing/buildbot
@ -27956,58 +27956,6 @@
|
||||
"test": "blink_platform_unittests",
|
||||
"test_id_prefix": "ninja://third_party/blink/renderer/platform:blink_platform_unittests/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices"
|
||||
],
|
||||
"isolate_profile_data": true,
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"webkit_unit_tests"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"name": "webkit_unit_tests",
|
||||
"resultdb": {
|
||||
"enable": true
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"device_os": "MMB29Q",
|
||||
"device_os_type": "userdebug",
|
||||
"device_type": "bullhead",
|
||||
"os": "Android"
|
||||
}
|
||||
],
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
|
||||
"shards": 4
|
||||
},
|
||||
"test": "blink_unittests",
|
||||
"test_id_prefix": "ninja://third_party/blink/renderer/controller:blink_unittests/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
@ -31149,7 +31097,6 @@
|
||||
"--recover-devices",
|
||||
"--avd-config=../../tools/android/avd/proto/generic_android23.textpb"
|
||||
],
|
||||
"experiment_percentage": 100,
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
@ -31215,7 +31162,6 @@
|
||||
"--avd-config=../../tools/android/avd/proto/generic_android23.textpb",
|
||||
"--git-revision=${got_revision}"
|
||||
],
|
||||
"experiment_percentage": 100,
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
@ -32130,70 +32076,6 @@
|
||||
"test": "blink_platform_unittests",
|
||||
"test_id_prefix": "ninja://third_party/blink/renderer/platform:blink_platform_unittests/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices",
|
||||
"--avd-config=../../tools/android/avd/proto/generic_android23.textpb"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"webkit_unit_tests"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"name": "webkit_unit_tests",
|
||||
"resultdb": {
|
||||
"enable": true
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"cpu": "x86-64",
|
||||
"device_os": null,
|
||||
"device_type": null,
|
||||
"machine_type": "n1-standard-4",
|
||||
"os": "Ubuntu-16.04",
|
||||
"pool": "chromium.tests.avd"
|
||||
}
|
||||
],
|
||||
"named_caches": [
|
||||
{
|
||||
"name": "avd_generic_android23",
|
||||
"path": ".android"
|
||||
},
|
||||
{
|
||||
"name": "system_images_android_23_google_apis_x86",
|
||||
"path": ".emulator_sdk"
|
||||
}
|
||||
],
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
|
||||
"shards": 4
|
||||
},
|
||||
"test": "blink_unittests",
|
||||
"test_id_prefix": "ninja://third_party/blink/renderer/controller:blink_unittests/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
@ -32568,74 +32450,6 @@
|
||||
"test": "cc_unittests",
|
||||
"test_id_prefix": "ninja://cc:cc_unittests/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices",
|
||||
"--avd-config=../../tools/android/avd/proto/generic_android23.textpb",
|
||||
"--git-revision=${got_revision}"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"chrome_java_test_wpr_tests"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"precommit_args": [
|
||||
"--gerrit-issue=${patch_issue}",
|
||||
"--gerrit-patchset=${patch_set}",
|
||||
"--buildbucket-id=${buildbucket_build_id}"
|
||||
],
|
||||
"resultdb": {
|
||||
"enable": true
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"cpu": "x86-64",
|
||||
"device_os": null,
|
||||
"device_type": null,
|
||||
"machine_type": "n1-standard-4",
|
||||
"os": "Ubuntu-16.04",
|
||||
"pool": "chromium.tests.avd"
|
||||
}
|
||||
],
|
||||
"named_caches": [
|
||||
{
|
||||
"name": "avd_generic_android23",
|
||||
"path": ".android"
|
||||
},
|
||||
{
|
||||
"name": "system_images_android_23_google_apis_x86",
|
||||
"path": ".emulator_sdk"
|
||||
}
|
||||
],
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "chrome_java_test_wpr_tests",
|
||||
"test_id_prefix": "ninja://chrome/test/android:chrome_java_test_wpr_tests/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
|
@ -60,15 +60,6 @@
|
||||
'android-code-coverage-native', # crbug/1018434
|
||||
],
|
||||
},
|
||||
'android_wpr_record_replay_tests': {
|
||||
# crbug/1060399: only enable wpr tests on marshmallow CI bot
|
||||
# due to the restriction that render test only works on marshamllow.
|
||||
'modifications': {
|
||||
'android-marshmallow-x86-rel-non-cq': {
|
||||
'experiment_percentage': 100, # https://crbug.com/1060399
|
||||
},
|
||||
},
|
||||
},
|
||||
'angle_end2end_tests': {
|
||||
'remove_from': [
|
||||
# TODO(ynovikov) Investigate why the test breaks on older devices.
|
||||
@ -707,14 +698,6 @@
|
||||
},
|
||||
},
|
||||
},
|
||||
'chrome_java_test_wpr_tests': {
|
||||
# TODO(crbug.com/1127110): Remove experimental once it works fine.
|
||||
'modifications': {
|
||||
'android-marshmallow-x86-rel': {
|
||||
'experiment_percentage': 100,
|
||||
},
|
||||
},
|
||||
},
|
||||
'chrome_modern_public_bundle_fake_modules_smoke_test': {
|
||||
'remove_from': [
|
||||
# Runs on android-marshmallow-x86-rel already (crbug.com/1127110)
|
||||
@ -2588,14 +2571,12 @@
|
||||
},
|
||||
'vr_common_unittests': {
|
||||
'remove_from': [
|
||||
'android-marshmallow-x86-rel-non-cq',
|
||||
'android-pie-x86-rel',
|
||||
'android-code-coverage-native', # crbug/1018431
|
||||
],
|
||||
},
|
||||
'vr_pixeltests': {
|
||||
'remove_from': [
|
||||
'android-marshmallow-x86-rel-non-cq',
|
||||
'android-pie-x86-rel',
|
||||
'VR Linux',
|
||||
'android-code-coverage-native', # crbug/1018431
|
||||
@ -2690,6 +2671,9 @@
|
||||
'Win 7 Tests x64 (1)',
|
||||
'android-code-coverage-native', # crbug/1018431
|
||||
'android-lollipop-arm-rel', # crbug.com/1133002#c6
|
||||
# Runs on android-marshmallow-x86-rel already (crbug.com/1127110)
|
||||
'android-marshmallow-arm64-rel',
|
||||
'android-marshmallow-x86-rel-non-cq',
|
||||
],
|
||||
'modifications': {
|
||||
'Linux ASan LSan Tests (1)': {
|
||||
@ -2710,10 +2694,6 @@
|
||||
'hard_timeout': 1200,
|
||||
},
|
||||
},
|
||||
# TODO(crbug.com/1127110): Remove experimental once it works fine.
|
||||
'android-marshmallow-x86-rel': {
|
||||
'experiment_percentage': 100,
|
||||
},
|
||||
'linux-blink-heap-concurrent-marking-tsan-rel': {
|
||||
'swarming': {
|
||||
'shards': 2,
|
||||
|
@ -99,25 +99,10 @@
|
||||
},
|
||||
},
|
||||
|
||||
# List gtests that run on android-marshmallow-x86-rel builder.
|
||||
# Test suites will be gradually moved from android_marshmallow_wpr_gtests
|
||||
# to this one, when there are more GCE capacity.
|
||||
'android_marshmallow_emulator_gtests': {
|
||||
# Tests from android_wpr_record_replay_tests
|
||||
'chrome_java_test_wpr_tests': {
|
||||
'mixins': [
|
||||
'chrome-gpu-gold-service-account',
|
||||
'skia_gold_test',
|
||||
],
|
||||
},
|
||||
|
||||
# Tests from android_modern_smoke_tests
|
||||
'chrome_modern_public_bundle_fake_modules_smoke_test': {},
|
||||
'chrome_modern_public_bundle_smoke_test': {},
|
||||
|
||||
# Tests from android_smoke_tests
|
||||
'chrome_public_smoke_test': {},
|
||||
|
||||
# List gtests that are part of other composition test suites.
|
||||
# MM emulator CQ builder currently has limited capacity so some composition
|
||||
# test suites cannot be fullly enabled at once.
|
||||
'android_marshmallow_emulator_limited_capacity_gtests': {
|
||||
# Tests from chromium_gtests_for_devices_with_graphical_output
|
||||
'unit_tests': {
|
||||
'android_swarming': {
|
||||
@ -5291,6 +5276,25 @@
|
||||
'weblayer_gtests',
|
||||
],
|
||||
|
||||
# List gtests that run on android-marshmallow-x86-rel builder.
|
||||
# Test suites will be gradually moved from android_marshmallow_wpr_gtests
|
||||
# to this one, when there are more GCE capacity.
|
||||
'android_marshmallow_emulator_gtests': [
|
||||
# TODO(crbug.com/1127110): Deprecate this when all the test suites below
|
||||
# it are re-enabled.
|
||||
'android_marshmallow_emulator_limited_capacity_gtests',
|
||||
|
||||
'android_modern_smoke_tests',
|
||||
'android_smoke_tests',
|
||||
#'android_specific_chromium_gtests', # Already includes gl_gtests.
|
||||
'android_wpr_record_replay_tests',
|
||||
#'chromium_gtests',
|
||||
#'chromium_gtests_for_devices_with_graphical_output',
|
||||
#'linux_flavor_specific_chromium_gtests',
|
||||
#'weblayer_android_gtests',
|
||||
#'weblayer_gtests',
|
||||
],
|
||||
|
||||
# Note that tests here are gradually moved to
|
||||
# android_marshmallow_emulator_gtests (crbug.com/1127110)
|
||||
#
|
||||
@ -5299,11 +5303,9 @@
|
||||
# is android_wpr_record_replay_tests
|
||||
'android_marshmallow_wpr_gtests': [
|
||||
'android_specific_chromium_gtests', # Already includes gl_gtests.
|
||||
'android_wpr_record_replay_tests', # only enabled on Marshmallow
|
||||
'chromium_gtests',
|
||||
'chromium_gtests_for_devices_with_graphical_output',
|
||||
'linux_flavor_specific_chromium_gtests',
|
||||
'vr_platform_specific_chromium_gtests',
|
||||
'weblayer_android_gtests',
|
||||
'weblayer_gtests',
|
||||
],
|
||||
|
Reference in New Issue
Block a user