Update internal iOS dimensions

Bug: b/299058719
Change-Id: If356ba92bd49c5e650b3147ee94f28947318c4e5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/318961
Reviewed-by: Jeremy Leconte <jleconte@google.com>
Commit-Queue: Christoffer Jansson <jansson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40699}
This commit is contained in:
Christoffer Jansson 2023-09-05 11:51:30 +02:00 committed by WebRTC LUCI CQ
parent 2afd284016
commit 96de4d63e3
8 changed files with 4773 additions and 6980 deletions

File diff suppressed because it is too large Load Diff

View File

@ -19,15 +19,13 @@
"has_native_resultdb_integration": true "has_native_resultdb_integration": true
}, },
"swarming": { "swarming": {
"dimension_sets": [ "dimensions": {
{
"android_devices": "1", "android_devices": "1",
"device_type": "redfin", "device_type": "redfin",
"gce": "0", "gce": "0",
"os": "Android", "os": "Android",
"pool": "WebRTC-perf" "pool": "WebRTC-perf"
} },
],
"expiration": 10800, "expiration": 10800,
"hard_timeout": 10800, "hard_timeout": 10800,
"idempotent": false, "idempotent": false,
@ -54,15 +52,13 @@
"has_native_resultdb_integration": true "has_native_resultdb_integration": true
}, },
"swarming": { "swarming": {
"dimension_sets": [ "dimensions": {
{
"android_devices": "1", "android_devices": "1",
"device_type": "redfin", "device_type": "redfin",
"gce": "0", "gce": "0",
"os": "Android", "os": "Android",
"pool": "WebRTC-perf" "pool": "WebRTC-perf"
} },
],
"expiration": 10800, "expiration": 10800,
"hard_timeout": 10800, "hard_timeout": 10800,
"idempotent": false, "idempotent": false,
@ -92,15 +88,13 @@
"has_native_resultdb_integration": true "has_native_resultdb_integration": true
}, },
"swarming": { "swarming": {
"dimension_sets": [ "dimensions": {
{
"android_devices": "1", "android_devices": "1",
"device_type": "redfin", "device_type": "redfin",
"gce": "0", "gce": "0",
"os": "Android", "os": "Android",
"pool": "WebRTC-perf" "pool": "WebRTC-perf"
} },
],
"expiration": 10800, "expiration": 10800,
"hard_timeout": 10800, "hard_timeout": 10800,
"idempotent": false, "idempotent": false,
@ -127,15 +121,13 @@
"has_native_resultdb_integration": true "has_native_resultdb_integration": true
}, },
"swarming": { "swarming": {
"dimension_sets": [ "dimensions": {
{
"android_devices": "1", "android_devices": "1",
"device_type": "redfin", "device_type": "redfin",
"gce": "0", "gce": "0",
"os": "Android", "os": "Android",
"pool": "WebRTC-perf" "pool": "WebRTC-perf"
} },
],
"expiration": 10800, "expiration": 10800,
"hard_timeout": 10800, "hard_timeout": 10800,
"idempotent": false, "idempotent": false,
@ -171,14 +163,12 @@
"result_format": "gtest_json" "result_format": "gtest_json"
}, },
"swarming": { "swarming": {
"dimension_sets": [ "dimensions": {
{
"cpu": "x86-64", "cpu": "x86-64",
"gce": "1", "gce": "1",
"os": "Ubuntu-18.04", "os": "Ubuntu-18.04",
"pool": "WebRTC-perf" "pool": "WebRTC-perf"
} },
],
"expiration": 10800, "expiration": 10800,
"hard_timeout": 10800, "hard_timeout": 10800,
"idempotent": false, "idempotent": false,
@ -209,14 +199,12 @@
"result_format": "gtest_json" "result_format": "gtest_json"
}, },
"swarming": { "swarming": {
"dimension_sets": [ "dimensions": {
{
"cpu": "x86-64", "cpu": "x86-64",
"gce": "1", "gce": "1",
"os": "Ubuntu-18.04", "os": "Ubuntu-18.04",
"pool": "WebRTC-perf" "pool": "WebRTC-perf"
} },
],
"expiration": 10800, "expiration": 10800,
"hard_timeout": 10800, "hard_timeout": 10800,
"idempotent": false, "idempotent": false,
@ -246,13 +234,11 @@
"result_format": "gtest_json" "result_format": "gtest_json"
}, },
"swarming": { "swarming": {
"dimension_sets": [ "dimensions": {
{
"gce": "0", "gce": "0",
"os": "Ubuntu-18.04", "os": "Ubuntu-18.04",
"pool": "WebRTC-perf" "pool": "WebRTC-perf"
} },
],
"expiration": 10800, "expiration": 10800,
"hard_timeout": 10800, "hard_timeout": 10800,
"idempotent": false, "idempotent": false,
@ -281,13 +267,11 @@
"result_format": "gtest_json" "result_format": "gtest_json"
}, },
"swarming": { "swarming": {
"dimension_sets": [ "dimensions": {
{
"gce": "0", "gce": "0",
"os": "Ubuntu-18.04", "os": "Ubuntu-18.04",
"pool": "WebRTC-perf" "pool": "WebRTC-perf"
} },
],
"expiration": 10800, "expiration": 10800,
"hard_timeout": 10800, "hard_timeout": 10800,
"idempotent": false, "idempotent": false,
@ -317,14 +301,12 @@
"result_format": "gtest_json" "result_format": "gtest_json"
}, },
"swarming": { "swarming": {
"dimension_sets": [ "dimensions": {
{
"cpu": "x86-64", "cpu": "x86-64",
"gce": "0", "gce": "0",
"os": "Mac-11", "os": "Mac-11",
"pool": "WebRTC-perf" "pool": "WebRTC-perf"
} },
],
"expiration": 10800, "expiration": 10800,
"hard_timeout": 10800, "hard_timeout": 10800,
"idempotent": false, "idempotent": false,
@ -353,14 +335,12 @@
"result_format": "gtest_json" "result_format": "gtest_json"
}, },
"swarming": { "swarming": {
"dimension_sets": [ "dimensions": {
{
"cpu": "x86-64", "cpu": "x86-64",
"gce": "0", "gce": "0",
"os": "Mac-11", "os": "Mac-11",
"pool": "WebRTC-perf" "pool": "WebRTC-perf"
} },
],
"expiration": 10800, "expiration": 10800,
"hard_timeout": 10800, "hard_timeout": 10800,
"idempotent": false, "idempotent": false,
@ -390,14 +370,12 @@
"result_format": "gtest_json" "result_format": "gtest_json"
}, },
"swarming": { "swarming": {
"dimension_sets": [ "dimensions": {
{
"cpu": "arm64-64-Apple_M1", "cpu": "arm64-64-Apple_M1",
"gce": "0", "gce": "0",
"os": "Mac-12", "os": "Mac-12",
"pool": "WebRTC-perf" "pool": "WebRTC-perf"
} },
],
"expiration": 10800, "expiration": 10800,
"hard_timeout": 10800, "hard_timeout": 10800,
"idempotent": false, "idempotent": false,
@ -426,14 +404,12 @@
"result_format": "gtest_json" "result_format": "gtest_json"
}, },
"swarming": { "swarming": {
"dimension_sets": [ "dimensions": {
{
"cpu": "arm64-64-Apple_M1", "cpu": "arm64-64-Apple_M1",
"gce": "0", "gce": "0",
"os": "Mac-12", "os": "Mac-12",
"pool": "WebRTC-perf" "pool": "WebRTC-perf"
} },
],
"expiration": 10800, "expiration": 10800,
"hard_timeout": 10800, "hard_timeout": 10800,
"idempotent": false, "idempotent": false,
@ -463,13 +439,11 @@
"result_format": "gtest_json" "result_format": "gtest_json"
}, },
"swarming": { "swarming": {
"dimension_sets": [ "dimensions": {
{
"gce": "0", "gce": "0",
"os": "Windows-10", "os": "Windows-10",
"pool": "WebRTC-perf" "pool": "WebRTC-perf"
} },
],
"expiration": 10800, "expiration": 10800,
"hard_timeout": 10800, "hard_timeout": 10800,
"idempotent": false, "idempotent": false,
@ -498,13 +472,11 @@
"result_format": "gtest_json" "result_format": "gtest_json"
}, },
"swarming": { "swarming": {
"dimension_sets": [ "dimensions": {
{
"gce": "0", "gce": "0",
"os": "Windows-10", "os": "Windows-10",
"pool": "WebRTC-perf" "pool": "WebRTC-perf"
} },
],
"expiration": 10800, "expiration": 10800,
"hard_timeout": 10800, "hard_timeout": 10800,
"idempotent": false, "idempotent": false,

View File

@ -28,12 +28,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -69,12 +67,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -111,12 +107,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"hard_timeout": 7200, "hard_timeout": 7200,
"io_timeout": 7200, "io_timeout": 7200,
"named_caches": [ "named_caches": [
@ -155,12 +149,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -197,12 +189,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -238,12 +228,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -279,12 +267,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -320,12 +306,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -361,12 +345,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -402,12 +384,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -443,12 +423,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -495,13 +473,11 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{
"id": "mac-254-e504", "id": "mac-254-e504",
"os": "iOS-12.4.1", "os": "iOS-12.4.1",
"pool": "WebRTC" "pool": "WebRTC"
} },
],
"hard_timeout": 10800, "hard_timeout": 10800,
"idempotent": false, "idempotent": false,
"io_timeout": 10800, "io_timeout": 10800,
@ -544,12 +520,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -585,12 +559,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -627,12 +599,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"hard_timeout": 7200, "hard_timeout": 7200,
"io_timeout": 7200, "io_timeout": 7200,
"named_caches": [ "named_caches": [
@ -671,12 +641,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -713,12 +681,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -754,12 +720,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -795,12 +759,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -836,12 +798,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -877,12 +837,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -918,12 +876,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",
@ -959,12 +915,10 @@
"revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb" "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
} }
], ],
"dimension_sets": [ "dimensions": {
{ "os": "iOS-16.6",
"os": "iOS-15.7",
"pool": "chrome.tests" "pool": "chrome.tests"
} },
],
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_14c18", "name": "xcode_ios_14c18",

View File

@ -64,10 +64,10 @@
'has_native_resultdb_integration': True 'has_native_resultdb_integration': True
} }
}, },
'ios-device-15.7': { 'ios-device-16.6': {
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {
'os': 'iOS-15.7', 'os': 'iOS-16.6',
'pool': 'chrome.tests' 'pool': 'chrome.tests'
} }
} }

View File

@ -44,13 +44,13 @@
'--test-arg=--undefok=test_launcher_summary_output' '--test-arg=--undefok=test_launcher_summary_output'
], ],
}, },
'ios-device-15.7': { 'ios-device-16.6': {
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {
'os': 'iOS-15.7', 'os': 'iOS-16.6',
'pool': 'chrome.tests', 'pool': 'chrome.tests'
}, }
}, }
}, },
'ios-device-perf': { 'ios-device-perf': {
'swarming': { 'swarming': {
@ -70,6 +70,14 @@
}] }]
} }
}, },
'ios_runtime_cache_16_2': {
'swarming': {
'named_caches': [{
'name': 'runtime_ios_16_2',
'path': 'Runtime-ios-16.2'
}]
}
},
'limited-capacity': { 'limited-capacity': {
# Sometimes there are multiple tests that can be run only on one machine. # Sometimes there are multiple tests that can be run only on one machine.
# We need to increase timeouts so the tests dont expire before the machine is freed. # We need to increase timeouts so the tests dont expire before the machine is freed.
@ -207,4 +215,13 @@
}] }]
} }
}, },
'xcode_14_main': {
'args': ['--xcode-build-version', '14c18'],
'swarming': {
'named_caches': [{
'name': 'xcode_ios_14c18',
'path': 'Xcode.app'
}]
}
},
} }

File diff suppressed because it is too large Load Diff

View File

@ -324,7 +324,7 @@
'machines': { 'machines': {
'iOS64 Debug': { 'iOS64 Debug': {
'mixins': [ 'mixins': [
'ios-device-15.7', 'webrtc-xctest', 'chrome-tester-service-account', 'ios-device-16.6', 'webrtc-xctest', 'chrome-tester-service-account',
'xcode_14_main', 'mac_toolchain', 'has_native_resultdb_integration', 'xcode_14_main', 'mac_toolchain', 'has_native_resultdb_integration',
'out_dir_arg' 'out_dir_arg'
], ],
@ -347,7 +347,7 @@
}, },
'iOS64 Release': { 'iOS64 Release': {
'mixins': [ 'mixins': [
'ios-device-15.7', 'webrtc-xctest', 'chrome-tester-service-account', 'ios-device-16.6', 'webrtc-xctest', 'chrome-tester-service-account',
'xcode_14_main', 'mac_toolchain', 'has_native_resultdb_integration', 'xcode_14_main', 'mac_toolchain', 'has_native_resultdb_integration',
'out_dir_arg' 'out_dir_arg'
], ],