Skip to content

Commit

Permalink
Ensure all swarming tests on Macs specify os and cpu.
Browse files Browse the repository at this point in the history 
This CL ensures that every test run under swarming on a Mac bot
will explicitly set the `os` and `cpu` swarming dimensions. This
will keep us from accidentally scheduling binaries from a Mac x64
build to run on an ARM bot, or vice versa.

Also, this helps make the test configs a bit more explicit and
will move us closer to removing the build-side reliance on
TARGET_PLATFORM.

The CL updates all the existing entries that were missing and
modifies //testing/buildbot/generate_buildbot_json.py to check
to make sure they are present.

There should be no actual behavior changes from this CL.

Bug: 1203436, 1188847
Change-Id: Ie9d51544fe1f3767b67a7f154be74d3f3e8feb4c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2855105
Commit-Queue: Dirk Pranke <dpranke@google.com>
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#876914}
  • Loading branch information
@dpranke
dpranke authored and Chromium LUCI CQ committed Apr 28, 2021
1 parent 77268a4 commit 772f55f
Show file tree
Hide file tree
Showing 25 changed files with 4,553 additions and 10 deletions.
1 change: 1 addition & 0 deletions testing/buildbot/chrome.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16054,6 +16054,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Mac-10.15",
"pool": "chrome.tests"
}
Expand Down
36 changes: 36 additions & 0 deletions testing/buildbot/chromium.angle.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1374,6 +1374,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
Expand Down Expand Up @@ -1426,6 +1427,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
Expand Down Expand Up @@ -2673,6 +2675,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.14.6",
Expand Down Expand Up @@ -2700,6 +2703,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.14.6",
Expand Down Expand Up @@ -2727,6 +2731,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.14.6",
Expand Down Expand Up @@ -2754,6 +2759,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.14.6",
Expand Down Expand Up @@ -2781,6 +2787,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.14.6",
Expand Down Expand Up @@ -2809,6 +2816,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.14.6",
Expand Down Expand Up @@ -2837,6 +2845,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.14.6",
Expand All @@ -2863,6 +2872,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.14.6",
Expand Down Expand Up @@ -2896,6 +2906,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.14.6",
Expand All @@ -2921,6 +2932,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.14.6",
Expand Down Expand Up @@ -2962,6 +2974,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.14.6",
Expand Down Expand Up @@ -2999,6 +3012,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.14.6",
Expand Down Expand Up @@ -3036,6 +3050,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.14.6",
Expand Down Expand Up @@ -3073,6 +3088,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.14.6",
Expand Down Expand Up @@ -3110,6 +3126,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.14.6",
Expand Down Expand Up @@ -3146,6 +3163,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.14.6",
Expand Down Expand Up @@ -3179,6 +3197,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
Expand All @@ -3202,6 +3221,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
Expand Down Expand Up @@ -3241,6 +3261,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
Expand Down Expand Up @@ -3276,6 +3297,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
Expand Down Expand Up @@ -3311,6 +3333,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
Expand Down Expand Up @@ -3346,6 +3369,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
Expand Down Expand Up @@ -3381,6 +3405,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
Expand Down Expand Up @@ -3415,6 +3440,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
Expand Down Expand Up @@ -3445,6 +3471,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
Expand All @@ -3470,6 +3497,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
Expand All @@ -3495,6 +3523,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
Expand All @@ -3520,6 +3549,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
Expand All @@ -3545,6 +3575,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
Expand All @@ -3571,6 +3602,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
Expand All @@ -3597,6 +3629,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
Expand All @@ -3621,6 +3654,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
Expand Down Expand Up @@ -3650,6 +3684,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "10de:0fe9",
"hidpi": "1",
"os": "Mac-10.14.6",
Expand All @@ -3676,6 +3711,7 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "10de:0fe9",
"hidpi": "1",
"os": "Mac-10.14.6",
Expand Down
Loading

0 comments on commit 772f55f

Please sign in to comment.