Commit 885b3b32 authored by Yuly Novikov's avatar Yuly Novikov Committed by Commit Bot

Stop running tests on "Linux FYI Experimental Release (NVIDIA)"

Since Linux FYI Release (NVIDIA) now runs the same OS and driver.

Move gpu_skia_renderer_vulkan_telemetry_tests and gpu_blink_web_tests_vulkan
testing to "Linux FYI SkiaRenderer Vulkan (NVIDIA)", where they belong.

TBR=kbr

Bug: 978103, 908932
Change-Id: Ibc48e7925c71de048e08b411cba9b6e131ed32cf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1730600Reviewed-by: default avatarYuly Novikov <ynovikov@chromium.org>
Reviewed-by: default avatarJonathan Ross <jonross@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683373}
parent 1c59fbf0
......@@ -8877,756 +8877,10 @@
]
},
"Linux FYI Experimental Release (NVIDIA)": {
"gtest_tests": [
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600,
"shards": 4
},
"test": "angle_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--no-xvfb"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600
},
"test": "angle_unittests"
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600
},
"test": "angle_white_box_tests"
},
{
"args": [
"--enable-gpu",
"--test-launcher-bot-mode",
"--test-launcher-jobs=1",
"--test-launcher-filter-file=../../testing/buildbot/filters/vulkan.content_browsertests.filter",
"--enable-features=VizDisplayCompositor,UseSkiaRenderer,UiGpuRasterization",
"--use-vulkan=native",
"--enable-oop-rasterization",
"--enable-gpu-rasterization",
"--force-gpu-rasterization",
"--disable-software-compositing-fallback",
"--disable-vulkan-fallback-to-gl-for-testing",
"--disable-headless-mode",
"--no-xvfb"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "vulkan_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600
},
"test": "content_browsertests"
},
{
"args": [
"--use-gpu-in-tests",
"--use-cmd-decoder=validating"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600
},
"test": "gl_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--no-xvfb"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600
},
"test": "gl_unittests"
},
{
"args": [
"--use-gpu-in-tests"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600
},
"test": "gles2_conform_test"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600
},
"test": "swiftshader_unittests"
}
],
"isolated_scripts": [
{
"args": [
"--gtest-benchmark-name=angle_perftests",
"-v",
"--one-frame-only"
],
"isolate_name": "angle_perftests",
"merge": {
"args": [
"--smoke-test-mode"
],
"script": "//tools/perf/process_perf_results.py"
},
"name": "angle_perftests",
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600
}
},
{
"args": [
"context_lost",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "context_lost_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600,
"idempotent": false
}
},
{
"args": [
"depth_capture",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "depth_capture_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600,
"idempotent": false
}
},
{
"args": [
"gpu_process",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "gpu_process_launch_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600,
"idempotent": false
}
},
{
"args": [
"hardware_accelerated_feature",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "hardware_accelerated_feature_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600,
"idempotent": false
}
},
{
"args": [
"info_collection",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--expected-vendor-id",
"10de",
"--expected-device-id",
"1cb3"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "info_collection_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600,
"idempotent": false
}
},
{
"args": [
"maps",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--os-type",
"linux",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "maps_pixel_test",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600,
"idempotent": false
}
},
{
"args": [
"pixel",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--os-type",
"linux",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"${patch_issue}",
"--review-patch-set",
"${patch_set}",
"--buildbucket-build-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600,
"idempotent": false,
"service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
}
},
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "screenshot_sync_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600,
"idempotent": false
}
},
{
"args": [
"--num-retries=3",
"--additional-driver-flag=--enable-features=VizDisplayCompositor,UseSkiaRenderer",
"--additional-driver-flag=--use-gl=any",
"--additional-driver-flag=--enable-gpu-rasterization",
"--additional-driver-flag=--force-gpu-rasterization",
"--additional-driver-flag=--enable-oop-rasterization",
"--additional-driver-flag=--disable-software-compositing-fallback",
"--additional-driver-flag=--disable-headless-mode",
"--no-xvfb",
"--fuzzy-diff",
"--skipped=always",
"--test-list=../../testing/buildbot/filters/gpu.skiarenderer_vulkan_blink_web_tests.filter",
"--additional-expectations=../../third_party/blink/web_tests/FlagExpectations/enable-features=UseSkiaRenderer",
"--additional-expectations=../../third_party/blink/web_tests/FlagExpectations/enable-gpu-rasterization"
],
"isolate_name": "blink_web_tests_exparchive",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "skia_renderer_gl_blink_web_tests",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600
}
},
{
"args": [
"trace_test",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "trace_test",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600,
"idempotent": false
}
},
{
"args": [
"--num-retries=3",
"--additional-driver-flag=--enable-features=VizDisplayCompositor,UseSkiaRenderer",
"--additional-driver-flag=--use-gl=any",
"--additional-driver-flag=--enable-gpu-rasterization",
"--additional-driver-flag=--force-gpu-rasterization",
"--additional-driver-flag=--enable-oop-rasterization",
"--additional-driver-flag=--disable-software-compositing-fallback",
"--additional-driver-flag=--use-vulkan=native",
"--additional-driver-flag=--disable-vulkan-fallback-to-gl-for-testing",
"--additional-driver-flag=--disable-headless-mode",
"--no-xvfb",
"--fuzzy-diff",
"--skipped=always",
"--driver-logging",
"--test-list=../../testing/buildbot/filters/gpu.skiarenderer_vulkan_blink_web_tests.filter",
"--additional-expectations=../../third_party/blink/web_tests/FlagExpectations/enable-features=UseSkiaRenderer",
"--additional-expectations=../../third_party/blink/web_tests/FlagExpectations/use-vulkan=native"
],
"isolate_name": "blink_web_tests_exparchive",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "vulkan_native_blink_web_tests",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600
}
},
{
"args": [
"pixel",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc \"--use-vulkan=native --disable-vulkan-fallback-to-gl-for-testing --enable-features=UseSkiaRenderer --disable-software-compositing-fallback\"",
"--dont-restore-color-profile-after-test",
"--os-type",
"linux",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "vulkan_pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"${patch_issue}",
"--review-patch-set",
"${patch_set}",
"--buildbucket-build-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600,
"idempotent": false,
"service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
}
},
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-cmd-decoder=passthrough",
"--webgl-conformance-version=2.0.1",
"--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "webgl2_conformance_gl_passthrough_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600,
"idempotent": false,
"shards": 20
}
},
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--webgl-conformance-version=2.0.1",
"--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "webgl2_conformance_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600,
"idempotent": false,
"shards": 20
}
},
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-cmd-decoder=passthrough"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "webgl_conformance_gl_passthrough_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "Chrome-GPU"
}
],
"expiration": 21600,
"idempotent": false,
"shards": 2
}
},
"isolated_scripts": [
{
"args": [
"webgl_conformance",
"noop_sleep",
"--show-stdout",
"--browser=release",
"--passthrough",
......@@ -9638,7 +8892,7 @@
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "webgl_conformance_tests",
"name": "noop_sleep_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
......@@ -9651,8 +8905,7 @@
}
],
"expiration": 21600,
"idempotent": false,
"shards": 2
"idempotent": false
}
}
]
......@@ -11973,6 +11226,92 @@
"idempotent": false,
"service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
}
},
{
"args": [
"--num-retries=3",
"--additional-driver-flag=--enable-features=VizDisplayCompositor,UseSkiaRenderer",
"--additional-driver-flag=--use-gl=any",
"--additional-driver-flag=--enable-gpu-rasterization",
"--additional-driver-flag=--force-gpu-rasterization",
"--additional-driver-flag=--enable-oop-rasterization",
"--additional-driver-flag=--disable-software-compositing-fallback",
"--additional-driver-flag=--use-vulkan=native",
"--additional-driver-flag=--disable-vulkan-fallback-to-gl-for-testing",
"--additional-driver-flag=--disable-headless-mode",
"--no-xvfb",
"--fuzzy-diff",
"--skipped=always",
"--driver-logging",
"--test-list=../../testing/buildbot/filters/gpu.skiarenderer_vulkan_blink_web_tests.filter",
"--additional-expectations=../../third_party/blink/web_tests/FlagExpectations/enable-features=UseSkiaRenderer",
"--additional-expectations=../../third_party/blink/web_tests/FlagExpectations/use-vulkan=native"
],
"isolate_name": "blink_web_tests_exparchive",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "vulkan_native_blink_web_tests",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
]
}
},
{
"args": [
"pixel",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc \"--use-vulkan=native --disable-vulkan-fallback-to-gl-for-testing --enable-features=UseSkiaRenderer --disable-software-compositing-fallback\"",
"--dont-restore-color-profile-after-test",
"--os-type",
"linux",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "vulkan_pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"${patch_issue}",
"--review-patch-set",
"${patch_set}",
"--buildbucket-build-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
"idempotent": false,
"service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
}
}
]
},
......
......@@ -1416,7 +1416,6 @@
'Win7 FYI Debug (AMD)',
# Disabled due to dbus crashes crbug.com/927465
'Linux FYI Experimental Release (Intel HD 630)',
'Linux FYI Experimental Release (NVIDIA)',
'Linux FYI Release (Intel HD 630)',
'Linux FYI Release (NVIDIA)',
'Linux FYI SkiaRenderer Vulkan (NVIDIA)',
......
......@@ -3568,20 +3568,18 @@
},
},
# Temporarily disabled, since all experimental bots are active now.
# TODO(ynovikov): Re-enable once Win10 Intel is switched to x64 crbug.com/988833
#'gpu_noop_sleep_telemetry_test': {
'gpu_noop_sleep_telemetry_test': {
# The former GPU-specific generator script contained logic to
# detect whether the so-called "experimental" GPU bots, which test
# newer driver versions, were identical to the "stable" versions
# of the bots, and if so to mirror their configurations. We prefer
# to keep this new script simpler and to just configure this by
# hand in waterfalls.pyl.
#'noop_sleep': {
#}
#},
'noop_sleep': {
}
},
'gpu_skia_renderer_telemetry_tests': {
'gpu_skia_renderer_non_vulkan_telemetry_tests': {
'skia_renderer_pixel_skia_gold_test': {
'name': 'skia_renderer_pixel_skia_gold_test',
'args': [
......@@ -3653,6 +3651,11 @@
},
},
'gpu_skia_renderer_telemetry_tests': [
'gpu_skia_renderer_non_vulkan_telemetry_tests',
'gpu_skia_renderer_vulkan_telemetry_tests',
],
'gpu_skia_renderer_vulkan_gtests': {
'vulkan_content_browsertests': {
'args': [
......@@ -5205,12 +5208,6 @@
'gpu_blink_web_tests_vulkan',
],
'gpu_blink_web_tests_and_angle_perf_isolated_scripts': [
'gpu_angle_perf_isolated_scripts',
'gpu_blink_web_tests_skia_renderer',
'gpu_blink_web_tests_vulkan',
],
'gpu_chromeos_telemetry_tests': [
'gpu_webgl_conformance_telemetry_tests',
],
......@@ -5255,9 +5252,8 @@
'gpu_swiftshader_gtests',
],
'gpu_fyi_linux_intel_and_nvidia_release_experimental_telemetry_tests': [
'gpu_fyi_linux_intel_and_nvidia_release_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests',
'gpu_skia_renderer_vulkan_telemetry_tests',
'gpu_telemetry_tests',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl2_conformance_telemetry_tests',
......@@ -5265,8 +5261,9 @@
'gpu_webgl_conformance_telemetry_tests',
],
'gpu_fyi_linux_intel_and_nvidia_release_telemetry_tests': [
'gpu_fyi_linux_intel_release_experimental_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests',
'gpu_skia_renderer_vulkan_telemetry_tests',
'gpu_telemetry_tests',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl2_conformance_telemetry_tests',
......
......@@ -2631,7 +2631,7 @@
'test_suites': {
'gtest_tests': 'gpu_fyi_linux_release_gtests',
'isolated_scripts': 'gpu_blink_web_tests',
'gpu_telemetry_tests': 'gpu_fyi_linux_intel_and_nvidia_release_experimental_telemetry_tests',
'gpu_telemetry_tests': 'gpu_fyi_linux_intel_release_experimental_telemetry_tests',
}
},
'Linux FYI Experimental Release (NVIDIA)': {
......@@ -2641,10 +2641,11 @@
'limited_capacity_bot',
'linux_nvidia_quadro_p400_experimental',
],
# Currently the experimental driver is identical to the stable
# driver. If it's upgraded, change these test_suites to be the same as
# 'Linux FYI Release (NVIDIA)'.
'test_suites': {
'gtest_tests': 'gpu_fyi_linux_release_gtests',
'isolated_scripts': 'gpu_blink_web_tests_and_angle_perf_isolated_scripts',
'gpu_telemetry_tests': 'gpu_fyi_linux_intel_and_nvidia_release_experimental_telemetry_tests',
'gpu_telemetry_tests': 'gpu_noop_sleep_telemetry_test',
},
},
'Linux FYI GPU TSAN Release': {
......@@ -2718,7 +2719,7 @@
],
'test_suites': {
'gtest_tests': 'gpu_fyi_linux_release_gtests',
'isolated_scripts': 'gpu_blink_web_tests_skia_renderer',
'isolated_scripts': 'gpu_blink_web_tests',
'gpu_telemetry_tests': 'gpu_skia_renderer_telemetry_tests',
},
},
......
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