Skip to content

GitLab

T
tangled
Commit cba87606 authored by Brian Sheedy's avatar Brian Sheedy Committed by Commit Bot
Browse files
Options

Lock GPU Mac Intel stable OS version 

Locks the GPU Mac Intel stable OS version to 10.15.5 since the requested
machines have been upgraded. Also stops testing on the experimental
Mac Intel builder, as the experimental and stable OS versions are
currently identical.

Submitted with no-try due to crbug.com/1109790.

Bug: 1078489
No-Try: true
Change-Id: I268f89b8d8208ae1e54c16f95ffbc97ce36fa804
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2316809
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Auto-Submit: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: default avatarYuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792048}
parent 8bdfa593
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 538 additions and 2193 deletions
testing/buildbot/chromium.ci.json
View file @ cba87606
This diff is collapsed.
testing/buildbot/chromium.dawn.json
View file @ cba87606
...@@ -1649,7 +1649,7 @@ ...@@ -1649,7 +1649,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -1675,7 +1675,7 @@ ...@@ -1675,7 +1675,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -1700,7 +1700,7 @@ ...@@ -1700,7 +1700,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -1726,7 +1726,7 @@ ...@@ -1726,7 +1726,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -1752,7 +1752,7 @@ ...@@ -1752,7 +1752,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -1777,7 +1777,7 @@ ...@@ -1777,7 +1777,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -1802,7 +1802,7 @@ ...@@ -1802,7 +1802,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -1825,7 +1825,7 @@ ...@@ -1825,7 +1825,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -1846,7 +1846,7 @@ ...@@ -1846,7 +1846,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -1875,7 +1875,7 @@ ...@@ -1875,7 +1875,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -1902,7 +1902,7 @@ ...@@ -1902,7 +1902,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -1930,7 +1930,7 @@ ...@@ -1930,7 +1930,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -2287,7 +2287,7 @@ ...@@ -2287,7 +2287,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -2313,7 +2313,7 @@ ...@@ -2313,7 +2313,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -2338,7 +2338,7 @@ ...@@ -2338,7 +2338,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -2364,7 +2364,7 @@ ...@@ -2364,7 +2364,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -2390,7 +2390,7 @@ ...@@ -2390,7 +2390,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -2415,7 +2415,7 @@ ...@@ -2415,7 +2415,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -2440,7 +2440,7 @@ ...@@ -2440,7 +2440,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -2463,7 +2463,7 @@ ...@@ -2463,7 +2463,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -2484,7 +2484,7 @@ ...@@ -2484,7 +2484,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -2513,7 +2513,7 @@ ...@@ -2513,7 +2513,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -2540,7 +2540,7 @@ ...@@ -2540,7 +2540,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
...@@ -2568,7 +2568,7 @@ ...@@ -2568,7 +2568,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
......
testing/buildbot/chromium.gpu.fyi.json
View file @ cba87606
This diff is collapsed.
testing/buildbot/chromium.gpu.json
View file @ cba87606
This diff is collapsed.
testing/buildbot/client.v8.fyi.json
View file @ cba87606
...@@ -1017,7 +1017,7 @@ ...@@ -1017,7 +1017,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
...@@ -1046,7 +1046,7 @@ ...@@ -1046,7 +1046,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
...@@ -1075,7 +1075,7 @@ ...@@ -1075,7 +1075,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
...@@ -1104,7 +1104,7 @@ ...@@ -1104,7 +1104,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
...@@ -1142,7 +1142,7 @@ ...@@ -1142,7 +1142,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
...@@ -1180,7 +1180,7 @@ ...@@ -1180,7 +1180,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
...@@ -1210,7 +1210,7 @@ ...@@ -1210,7 +1210,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
...@@ -1239,7 +1239,7 @@ ...@@ -1239,7 +1239,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
...@@ -1270,7 +1270,7 @@ ...@@ -1270,7 +1270,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
...@@ -1301,7 +1301,7 @@ ...@@ -1301,7 +1301,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
......
testing/buildbot/mixins.pyl
View file @ cba87606
...@@ -514,7 +514,7 @@ ...@@ -514,7 +514,7 @@
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {
'gpu': '8086:0a2e', 'gpu': '8086:0a2e',
'os': 'Mac-10.14.6|Mac-10.15.5', 'os': 'Mac-10.15.5',
}, },
}, },
}, },
......
testing/buildbot/v8.ci.json
View file @ cba87606
...@@ -2164,7 +2164,7 @@ ...@@ -2164,7 +2164,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
...@@ -2193,7 +2193,7 @@ ...@@ -2193,7 +2193,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
...@@ -2222,7 +2222,7 @@ ...@@ -2222,7 +2222,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
...@@ -2251,7 +2251,7 @@ ...@@ -2251,7 +2251,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
...@@ -2289,7 +2289,7 @@ ...@@ -2289,7 +2289,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
...@@ -2327,7 +2327,7 @@ ...@@ -2327,7 +2327,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
...@@ -2357,7 +2357,7 @@ ...@@ -2357,7 +2357,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
...@@ -2386,7 +2386,7 @@ ...@@ -2386,7 +2386,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
...@@ -2417,7 +2417,7 @@ ...@@ -2417,7 +2417,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
...@@ -2448,7 +2448,7 @@ ...@@ -2448,7 +2448,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.14.6|Mac-10.15.5" "os": "Mac-10.15.5"
} }
], ],
"idempotent": false, "idempotent": false,
......
testing/buildbot/waterfalls.pyl
View file @ cba87606
...@@ -3524,10 +3524,11 @@ ...@@ -3524,10 +3524,11 @@
'limited_capacity_bot', 'limited_capacity_bot',
'mac_mini_intel_gpu_experimental', 'mac_mini_intel_gpu_experimental',
], ],
# When the experimental OS version is identical to the stable version,
# the gpu_noop_sleep_telemetry_test test should be used. Otherwise, this
# should have the same test_suites as 'Mac FYI Release (Intel)'.
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_fyi_mac_release_gtests', 'gpu_telemetry_tests': 'gpu_noop_sleep_telemetry_test',
'gpu_telemetry_tests': 'gpu_fyi_mac_release_telemetry_tests',
'isolated_scripts': 'rendering_desktop_representative_perf_tests_isolated_scripts',
}, },
}, },
'Mac FYI Experimental Retina Release (AMD)': { 'Mac FYI Experimental Retina Release (AMD)': {
......
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