зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1818452 - remove osx 10.14 from test configs. r=jmaher,MasterWayZ
There are no jobs remaining on 10.14, but we still had some lingering supporting code. Also change the treeherder label for the generate-profile task to match the actual worker type. Differential Revision: https://phabricator.services.mozilla.com/D170735
This commit is contained in:
Родитель
ef02f9d6d0
Коммит
1c30e93e7f
|
@ -595,11 +595,6 @@ workers:
|
|||
implementation: generic-worker
|
||||
os: linux
|
||||
worker-type: 'gecko-{alias}'
|
||||
t-osx-1014:
|
||||
provisioner: releng-hardware
|
||||
implementation: generic-worker
|
||||
os: macosx
|
||||
worker-type: 'gecko-{alias}'
|
||||
t-osx-1015-r8:
|
||||
provisioner: releng-hardware
|
||||
implementation: generic-worker
|
||||
|
|
|
@ -229,7 +229,7 @@ jobs:
|
|||
product: firefox
|
||||
job-name: macosx64-profile
|
||||
treeherder:
|
||||
platform: macosx1014-64-shippable/opt
|
||||
platform: macosx1015-64-shippable/opt
|
||||
worker-type: b-osx-1015
|
||||
worker:
|
||||
chain-of-trust: true
|
||||
|
|
|
@ -748,12 +748,8 @@ def target_tasks_general_perf_testing(full_task_graph, parameters, graph_config)
|
|||
# Select some browsertime tasks as desktop smoke-tests
|
||||
if "browsertime" in try_name:
|
||||
if "chrome" in try_name:
|
||||
if "tp6" in try_name and "macosx1014" in platform:
|
||||
return False
|
||||
return True
|
||||
if "chromium" in try_name:
|
||||
if "tp6" in try_name and "macosx1014" in platform:
|
||||
return False
|
||||
return True
|
||||
if "-live" in try_name:
|
||||
return True
|
||||
|
|
|
@ -135,9 +135,6 @@ def set_treeherder_machine_platform(config, tasks):
|
|||
translation = {
|
||||
# Linux64 build platform for asan is specified differently to
|
||||
# treeherder.
|
||||
"macosx1014-64/debug": "osx-10-14/debug",
|
||||
"macosx1014-64/opt": "osx-10-14/opt",
|
||||
"macosx1014-64-shippable/opt": "osx-10-14-shippable/opt",
|
||||
"macosx1100-64/opt": "osx-1100/opt",
|
||||
"macosx1100-64-shippable/opt": "osx-1100-shippable/opt",
|
||||
"win64-asan/opt": "windows10-64/asan",
|
||||
|
@ -638,14 +635,6 @@ def handle_tier(config, tasks):
|
|||
"windows10-64-2004-shippable-qr/opt",
|
||||
"windows10-64-2004-devedition-qr/opt",
|
||||
"windows10-64-2004-asan-qr/opt",
|
||||
"macosx1014-64/opt",
|
||||
"macosx1014-64/debug",
|
||||
"macosx1014-64-shippable/opt",
|
||||
"macosx1014-64-devedition/opt",
|
||||
"macosx1014-64-devedition-qr/opt",
|
||||
"macosx1014-64-qr/opt",
|
||||
"macosx1014-64-shippable-qr/opt",
|
||||
"macosx1014-64-qr/debug",
|
||||
"macosx1015-64/opt",
|
||||
"macosx1015-64/debug",
|
||||
"macosx1015-64-shippable/opt",
|
||||
|
|
|
@ -149,7 +149,6 @@ WINDOWS_WORKER_TYPES = {
|
|||
|
||||
# os x worker types keyed by test-platform
|
||||
MACOSX_WORKER_TYPES = {
|
||||
"macosx1014-64": "t-osx-1014",
|
||||
"macosx1015-64-power": "t-osx-1015-power",
|
||||
"macosx1015-64": "t-osx-1015-r8",
|
||||
"macosx1100-64": "t-osx-1100-m1",
|
||||
|
@ -169,8 +168,6 @@ def set_worker_type(config, tasks):
|
|||
# This test already has its worker type defined, so just use that (yields below)
|
||||
# Unless the value is set to "default", in that case ignore it.
|
||||
pass
|
||||
elif test_platform.startswith("macosx1014-64"):
|
||||
task["worker-type"] = MACOSX_WORKER_TYPES["macosx1014-64"]
|
||||
elif test_platform.startswith("macosx1015-64"):
|
||||
if "--power-test" in task["mozharness"]["extra-options"]:
|
||||
task["worker-type"] = MACOSX_WORKER_TYPES["macosx1015-64-power"]
|
||||
|
|
|
@ -129,7 +129,6 @@ UNITTEST_PLATFORM_PRETTY_NAMES = {
|
|||
"Android 8.0 Google Pixel 2 64bit": ["android-hw-p2-8.0-android-aarch64"],
|
||||
"Android 13.0 Google Pixel 5 32bit": ["android-hw-p5-13.0-arm7"],
|
||||
"Android 13.0 Google Pixel 5 64bit": ["android-hw-p5-13.0-android-aarch64"],
|
||||
"10.14": ["macosx1014-64"],
|
||||
"Windows 7": ["windows7-32"],
|
||||
"Windows 7 VM": ["windows7-32-vm"],
|
||||
"Windows 10": ["windows10-64"],
|
||||
|
|
Загрузка…
Ссылка в новой задаче