Bug 1466689 - Perform macOS builds on gecko-{L}-b-linux worker type; r?dustin, mshal
The gecko-{L}-b-macosx64 worker types are really Linux (macOS builds are
cross-compiled). These worker types are essentially identical to their
gecko-{L}-b-linux counterparts.
I don't see a compelling reason to maintain separate worker types for
these builds other than maybe cost accounting (worker types are tagged
in AWS land and these tags can be more easily broken out for billing
analysis). But I don't think any important systems are relying on
this "feature."
So let's move the macOS build tasks to the gecko-{L}-b-linux workers.
MozReview-Commit-ID: 67bArn6IG9T
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -2,17 +2,17 @@ macosx64/debug:
description: "MacOS X x64 Cross-compile"
index:
product: firefox
job-name: macosx64-debug
treeherder:
platform: osx-cross/debug
symbol: B
tier: 1
- worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
+ worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
config:
@@ -35,17 +35,17 @@ macosx64/opt:
description: "MacOS X x64 Cross-compile"
index:
product: firefox
job-name: macosx64-opt
treeherder:
platform: osx-cross/opt
symbol: B
tier: 1
- worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
+ worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
config:
@@ -66,17 +66,17 @@ macosx64/opt:
macosx64-asan-fuzzing/opt:
description: "MacOS X x64 Cross-compile Fuzzing ASAN"
index:
product: firefox
job-name: macosx64-fuzzing-asan-opt
treeherder:
platform: osx-cross/asan
symbol: Bof
- worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
+ worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
PERFHERDER_EXTRA_OPTIONS: asan-fuzzing
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
@@ -100,17 +100,17 @@ macosx64-dmd/opt:
description: "MacOS X x64 DMD Cross-compile"
index:
product: firefox
job-name: macosx64-dmd-opt
treeherder:
platform: osx-10-10-dmd/opt
symbol: Bdmd
tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
+ worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
config:
@@ -140,17 +140,17 @@ macosx64-devedition-nightly/opt:
index:
product: devedition
job-name: macosx64-opt
type: nightly
treeherder:
platform: osx-cross-devedition/opt
symbol: N
tier: 1
- worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
+ worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
config:
@@ -175,17 +175,17 @@ macosx64-noopt/debug:
description: "MacOS X x64 No-optimize Debug"
index:
product: firefox
job-name: macosx64-noopt-debug
treeherder:
platform: osx-cross-noopt/debug
symbol: B
tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
+ worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
config:
@@ -210,17 +210,17 @@ macosx64-add-on-devel/opt:
description: "MacOS X x64 add-on-devel"
index:
product: firefox
job-name: macosx64-add-on-devel
treeherder:
platform: osx-cross-add-on-devel/opt
symbol: B
tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
+ worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
config:
@@ -249,17 +249,17 @@ macosx64-nightly/opt:
index:
product: firefox
job-name: macosx64-opt
type: nightly
treeherder:
platform: osx-cross/opt
symbol: N
tier: 1
- worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
+ worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
config:
@@ -282,17 +282,17 @@ macosx64-ccov/debug:
description: "MacOS X x64 Cross-compile Code Coverage"
index:
product: firefox
job-name: macosx64-ccov-debug
treeherder:
platform: osx-cross-ccov/debug
symbol: B
tier: 1
- worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
+ worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 5400
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
config:
--- a/taskcluster/ci/searchfox/kind.yml
+++ b/taskcluster/ci/searchfox/kind.yml
@@ -49,17 +49,17 @@ jobs:
- linux64-rust
macosx64-searchfox/debug:
description: "MacOS X x64 Debug Cross-compile Searchfox"
index:
job-name: macosx64-searchfox-debug
treeherder:
platform: osx-cross/debug
- worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
+ worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
PERFHERDER_EXTRA_OPTIONS: searchfox
run:
using: mozharness
actions: [get-secrets build update]