diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg index b6add5162c192b..2a1077d3290362 100644 --- a/infra/config/cr-buildbucket.cfg +++ b/infra/config/cr-buildbucket.cfg @@ -1125,6 +1125,12 @@ buckets { mixins: "goma-rbe-prod" } + builders { + name: "Android FYI SkiaRenderer GL (Nexus 5X)" + mixins: "android-gpu-fyi-ci" + mixins: "goma-rbe-prod" + } + builders { name: "Android FYI SkiaRenderer Vulkan (Pixel 2)" mixins: "android-gpu-fyi-ci" @@ -4139,6 +4145,11 @@ buckets { mixins: "goma-rbe-prod" name: "gpu-fyi-try-android-m-nexus-5x-deqp-64" } + builders { + mixins: "android-optional-gpu-try" + mixins: "goma-rbe-prod" + name: "gpu-fyi-try-android-m-nexus-5x-skgl-64" + } builders { mixins: "android-optional-gpu-try" mixins: "goma-rbe-prod" diff --git a/infra/config/luci-milo.cfg b/infra/config/luci-milo.cfg index 6d04c6e0464feb..a024db19909734 100644 --- a/infra/config/luci-milo.cfg +++ b/infra/config/luci-milo.cfg @@ -3750,6 +3750,11 @@ consoles { category: "Android|dqp|vk|Q64" short_name: "P2" } + builders { + name: "buildbucket/luci.chromium.ci/Android FYI SkiaRenderer GL (Nexus 5X)" + category: "Android|skgl|M64" + short_name: "N5X" + } builders { name: "buildbucket/luci.chromium.ci/Android FYI SkiaRenderer Vulkan (Pixel 2)" category: "Android|skv|P32" @@ -4348,6 +4353,9 @@ consoles { builders { name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-l-nexus-6-32" } + builders { + name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-5x-skgl-64" + } builders { name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-5x-64" } @@ -5078,6 +5086,9 @@ consoles { builders { name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-5x-deqp-64" } + builders { + name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-5x-skgl-64" + } builders { name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-6p-64" } diff --git a/infra/config/luci-scheduler.cfg b/infra/config/luci-scheduler.cfg index 43d07b0627607c..347f0fc21d0ab1 100644 --- a/infra/config/luci-scheduler.cfg +++ b/infra/config/luci-scheduler.cfg @@ -88,6 +88,7 @@ trigger { triggers: "Android FYI Release (Nexus 6P)" triggers: "Android FYI Release (Nexus 9)" triggers: "Android FYI Release (Pixel 2)" + triggers: "Android FYI SkiaRenderer GL (Nexus 5X)" triggers: "Android FYI SkiaRenderer Vulkan (Pixel 2)" triggers: "Android FYI dEQP Release (Nexus 5X)" triggers: "Android Release (Nexus 5X)" @@ -601,6 +602,17 @@ job { } } +job { + id: "Android FYI SkiaRenderer GL (Nexus 5X)" + acl_sets: "default" + buildbucket: { + server: "cr-buildbucket.appspot.com" + bucket: "luci.chromium.ci" + builder: "Android FYI SkiaRenderer GL (Nexus 5X)" + } +} + + job { id: "Android FYI SkiaRenderer Vulkan (Pixel 2)" acl_sets: "default" diff --git a/testing/buildbot/chromium.gpu.fyi.json b/testing/buildbot/chromium.gpu.fyi.json index 9f89c574f16cd7..acb6316e2541ee 100644 --- a/testing/buildbot/chromium.gpu.fyi.json +++ b/testing/buildbot/chromium.gpu.fyi.json @@ -6885,6 +6885,252 @@ } ] }, + "Android FYI SkiaRenderer GL (Nexus 5X)": { + "isolated_scripts": [ + { + "args": [ + "context_lost", + "--show-stdout", + "--browser=android-chromium", + "--passthrough", + "-v", + "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor,UseSkiaRenderer" + ], + "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": [ + { + "device_os": "MMB29Q", + "device_os_type": "userdebug", + "device_type": "bullhead", + "os": "Android", + "pool": "Chrome-GPU" + } + ], + "idempotent": false + } + }, + { + "args": [ + "depth_capture", + "--show-stdout", + "--browser=android-chromium", + "--passthrough", + "-v", + "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor,UseSkiaRenderer" + ], + "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": [ + { + "device_os": "MMB29Q", + "device_os_type": "userdebug", + "device_type": "bullhead", + "os": "Android", + "pool": "Chrome-GPU" + } + ], + "idempotent": false + } + }, + { + "args": [ + "gpu_process", + "--show-stdout", + "--browser=android-chromium", + "--passthrough", + "-v", + "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor,UseSkiaRenderer" + ], + "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": [ + { + "device_os": "MMB29Q", + "device_os_type": "userdebug", + "device_type": "bullhead", + "os": "Android", + "pool": "Chrome-GPU" + } + ], + "idempotent": false + } + }, + { + "args": [ + "hardware_accelerated_feature", + "--show-stdout", + "--browser=android-chromium", + "--passthrough", + "-v", + "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor,UseSkiaRenderer" + ], + "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": [ + { + "device_os": "MMB29Q", + "device_os_type": "userdebug", + "device_type": "bullhead", + "os": "Android", + "pool": "Chrome-GPU" + } + ], + "idempotent": false + } + }, + { + "args": [ + "maps", + "--show-stdout", + "--browser=android-chromium", + "--passthrough", + "-v", + "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor,UseSkiaRenderer", + "--dont-restore-color-profile-after-test", + "--os-type", + "android", + "--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": [ + { + "device_os": "MMB29Q", + "device_os_type": "userdebug", + "device_type": "bullhead", + "os": "Android", + "pool": "Chrome-GPU" + } + ], + "idempotent": false + } + }, + { + "args": [ + "screenshot_sync", + "--show-stdout", + "--browser=android-chromium", + "--passthrough", + "-v", + "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor,UseSkiaRenderer", + "--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": [ + { + "device_os": "MMB29Q", + "device_os_type": "userdebug", + "device_type": "bullhead", + "os": "Android", + "pool": "Chrome-GPU" + } + ], + "idempotent": false + } + }, + { + "args": [ + "pixel", + "--show-stdout", + "--browser=android-chromium", + "--passthrough", + "-v", + "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor,UseSkiaRenderer", + "--dont-restore-color-profile-after-test", + "--os-type", + "android", + "--build-revision", + "${got_revision}", + "--test-machine-name", + "${buildername}" + ], + "experiment_percentage": 100, + "isolate_name": "telemetry_gpu_integration_test", + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "name": "skia_renderer_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": [ + { + "device_os": "MMB29Q", + "device_os_type": "userdebug", + "device_type": "bullhead", + "os": "Android", + "pool": "Chrome-GPU" + } + ], + "idempotent": false, + "service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com" + } + } + ] + }, "Android FYI SkiaRenderer Vulkan (Pixel 2)": { "gtest_tests": [ { diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl index 966e91863eb033..9d8cf9f466250d 100644 --- a/testing/buildbot/waterfalls.pyl +++ b/testing/buildbot/waterfalls.pyl @@ -2568,6 +2568,19 @@ 'gpu_telemetry_tests': 'gpu_fyi_android_webgl2_and_gold_telemetry_tests', }, }, + 'Android FYI SkiaRenderer GL (Nexus 5X)': { + 'os_type': 'android', + 'browser_config': 'android-chromium', + 'skip_merge_script': True, + 'mixins': [ + 'gpu_pool', + 'marshmallow', + 'bullhead', + ], + 'test_suites': { + 'gpu_telemetry_tests': 'gpu_skia_renderer_non_vulkan_telemetry_tests', + } + }, 'Android FYI SkiaRenderer Vulkan (Pixel 2)': { 'os_type': 'android', 'browser_config': 'android-chromium', diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl index e7fdb9ddcf2e7c..52af5585f4888a 100644 --- a/tools/mb/mb_config.pyl +++ b/tools/mb/mb_config.pyl @@ -391,6 +391,7 @@ 'Android FYI 64 Vk Release (Pixel 2)': 'gpu_tests_android_vulkan_release_trybot_arm64', 'Android FYI 32 dEQP Vk Release (Pixel 2)': 'deqp_android_vulkan_release_trybot', 'Android FYI 64 dEQP Vk Release (Pixel 2)': 'deqp_android_vulkan_release_trybot_arm64', + 'Android FYI SkiaRenderer GL (Nexus 5X)': 'gpu_tests_android_release_trybot_arm64', 'Android FYI SkiaRenderer Vulkan (Pixel 2)': 'gpu_tests_android_release_trybot', 'GPU FYI Linux Builder': 'gpu_fyi_tests_release_trybot', 'GPU FYI Linux Ozone Builder': 'gpu_fyi_tests_ozone_linux_system_gbm_libdrm_release_trybot', @@ -674,6 +675,7 @@ 'gpu-fyi-try-android-l-nexus-6-32': 'gpu_tests_android_release_trybot', 'gpu-fyi-try-android-m-nexus-5x-64': 'gpu_tests_android_release_trybot_arm64', 'gpu-fyi-try-android-m-nexus-5x-deqp-64': 'deqp_android_release_trybot_arm64', + 'gpu-fyi-try-android-m-nexus-5x-skgl-64': 'gpu_tests_android_release_trybot_arm64', 'gpu-fyi-try-android-m-nexus-6p-64': 'gpu_tests_android_release_trybot_arm64', 'gpu-fyi-try-android-m-nexus-9-64': 'gpu_tests_android_release_trybot_arm64', 'gpu-fyi-try-android-n-nvidia-shield-tv-64': 'gpu_tests_android_release_trybot_arm64',