Skip to content

GitLab

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

Adjust SwANGLE sharding and fix angle_end2end_tests filter. 

1. Due to performance improvements we don't need as many shards now.
2. '\*' in filter was needed only on command line, launcher uses just '*'.

TBR=kbr

Bug: angleproject:4426, angleproject:4421
Change-Id: I97b1345cbfa592931f0f3dead05397b9f6b1c029
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2086299Reviewed-by: default avatarYuly Novikov <ynovikov@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746862}
parent 4f467f1a
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 52 deletions
testing/buildbot/chromium.swangle.json
View file @ 858d21c3
......@@ -48,7 +48,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 20
"shards": 3
},
"test": "angle_deqp_gles2_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles2_tests"
......@@ -73,7 +73,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 6
"shards": 4
},
"test": "angle_deqp_gles31_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles31_tests"
......@@ -98,7 +98,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 29
"shards": 9
},
"test": "angle_deqp_gles3_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles3_tests"
......@@ -153,7 +153,7 @@
},
{
"args": [
"--gtest_filter=\\*Vulkan_SwiftShader",
"--gtest_filter=*Vulkan_SwiftShader",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
],
......@@ -225,7 +225,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 20
"shards": 3
},
"test": "angle_deqp_gles2_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles2_tests"
......@@ -250,7 +250,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 6
"shards": 4
},
"test": "angle_deqp_gles31_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles31_tests"
......@@ -275,7 +275,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 29
"shards": 9
},
"test": "angle_deqp_gles3_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles3_tests"
......@@ -330,7 +330,7 @@
},
{
"args": [
"--gtest_filter=\\*Vulkan_SwiftShader",
"--gtest_filter=*Vulkan_SwiftShader",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
],
......@@ -402,7 +402,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 20
"shards": 3
},
"test": "angle_deqp_gles2_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles2_tests"
......@@ -427,7 +427,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 6
"shards": 4
},
"test": "angle_deqp_gles31_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles31_tests"
......@@ -452,7 +452,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 29
"shards": 9
},
"test": "angle_deqp_gles3_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles3_tests"
......@@ -507,7 +507,7 @@
},
{
"args": [
"--gtest_filter=\\*Vulkan_SwiftShader",
"--gtest_filter=*Vulkan_SwiftShader",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
],
......@@ -579,7 +579,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 20
"shards": 3
},
"test": "angle_deqp_gles2_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles2_tests"
......@@ -604,7 +604,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 6
"shards": 4
},
"test": "angle_deqp_gles31_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles31_tests"
......@@ -629,7 +629,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 29
"shards": 9
},
"test": "angle_deqp_gles3_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles3_tests"
......@@ -684,7 +684,7 @@
},
{
"args": [
"--gtest_filter=\\*Vulkan_SwiftShader",
"--gtest_filter=*Vulkan_SwiftShader",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
],
......@@ -756,7 +756,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 20
"shards": 3
},
"test": "angle_deqp_gles2_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles2_tests"
......@@ -781,7 +781,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 6
"shards": 4
},
"test": "angle_deqp_gles31_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles31_tests"
......@@ -806,7 +806,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 29
"shards": 9
},
"test": "angle_deqp_gles3_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles3_tests"
......@@ -861,7 +861,7 @@
},
{
"args": [
"--gtest_filter=\\*Vulkan_SwiftShader",
"--gtest_filter=*Vulkan_SwiftShader",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
],
......@@ -933,7 +933,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 20
"shards": 3
},
"test": "angle_deqp_gles2_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles2_tests"
......@@ -958,7 +958,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 6
"shards": 4
},
"test": "angle_deqp_gles31_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles31_tests"
......@@ -983,7 +983,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 29
"shards": 9
},
"test": "angle_deqp_gles3_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles3_tests"
......@@ -1038,7 +1038,7 @@
},
{
"args": [
"--gtest_filter=\\*Vulkan_SwiftShader",
"--gtest_filter=*Vulkan_SwiftShader",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
],
......@@ -1110,7 +1110,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 20
"shards": 3
},
"test": "angle_deqp_gles2_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles2_tests"
......@@ -1135,7 +1135,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 6
"shards": 4
},
"test": "angle_deqp_gles31_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles31_tests"
......@@ -1160,7 +1160,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 29
"shards": 9
},
"test": "angle_deqp_gles3_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles3_tests"
......@@ -1215,7 +1215,7 @@
},
{
"args": [
"--gtest_filter=\\*Vulkan_SwiftShader",
"--gtest_filter=*Vulkan_SwiftShader",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
],
......@@ -1287,7 +1287,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 20
"shards": 3
},
"test": "angle_deqp_gles2_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles2_tests"
......@@ -1312,7 +1312,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 6
"shards": 4
},
"test": "angle_deqp_gles31_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles31_tests"
......@@ -1337,7 +1337,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 29
"shards": 9
},
"test": "angle_deqp_gles3_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles3_tests"
......@@ -1392,7 +1392,7 @@
},
{
"args": [
"--gtest_filter=\\*Vulkan_SwiftShader",
"--gtest_filter=*Vulkan_SwiftShader",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
],
......@@ -1464,7 +1464,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 20
"shards": 3
},
"test": "angle_deqp_gles2_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles2_tests"
......@@ -1489,7 +1489,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 6
"shards": 4
},
"test": "angle_deqp_gles31_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles31_tests"
......@@ -1514,7 +1514,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 29
"shards": 9
},
"test": "angle_deqp_gles3_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles3_tests"
......@@ -1569,7 +1569,7 @@
},
{
"args": [
"--gtest_filter=\\*Vulkan_SwiftShader",
"--gtest_filter=*Vulkan_SwiftShader",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
],
......@@ -1641,7 +1641,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 20
"shards": 3
},
"test": "angle_deqp_gles2_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles2_tests"
......@@ -1666,7 +1666,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 6
"shards": 4
},
"test": "angle_deqp_gles31_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles31_tests"
......@@ -1691,7 +1691,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 29
"shards": 9
},
"test": "angle_deqp_gles3_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles3_tests"
......@@ -1746,7 +1746,7 @@
},
{
"args": [
"--gtest_filter=\\*Vulkan_SwiftShader",
"--gtest_filter=*Vulkan_SwiftShader",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
],
......@@ -1818,7 +1818,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 20
"shards": 3
},
"test": "angle_deqp_gles2_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles2_tests"
......@@ -1843,7 +1843,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 6
"shards": 4
},
"test": "angle_deqp_gles31_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles31_tests"
......@@ -1868,7 +1868,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 29
"shards": 9
},
"test": "angle_deqp_gles3_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles3_tests"
......@@ -1923,7 +1923,7 @@
},
{
"args": [
"--gtest_filter=\\*Vulkan_SwiftShader",
"--gtest_filter=*Vulkan_SwiftShader",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
],
......@@ -1995,7 +1995,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 20
"shards": 3
},
"test": "angle_deqp_gles2_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles2_tests"
......@@ -2020,7 +2020,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 6
"shards": 4
},
"test": "angle_deqp_gles31_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles31_tests"
......@@ -2045,7 +2045,7 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"shards": 29
"shards": 9
},
"test": "angle_deqp_gles3_tests",
"test_target": "//third_party/angle/src/tests:angle_deqp_gles3_tests"
......@@ -2100,7 +2100,7 @@
},
{
"args": [
"--gtest_filter=\\*Vulkan_SwiftShader",
"--gtest_filter=*Vulkan_SwiftShader",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
],
......
testing/buildbot/test_suites.pyl
View file @ 858d21c3
......@@ -3329,7 +3329,7 @@
'--test-launcher-retry-limit=0',
],
'swarming': {
'shards': 20,
'shards': 3,
},
},
'angle_deqp_gles31_tests': {
......@@ -3339,7 +3339,7 @@
'--test-launcher-retry-limit=0',
],
'swarming': {
'shards': 6,
'shards': 4,
},
},
'angle_deqp_gles3_tests': {
......@@ -3349,7 +3349,7 @@
'--test-launcher-retry-limit=0',
],
'swarming': {
'shards': 29,
'shards': 9,
},
},
'angle_deqp_khr_gles2_tests': {
......@@ -3368,7 +3368,7 @@
},
'angle_end2end_tests': {
'args': [
'--gtest_filter=\*Vulkan_SwiftShader',
'--gtest_filter=*Vulkan_SwiftShader',
'--test-launcher-batch-limit=512',
'--test-launcher-retry-limit=0',
],
......
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