mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-12 06:08:24 +02:00
Bug 1961958 - Move tests scheduled on macosx 1100 to macosx 1500. r=perftest-reviewers,taskgraph-reviewers,ahal,sparky
Differential Revision: https://phabricator.services.mozilla.com/D246371
This commit is contained in:
parent
632dc8e41a
commit
1536852687
8 changed files with 24 additions and 36 deletions
|
|
@ -910,11 +910,6 @@ workers:
|
|||
implementation: generic-worker
|
||||
os: macosx
|
||||
worker-type: 'gecko-{alias}'
|
||||
t-osx-1100-m1:
|
||||
provisioner: releng-hardware
|
||||
implementation: generic-worker
|
||||
os: macosx
|
||||
worker-type: 'gecko-{alias}'
|
||||
t-osx-1400-m2:
|
||||
provisioner: releng-hardware
|
||||
implementation: generic-worker
|
||||
|
|
|
|||
|
|
@ -185,8 +185,6 @@ def set_treeherder_machine_platform(config, tasks):
|
|||
translation = {
|
||||
# Linux64 build platform for asan is specified differently to
|
||||
# treeherder.
|
||||
"macosx1100-64/opt": "osx-1100/opt",
|
||||
"macosx1100-64-shippable/opt": "osx-1100-shippable/opt",
|
||||
"macosx1400-64/opt": "osx-1300/opt",
|
||||
"macosx1400-64-shippable/opt": "osx-1400-shippable/opt",
|
||||
"macosx1500-64/opt": "osx-1500/opt",
|
||||
|
|
@ -770,12 +768,10 @@ def handle_tier(config, tasks):
|
|||
"macosx1470-64/debug",
|
||||
"macosx1470-64-shippable/opt",
|
||||
"macosx1470-64-devedition/opt",
|
||||
"macosx1100-64-shippable-qr/opt",
|
||||
"macosx1100-64-qr/debug",
|
||||
"macosx1400-64-shippable-qr/opt",
|
||||
"macosx1400-64-qr/debug",
|
||||
"macosx1500-64-shippable-qr/opt",
|
||||
"macosx1500-64-qr/debug",
|
||||
"macosx1500-64-shippable/opt",
|
||||
"macosx1500-64/debug",
|
||||
"android-em-7.0-x86_64-shippable/opt",
|
||||
"android-em-7.0-x86_64-shippable-lite/opt",
|
||||
"android-em-7.0-x86_64/debug",
|
||||
|
|
|
|||
|
|
@ -152,6 +152,7 @@ MACOSX_WORKER_TYPES = {
|
|||
"macosx1470-64": "t-osx-1400-r8",
|
||||
"macosx1100-64": "t-osx-1100-m1",
|
||||
"macosx1400-64": "t-osx-1400-m2",
|
||||
"macosx1500-64": "t-osx-1500-m4",
|
||||
"macosx1100-aarch64": "t-osx-1100-m1",
|
||||
"macosx1500-aarch64": "t-osx-1500-m4",
|
||||
}
|
||||
|
|
@ -174,16 +175,14 @@ def set_worker_type(config, tasks):
|
|||
task["worker-type"] = MACOSX_WORKER_TYPES["macosx1015-64"]
|
||||
elif test_platform.startswith("macosx1470-64"):
|
||||
task["worker-type"] = MACOSX_WORKER_TYPES["macosx1470-64"]
|
||||
elif test_platform.startswith("macosx1100-64"):
|
||||
task["worker-type"] = MACOSX_WORKER_TYPES["macosx1100-64"]
|
||||
elif test_platform.startswith("macosx1100-aarch64"):
|
||||
task["worker-type"] = MACOSX_WORKER_TYPES["macosx1100-aarch64"]
|
||||
elif test_platform.startswith("macosx1400-64"):
|
||||
task["worker-type"] = MACOSX_WORKER_TYPES["macosx1400-64"]
|
||||
elif test_platform.startswith("macosx1400-aarch64"):
|
||||
task["worker-type"] = MACOSX_WORKER_TYPES["macosx1400-aarch64"]
|
||||
elif test_platform.startswith("macosx1500-aarch64"):
|
||||
task["worker-type"] = MACOSX_WORKER_TYPES["macosx1500-aarch64"]
|
||||
elif test_platform.startswith("macosx1500-64"):
|
||||
task["worker-type"] = MACOSX_WORKER_TYPES["macosx1500-64"]
|
||||
elif test_platform.startswith("win"):
|
||||
# figure out what platform the job needs to run on
|
||||
if task["virtualization"] == "hardware":
|
||||
|
|
|
|||
|
|
@ -240,7 +240,7 @@ tasks:
|
|||
|
||||
grizzly-osx-aarch64-opt:
|
||||
platform: osx-cross-aarch64/asan
|
||||
worker-type: t-osx-1100-m1
|
||||
worker-type: t-osx-1500-m4
|
||||
worker:
|
||||
env:
|
||||
GECKO_BINARY_PATH: "$MOZ_FETCHES_DIR/Nightly.app/Contents/MacOS/firefox"
|
||||
|
|
@ -255,7 +255,7 @@ tasks:
|
|||
|
||||
grizzly-osx-aarch64-debug:
|
||||
platform: osx-cross-aarch64/debug
|
||||
worker-type: t-osx-1100-m1
|
||||
worker-type: t-osx-1500-m4
|
||||
worker:
|
||||
env:
|
||||
GECKO_BINARY_PATH: '"$MOZ_FETCHES_DIR/Firefox NightlyDebug.app/Contents/MacOS/firefox"'
|
||||
|
|
|
|||
|
|
@ -879,6 +879,8 @@ mochitest-media:
|
|||
linux.*-ccov/opt: []
|
||||
.*-32.*: built-projects
|
||||
windows11.*: built-projects
|
||||
linux.*wayland.*: []
|
||||
macosx1470.*: []
|
||||
(?!.*-qr).*: []
|
||||
default: built-projects
|
||||
loopback-video: true
|
||||
|
|
|
|||
|
|
@ -304,24 +304,25 @@ windows11-64-24h2-nightlyasrelease/opt:
|
|||
##
|
||||
# MacOS X platforms (matching /macosx.*/)
|
||||
|
||||
macosx1100-64-qr/debug:
|
||||
macosx1500-64/debug:
|
||||
build-platform: macosx64/debug
|
||||
build-signing-label: repackage-macosx64/debug
|
||||
test-sets:
|
||||
- macosx1100-64-jittests
|
||||
- macosx1500-64-jittests
|
||||
|
||||
macosx1100-aarch64-qr/debug:
|
||||
macosx1500-aarch64/debug:
|
||||
build-platform: macosx64-aarch64/debug
|
||||
build-signing-label: repackage-macosx64-aarch64/debug
|
||||
test-sets:
|
||||
- macosx1100-aarch64-qr-tests
|
||||
- macosx1500-aarch64-tests
|
||||
|
||||
macosx1100-aarch64-shippable-qr/opt:
|
||||
macosx1500-aarch64-shippable/opt:
|
||||
build-platform: macosx64-shippable/opt
|
||||
build-signing-label: repackage-macosx64-shippable/opt
|
||||
test-sets:
|
||||
- macosx1100-64-jittests
|
||||
- macosx1100-64-qr-tests
|
||||
- macosx1500-64-jittests
|
||||
- macosx1500-64-tests
|
||||
- macosx1500-64-perftests
|
||||
|
||||
macosx1470-64-nightlyasrelease/opt:
|
||||
build-platform: macosx64-nightlyasrelease/opt
|
||||
|
|
@ -383,12 +384,7 @@ macosx1015-64-qr/debug:
|
|||
macosx1400-64-shippable-qr/opt:
|
||||
build-platform: macosx64-shippable/opt
|
||||
test-sets:
|
||||
- macosx1400-64-qr-tests
|
||||
|
||||
macosx1500-aarch64-shippable/opt:
|
||||
build-platform: macosx64-shippable/opt
|
||||
test-sets:
|
||||
- macosx1400-64-qr-tests
|
||||
- macosx1500-64-perftests
|
||||
|
||||
##
|
||||
# Android platforms (matching /android-em.*/)
|
||||
|
|
|
|||
|
|
@ -374,10 +374,10 @@ talos-xperf:
|
|||
- talos-xperf
|
||||
|
||||
# macOS
|
||||
macosx1100-64-jittests:
|
||||
macosx1500-64-jittests:
|
||||
- jittest
|
||||
|
||||
macosx1100-64-qr-tests:
|
||||
macosx1500-64-tests:
|
||||
- crashtest
|
||||
- jsreftest
|
||||
- mochitest-browser-a11y
|
||||
|
|
@ -395,7 +395,7 @@ macosx1100-64-qr-tests:
|
|||
- web-platform-tests-webcodecs
|
||||
- web-platform-tests-eme
|
||||
|
||||
macosx1100-aarch64-qr-tests:
|
||||
macosx1500-aarch64-tests:
|
||||
- cppunittest
|
||||
- mochitest-media
|
||||
|
||||
|
|
@ -472,7 +472,7 @@ macosx64-talos:
|
|||
- talos-pdfpaint
|
||||
# - talos-h1 # too long to unpack profile- Bug 1442893
|
||||
|
||||
macosx1400-64-qr-tests:
|
||||
macosx1500-64-perftests:
|
||||
- browsertime-benchmark
|
||||
|
||||
# Android
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ task-defaults:
|
|||
- unittests/win_unittest.py
|
||||
requires-signed-builds:
|
||||
by-test-platform:
|
||||
macosx1100.*: true
|
||||
macosx1500.*: true
|
||||
windows.*-asan/opt: false # No XPCShell on ASAN yet
|
||||
windows.*-mingwclang/.*: false
|
||||
windows.*: true
|
||||
|
|
@ -211,7 +211,7 @@ xpcshell-failures:
|
|||
- unittests/win_unittest.py
|
||||
extra-options:
|
||||
by-test-platform:
|
||||
macosx1100.*:
|
||||
macosx1500.*:
|
||||
- --run-failures=apple_silicon
|
||||
- --timeout-as-pass
|
||||
- --crash-as-pass
|
||||
|
|
|
|||
Loading…
Reference in a new issue