Skip to content

GitLab

T
tangled
Commit de4c73a8 authored by Yuly Novikov's avatar Yuly Novikov Committed by Commit Bot
Browse files
Options

Add GPU FYI Android dEQP Vk bots 

Bug: 839893
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I8861024bb7cadc741ca8f1b366a95472d125ed90
Reviewed-on: https://chromium-review.googlesource.com/1055107Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557955}
parent f9673ee3
Hide whitespace changes
Inline Side-by-side
Showing with 194 additions and 16 deletions
content/test/gpu/generate_buildbot_json.py
View file @ de4c73a8
...@@ -836,6 +836,34 @@ FYI_WATERFALL = { ...@@ -836,6 +836,34 @@ FYI_WATERFALL = {
'swarming': True, 'swarming': True,
'os_type': 'android', 'os_type': 'android',
}, },
'Android FYI 32 dEQP Vk Release (Nexus 5X)': {
'swarming_dimensions': [
{
'device_type': 'bullhead',
'device_os': 'O',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
'build_config': 'android-chromium',
'swarming': True,
'os_type': 'android',
'type': Types.DEQP,
},
'Android FYI 64 dEQP Vk Release (Nexus 5X)': {
'swarming_dimensions': [
{
'device_type': 'bullhead',
'device_os': 'O',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
'build_config': 'android-chromium',
'swarming': True,
'os_type': 'android',
'type': Types.DEQP,
},
# The following "optional" testers don't actually exist on the # The following "optional" testers don't actually exist on the
# waterfall. They are present here merely to specify additional # waterfall. They are present here merely to specify additional
...@@ -1233,12 +1261,11 @@ COMMON_GTESTS = { ...@@ -1233,12 +1261,11 @@ COMMON_GTESTS = {
'shards': 4, 'shards': 4,
}, },
'test': 'angle_deqp_gles2_tests', 'test': 'angle_deqp_gles2_tests',
# Only pass the display type to desktop. The Android runner doesn't support 'args': [
# passing args to the executable but only one display type is supported on '--deqp-egl-display-type=angle-gles'
# Android anyways. ],
'desktop_args': [ 'desktop_args': [
'--test-launcher-batch-limit=400', '--test-launcher-batch-limit=400',
'--deqp-egl-display-type=angle-gles'
], ],
'android_args': [ 'android_args': [
'--enable-xml-result-parsing', '--enable-xml-result-parsing',
...@@ -1266,6 +1293,12 @@ COMMON_GTESTS = { ...@@ -1266,6 +1293,12 @@ COMMON_GTESTS = {
'gpu': LINUX_QUADRO_P400_STABLE_DRIVER, 'gpu': LINUX_QUADRO_P400_STABLE_DRIVER,
'os': 'Ubuntu' 'os': 'Ubuntu'
}, },
{
'device_type': 'bullhead',
'device_os': 'O',
'os': 'Android',
'pool': 'Chrome-GPU',
},
], ],
}, },
], ],
...@@ -1281,9 +1314,15 @@ COMMON_GTESTS = { ...@@ -1281,9 +1314,15 @@ COMMON_GTESTS = {
}, },
'test': 'angle_deqp_gles2_tests', 'test': 'angle_deqp_gles2_tests',
'args': [ 'args': [
'--test-launcher-batch-limit=400',
'--deqp-egl-display-type=angle-vulkan' '--deqp-egl-display-type=angle-vulkan'
] ],
'desktop_args': [
'--test-launcher-batch-limit=400',
],
'android_args': [
'--enable-xml-result-parsing',
'--shard-timeout=500'
],
}, },
'angle_deqp_gles3_gles_tests': { 'angle_deqp_gles3_gles_tests': {
......
infra/config/global/cr-buildbucket.cfg
View file @ de4c73a8
...@@ -469,6 +469,16 @@ buckets { ...@@ -469,6 +469,16 @@ buckets {
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
} }
builders {
name: "Android FYI 32 dEQP Vk Release (Nexus 5X)"
mixins: "android-gpu-fyi-ci"
}
builders {
name: "Android FYI 64 dEQP Vk Release (Nexus 5X)"
mixins: "android-gpu-fyi-ci"
}
builders { builders {
name: "Android FYI 32 Vk Release (Nexus 5X)" name: "Android FYI 32 Vk Release (Nexus 5X)"
mixins: "android-gpu-fyi-ci" mixins: "android-gpu-fyi-ci"
......
infra/config/global/luci-milo.cfg
View file @ de4c73a8
...@@ -3192,19 +3192,29 @@ consoles { ...@@ -3192,19 +3192,29 @@ consoles {
category: "Android|N64|NVDA" category: "Android|N64|NVDA"
short_name: "STV" short_name: "STV"
} }
builders {
name: "buildbucket/luci.chromium.ci/Android FYI 32 Vk Release (Nexus 5X)"
category: "Android|vk|O32"
short_name: "N5X"
}
builders {
name: "buildbucket/luci.chromium.ci/Android FYI 64 Vk Release (Nexus 5X)"
category: "Android|vk|O64"
short_name: "N5X"
}
builders { builders {
name: "buildbucket/luci.chromium.ci/Android FYI dEQP Release (Nexus 5X)" name: "buildbucket/luci.chromium.ci/Android FYI dEQP Release (Nexus 5X)"
category: "Android|dqp|M64" category: "Android|dqp|M64"
short_name: "N5X" short_name: "N5X"
} }
builders { builders {
name: "buildbucket/luci.chromium.ci/Android FYI 32 Vk Release (Nexus 5X)" name: "buildbucket/luci.chromium.ci/Android FYI 32 dEQP Vk Release (Nexus 5X)"
category: "Android|vk|O32" category: "Android|dqp|vk|O32"
short_name: "N5X" short_name: "N5X"
} }
builders { builders {
name: "buildbucket/luci.chromium.ci/Android FYI 64 Vk Release (Nexus 5X)" name: "buildbucket/luci.chromium.ci/Android FYI 64 dEQP Vk Release (Nexus 5X)"
category: "Android|vk|O64" category: "Android|dqp|vk|O64"
short_name: "N5X" short_name: "N5X"
} }
} }
......
infra/config/global/luci-scheduler.cfg
View file @ de4c73a8
...@@ -56,6 +56,8 @@ trigger { ...@@ -56,6 +56,8 @@ trigger {
triggers: "Android arm64 Builder (dbg)" triggers: "Android arm64 Builder (dbg)"
triggers: "Android ASAN (dbg)" triggers: "Android ASAN (dbg)"
triggers: "Android Cronet Builder" triggers: "Android Cronet Builder"
triggers: "Android FYI 32 dEQP Vk Release (Nexus 5X)"
triggers: "Android FYI 64 dEQP Vk Release (Nexus 5X)"
triggers: "Android FYI 32 Vk Release (Nexus 5X)" triggers: "Android FYI 32 Vk Release (Nexus 5X)"
triggers: "Android FYI 64 Vk Release (Nexus 5X)" triggers: "Android FYI 64 Vk Release (Nexus 5X)"
triggers: "Android FYI dEQP Release (Nexus 5X)" triggers: "Android FYI dEQP Release (Nexus 5X)"
...@@ -183,6 +185,26 @@ job { ...@@ -183,6 +185,26 @@ job {
} }
} }
job {
id: "Android FYI 32 dEQP Vk Release (Nexus 5X)"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "Android FYI 32 dEQP Vk Release (Nexus 5X)"
}
}
job {
id: "Android FYI 64 dEQP Vk Release (Nexus 5X)"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "Android FYI 64 dEQP Vk Release (Nexus 5X)"
}
}
job { job {
id: "Android FYI 32 Vk Release (Nexus 5X)" id: "Android FYI 32 Vk Release (Nexus 5X)"
acl_sets: "default" acl_sets: "default"
......
testing/buildbot/chromium.gpu.fyi.json
View file @ de4c73a8
...@@ -90,6 +90,49 @@ ...@@ -90,6 +90,49 @@
} }
] ]
}, },
"Android FYI 32 dEQP Vk Release (Nexus 5X)": {
"gtest_tests": [
{
"args": [
"--deqp-egl-display-type=angle-vulkan",
"--enable-xml-result-parsing",
"--shard-timeout=500"
],
"name": "angle_deqp_gles2_vulkan_tests",
"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": "O",
"device_type": "bullhead",
"os": "Android",
"pool": "Chrome-GPU"
}
],
"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"
}
]
},
"test": "angle_deqp_gles2_tests",
"use_xvfb": false
}
],
"isolated_scripts": []
},
"Android FYI 64 Vk Release (Nexus 5X)": { "Android FYI 64 Vk Release (Nexus 5X)": {
"gtest_tests": [ "gtest_tests": [
{ {
...@@ -179,6 +222,49 @@ ...@@ -179,6 +222,49 @@
} }
] ]
}, },
"Android FYI 64 dEQP Vk Release (Nexus 5X)": {
"gtest_tests": [
{
"args": [
"--deqp-egl-display-type=angle-vulkan",
"--enable-xml-result-parsing",
"--shard-timeout=500"
],
"name": "angle_deqp_gles2_vulkan_tests",
"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": "O",
"device_type": "bullhead",
"os": "Android",
"pool": "Chrome-GPU"
}
],
"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"
}
]
},
"test": "angle_deqp_gles2_tests",
"use_xvfb": false
}
],
"isolated_scripts": []
},
"Android FYI Release (NVIDIA Shield TV)": { "Android FYI Release (NVIDIA Shield TV)": {
"gtest_tests": [ "gtest_tests": [
{ {
...@@ -2834,6 +2920,7 @@ ...@@ -2834,6 +2920,7 @@
"gtest_tests": [ "gtest_tests": [
{ {
"args": [ "args": [
"--deqp-egl-display-type=angle-gles",
"--enable-xml-result-parsing", "--enable-xml-result-parsing",
"--shard-timeout=500" "--shard-timeout=500"
], ],
...@@ -5029,8 +5116,8 @@ ...@@ -5029,8 +5116,8 @@
}, },
{ {
"args": [ "args": [
"--test-launcher-batch-limit=400", "--deqp-egl-display-type=angle-vulkan",
"--deqp-egl-display-type=angle-vulkan" "--test-launcher-batch-limit=400"
], ],
"name": "angle_deqp_gles2_vulkan_tests", "name": "angle_deqp_gles2_vulkan_tests",
"swarming": { "swarming": {
...@@ -15160,8 +15247,8 @@ ...@@ -15160,8 +15247,8 @@
}, },
{ {
"args": [ "args": [
"--test-launcher-batch-limit=400", "--deqp-egl-display-type=angle-vulkan",
"--deqp-egl-display-type=angle-vulkan" "--test-launcher-batch-limit=400"
], ],
"name": "angle_deqp_gles2_vulkan_tests", "name": "angle_deqp_gles2_vulkan_tests",
"swarming": { "swarming": {
...@@ -17679,8 +17766,8 @@ ...@@ -17679,8 +17766,8 @@
}, },
{ {
"args": [ "args": [
"--test-launcher-batch-limit=400", "--deqp-egl-display-type=angle-vulkan",
"--deqp-egl-display-type=angle-vulkan" "--test-launcher-batch-limit=400"
], ],
"name": "angle_deqp_gles2_vulkan_tests", "name": "angle_deqp_gles2_vulkan_tests",
"swarming": { "swarming": {
......
tools/mb/mb_config.pyl
View file @ de4c73a8
...@@ -288,6 +288,8 @@ ...@@ -288,6 +288,8 @@
'Android FYI Release (NVIDIA Shield TV)': 'android_release_trybot_arm64', 'Android FYI Release (NVIDIA Shield TV)': 'android_release_trybot_arm64',
'Android FYI 32 Vk Release (Nexus 5X)': 'gpu_tests_android_vulkan_release_trybot', 'Android FYI 32 Vk Release (Nexus 5X)': 'gpu_tests_android_vulkan_release_trybot',
'Android FYI 64 Vk Release (Nexus 5X)': 'gpu_tests_android_vulkan_release_trybot_arm64', 'Android FYI 64 Vk Release (Nexus 5X)': 'gpu_tests_android_vulkan_release_trybot_arm64',
'Android FYI 32 dEQP Vk Release (Nexus 5X)': 'deqp_android_vulkan_release_trybot',
'Android FYI 64 dEQP Vk Release (Nexus 5X)': 'deqp_android_vulkan_release_trybot_arm64',
'GPU FYI Linux Builder': 'gpu_fyi_tests_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', 'GPU FYI Linux Ozone Builder': 'gpu_fyi_tests_ozone_linux_system_gbm_libdrm_release_trybot',
'GPU FYI Linux Builder (dbg)': 'gpu_fyi_tests_debug_trybot', 'GPU FYI Linux Builder (dbg)': 'gpu_fyi_tests_debug_trybot',
...@@ -1259,6 +1261,14 @@ ...@@ -1259,6 +1261,14 @@
'angle_deqp_tests', 'android', 'release_trybot', 'arm64', 'angle_deqp_tests', 'android', 'release_trybot', 'arm64',
], ],
'deqp_android_vulkan_release_trybot': [
'angle_deqp_tests', 'android', 'vulkan', 'release_trybot',
],
'deqp_android_vulkan_release_trybot_arm64': [
'angle_deqp_tests', 'android', 'vulkan', 'release_trybot', 'arm64',
],
'deqp_release_trybot_x86': [ 'deqp_release_trybot_x86': [
'angle_deqp_tests', 'release_trybot', 'x86', 'angle_deqp_tests', 'release_trybot', 'x86',
], ],
......
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