Bug 1858740 - Use ARM builder for Mac CaR builds. r=perftest-reviewers,taskgraph-reviewers,ahal,sparky

This patch switches the builder from the intel osx 10.15 builders to the
Apple Silicon builders. 10.15 Is no longer a supported build target for
CaR (Chromium-as-Release) so let's use this opportunity to just go to the latest version
builders we have.

Additionally, this patch removes the custom CaR osx 10.15 tasks as that
is no longer a supported platform for the application.

Differential Revision: https://phabricator.services.mozilla.com/D218368
This commit is contained in:
KS 2024-08-05 17:04:15 +00:00
parent d4a328d973
commit b697fb9eef
6 changed files with 6 additions and 188 deletions

View File

@ -423,7 +423,6 @@ def setup_browsertime(config, tasks):
chromium_fetches = {
"linux.*": ["linux64-cft-chromedriver"],
"macosx1015.*": ["mac-cft-chromedriver"],
"macosx1400.*": ["mac-cft-chromedriver-arm"],
"windows.*-64.*": ["win64-cft-chromedriver"],
"android.*": ["linux64-cft-chromedriver"],

View File

@ -23,14 +23,6 @@ win64-cft-chromedriver:
platform: win64
artifact-name: cft-cd-win64.tar.bz2
mac-cft-chromedriver:
description: 'MacOSX Chrome-for-Testing Chromedriver Fetch'
attributes:
cached_task: false
fetch:
platform: mac
artifact-name: cft-cd-mac.tar.bz2
mac-cft-chromedriver-arm:
description: 'MacOS (arm) Chrome-for-Testing Chromedriver fetch'
attributes:

View File

@ -21,7 +21,7 @@ task-defaults:
safari-tp:
- macosx1400.*
custom-car:
- .*64.*shippable.*
- (macosx1400|linux|windows.*-64).*shippable.*
default: []
test-manifest-loader: null # don't load tests in the taskgraph
tier: 3
@ -53,10 +53,6 @@ task-defaults:
- win64-custom-car
- win64-minidump-stackwalk
- win64-fix-stacks
macosx1015.*:
- macosx64-custom-car
- macosx64-minidump-stackwalk
- macosx64-fix-stacks
macosx1400.*:
- macosx-arm64-custom-car
- macosx64-aarch64-minidump-stackwalk
@ -76,9 +72,6 @@ task-defaults:
windows.*-64.*:
- win64-minidump-stackwalk
- win64-fix-stacks
macosx1015.*:
- macosx64-minidump-stackwalk
- macosx64-fix-stacks
macosx1400.*:
- macosx64-aarch64-minidump-stackwalk
- macosx64-aarch64-fix-stacks
@ -96,7 +89,7 @@ browsertime-tp6:
safari:
- .*macos.*shippable.*
custom-car:
- .*64.*shippable.*
- (macosx1400|linux|windows.*-64).*shippable.*
default: []
max-run-time:
by-subtest:
@ -312,7 +305,7 @@ browsertime-tp7:
safari:
- .*macos.*shippable.*
custom-car:
- .*64.*shippable.*
- (macosx1400|linux|windows.*-64).*shippable.*
default: []
max-run-time:
by-subtest:
@ -990,7 +983,7 @@ browsertime-indexeddb:
chrome:
- .*shippable.*
custom-car:
- .*64.*shippable.*
- (macosx1400|linux|windows.*-64).*shippable.*
default: []
raptor:
apps: [firefox, chrome]

View File

@ -200,51 +200,16 @@ macosx64-xz:
- macosx64-clang-toolchain
- macosx64-sdk-toolchain
macosx64-custom-car:
description: "Custom chromium-as-release build for mac"
worker-type: b-osx-1015
attributes:
cached_task: false
treeherder:
symbol: TM(custom-car)
worker:
max-run-time: 40000
use-python: default
run-on-projects: []
run:
script: build-custom-car.sh
arguments: [
car_macosx.tar.zst,
blink_symbol_level=0,
chrome_pgo_phase=2,
dcheck_always_on=false,
enable_nacl=false,
enable_resource_allowlist_generation=false,
is_chrome_branded=false,
is_clang=true,
is_component_build=false,
is_debug=false,
is_official_build=true,
symbol_level=0,
target_cpu="x64",
use_v8_context_snapshot=false,
v8_symbol_level=0
]
toolchain-artifact: public/build/car_macosx.tar.zst
fetches:
toolchain:
- macosx64-sdk-14.4
macosx-arm64-custom-car:
description: "Custom chromium-as-release build for mac (apple silicon)"
worker-type: b-osx-1015
worker-type: b-osx-arm64
attributes:
cached_task: false
treeherder:
symbol: TM(custom-car-arm)
tier: 2
worker:
max-run-time: 50000
max-run-time: 25000
use-python: default
run-on-projects: []
run:

View File

@ -38,12 +38,6 @@ CHROME_FOR_TESTING_INFO = {
"result": "cft-cd-win64.tar.bz2",
"chromedriver": "chromedriver_win32.zip",
},
"mac": {
"platform": "mac-x64",
"dir": "cft-chromedriver-mac",
"result": "cft-cd-mac.tar.bz2",
"chromedriver": "chromedriver_mac64.zip",
},
"mac-arm": {
"platform": "mac-arm64",
"dir": "cft-chromedriver-mac",

View File

@ -1082,11 +1082,6 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr
- ❌
- ❌
- ❌
* - **browsertime-benchmark-custom-car-motionmark-1-3**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-benchmark-firefox-motionmark-1-3**
- ✅
- ✅
@ -1386,11 +1381,6 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr
- ❌
- ❌
- ❌
* - **browsertime-benchmark-custom-car-motionmark-1-3**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-benchmark-firefox-motionmark-1-3**
- ✅
- ✅
@ -2182,11 +2172,6 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr
- autoland
- mozilla-release
- mozilla-beta
* - **browsertime-benchmark-custom-car-motionmark-animometer-ramp**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-benchmark-firefox-motionmark-animometer-ramp**
- ✅
- ✅
@ -2437,11 +2422,6 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr
- autoland
- mozilla-release
- mozilla-beta
* - **browsertime-benchmark-custom-car-motionmark-animometer-ramp**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-benchmark-firefox-motionmark-animometer-ramp**
- ✅
- ✅
@ -3223,11 +3203,6 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr
- ❌
- ❌
- ❌
* - **browsertime-benchmark-custom-car-motionmark-htmlsuite-1-3**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-benchmark-firefox-motionmark-htmlsuite-1-3**
- ✅
- ✅
@ -3527,11 +3502,6 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr
- ❌
- ❌
- ❌
* - **browsertime-benchmark-custom-car-motionmark-htmlsuite-1-3**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-benchmark-firefox-motionmark-htmlsuite-1-3**
- ✅
- ✅
@ -3824,11 +3794,6 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr
- autoland
- mozilla-release
- mozilla-beta
* - **browsertime-benchmark-custom-car-motionmark-htmlsuite-ramp**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-benchmark-firefox-motionmark-htmlsuite-ramp**
- ✅
- ✅
@ -4080,11 +4045,6 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr
- autoland
- mozilla-release
- mozilla-beta
* - **browsertime-benchmark-custom-car-motionmark-htmlsuite-ramp**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-benchmark-firefox-motionmark-htmlsuite-ramp**
- ✅
- ✅
@ -4417,11 +4377,6 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr
- ❌
- ❌
- ❌
* - **browsertime-benchmark-custom-car-speedometer**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-benchmark-firefox-speedometer**
- ✅
- ✅
@ -4775,11 +4730,6 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr
- ❌
- ❌
- ❌
* - **browsertime-benchmark-custom-car-speedometer**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-benchmark-firefox-speedometer**
- ✅
- ✅
@ -5148,11 +5098,6 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr
- ❌
- ❌
- ❌
* - **browsertime-benchmark-custom-car-speedometer3**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-benchmark-firefox-speedometer3**
- ✅
- ✅
@ -5513,11 +5458,6 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr
- ❌
- ❌
- ❌
* - **browsertime-benchmark-custom-car-speedometer3**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-benchmark-firefox-speedometer3**
- ✅
- ✅
@ -16081,11 +16021,6 @@ Tests for page-load performance. The links direct to the actual websites that ar
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-custom-car-amazon**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-firefox-amazon**
- ✅
- ✅
@ -16448,11 +16383,6 @@ Tests for page-load performance. The links direct to the actual websites that ar
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-custom-car-bing-search**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-firefox-bing-search**
- ✅
- ✅
@ -17101,11 +17031,6 @@ Tests for page-load performance. The links direct to the actual websites that ar
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-custom-car-cnn**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-firefox-cnn**
- ✅
- ✅
@ -18753,11 +18678,6 @@ Tests for page-load performance. The links direct to the actual websites that ar
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-custom-car-fandom**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-firefox-fandom**
- ✅
- ✅
@ -19929,11 +19849,6 @@ Tests for page-load performance. The links direct to the actual websites that ar
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-custom-car-google-slides**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-firefox-google-slides**
- ✅
- ✅
@ -21028,11 +20943,6 @@ Tests for page-load performance. The links direct to the actual websites that ar
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-custom-car-instagram**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-firefox-instagram**
- ✅
- ✅
@ -25003,11 +24913,6 @@ Tests for page-load performance. The links direct to the actual websites that ar
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-custom-car-twitter**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-firefox-twitter**
- ✅
- ✅
@ -25848,11 +25753,6 @@ Tests for page-load performance. The links direct to the actual websites that ar
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-custom-car-wikipedia**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-firefox-wikipedia**
- ✅
- ✅
@ -26190,11 +26090,6 @@ Tests for page-load performance. The links direct to the actual websites that ar
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-custom-car-yahoo-mail**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-firefox-yahoo-mail**
- ✅
- ✅
@ -29119,11 +29014,6 @@ Page-load performance test suite on Android. The links direct to the actual webs
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-custom-car-amazon**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-firefox-amazon**
- ✅
- ✅
@ -30252,11 +30142,6 @@ Page-load performance test suite on Android. The links direct to the actual webs
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-custom-car-cnn**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-firefox-cnn**
- ✅
- ✅
@ -32737,11 +32622,6 @@ Page-load performance test suite on Android. The links direct to the actual webs
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-custom-car-instagram**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-firefox-instagram**
- ✅
- ✅
@ -33917,11 +33797,6 @@ Page-load performance test suite on Android. The links direct to the actual webs
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-custom-car-wikipedia**
- ❌
- ❌
- ❌
- ❌
* - **browsertime-tp6-essential-firefox-wikipedia**
- ✅
- ✅