diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml index 618403ae8be4..36006f28afcf 100644 --- a/taskcluster/ci/config.yml +++ b/taskcluster/ci/config.yml @@ -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 diff --git a/taskcluster/ci/generate-profile/kind.yml b/taskcluster/ci/generate-profile/kind.yml index 94afef03d087..0ed67bde19ea 100644 --- a/taskcluster/ci/generate-profile/kind.yml +++ b/taskcluster/ci/generate-profile/kind.yml @@ -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 diff --git a/taskcluster/gecko_taskgraph/target_tasks.py b/taskcluster/gecko_taskgraph/target_tasks.py index a78f3d5e456b..975081262773 100644 --- a/taskcluster/gecko_taskgraph/target_tasks.py +++ b/taskcluster/gecko_taskgraph/target_tasks.py @@ -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 diff --git a/taskcluster/gecko_taskgraph/transforms/test/other.py b/taskcluster/gecko_taskgraph/transforms/test/other.py index 8b3f61424f58..717cc96036cd 100644 --- a/taskcluster/gecko_taskgraph/transforms/test/other.py +++ b/taskcluster/gecko_taskgraph/transforms/test/other.py @@ -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", diff --git a/taskcluster/gecko_taskgraph/transforms/test/worker.py b/taskcluster/gecko_taskgraph/transforms/test/worker.py index d5e58a55f949..543c3202b7e7 100644 --- a/taskcluster/gecko_taskgraph/transforms/test/worker.py +++ b/taskcluster/gecko_taskgraph/transforms/test/worker.py @@ -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"] diff --git a/taskcluster/gecko_taskgraph/try_option_syntax.py b/taskcluster/gecko_taskgraph/try_option_syntax.py index 4747e64c293a..3e054d63f98f 100644 --- a/taskcluster/gecko_taskgraph/try_option_syntax.py +++ b/taskcluster/gecko_taskgraph/try_option_syntax.py @@ -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"],