Skip to content

Commit 5aae78f

Browse files
author
Alexandre Lissy
committed
FxCI: Introduce opt & debug builds
1 parent fc0b7e7 commit 5aae78f

File tree

11 files changed

+353
-0
lines changed

11 files changed

+353
-0
lines changed

‎browser/config/mozconfigs/linux64/debug-enterprise‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
ac_add_options --enable-debug
2+
3+
. $topsrcdir/build/unix/mozconfig.linux
4+
5+
# Needed to enable breakpad in application.ini
6+
export MOZILLA_OFFICIAL=1
7+
8+
# Package js shell.
9+
export MOZ_PACKAGE_JSSHELL=1
10+
11+
ac_add_options --enable-enterprise
12+
13+
. "$topsrcdir/build/mozconfig.common.override"

‎browser/config/mozconfigs/linux64/nightly-enterprise‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
2+
3+
ac_add_options --enable-enterprise
4+
5+
. "$topsrcdir/build/mozconfig.common.override"

‎browser/config/mozconfigs/macosx64-aarch64/nightly-enterprise‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
. "$topsrcdir/browser/config/mozconfigs/macosx64-aarch64/common-opt"
2+
3+
ac_add_options --enable-instruments
4+
5+
# Cross-compiled builds fail when dtrace is enabled
6+
if test `uname -s` != Linux; then
7+
ac_add_options --enable-dtrace
8+
fi
9+
10+
ac_add_options --enable-enterprise
11+
12+
. "$topsrcdir/build/mozconfig.common.override"

‎browser/config/mozconfigs/macosx64/debug-enterprise‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
. $topsrcdir/build/macosx/mozconfig.common
2+
3+
ac_add_options --enable-debug
4+
5+
# Needed to enable breakpad in application.ini
6+
export MOZILLA_OFFICIAL=1
7+
8+
# Package js shell.
9+
export MOZ_PACKAGE_JSSHELL=1
10+
11+
ac_add_options --enable-enterprise
12+
13+
. "$topsrcdir/build/mozconfig.common.override"

‎browser/config/mozconfigs/macosx64/nightly-enterprise‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
. "$topsrcdir/browser/config/mozconfigs/macosx64/common-opt"
2+
3+
ac_add_options --enable-instruments
4+
5+
# Cross-compiled builds fail when dtrace is enabled
6+
if test `uname -s` != Linux; then
7+
ac_add_options --enable-dtrace
8+
fi
9+
10+
ac_add_options --enable-enterprise
11+
12+
. "$topsrcdir/build/mozconfig.common.override"

‎browser/config/mozconfigs/win64/debug-enterprise‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
. "$topsrcdir/build/mozconfig.win-common"
2+
. "$topsrcdir/browser/config/mozconfigs/common"
3+
. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
4+
5+
ac_add_options --enable-debug
6+
7+
# Needed to enable breakpad in application.ini
8+
export MOZILLA_OFFICIAL=1
9+
10+
# Package js shell.
11+
export MOZ_PACKAGE_JSSHELL=1
12+
13+
ac_add_options --enable-enterprise
14+
15+
. "$topsrcdir/build/mozconfig.common.override"

‎browser/config/mozconfigs/win64/nightly-enterprise‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
. "$topsrcdir/build/mozconfig.win-common"
2+
. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
3+
. "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
4+
5+
ac_add_options --enable-enterprise
6+
7+
. "$topsrcdir/build/mozconfig.common.override"

‎taskcluster/kinds/build/kind.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ task-defaults:
4646
# identical except for
4747
# https://searchfox.org/mozilla-central/rev/ce9ff94ffed34dc17ec0bfa406156d489eaa8ee1/browser/config/mozconfigs/linux32/release#1 # noqa
4848
esr.*: release
49+
nightly-enterprise: nightly-enterprise
4950
default: nightly
5051
# Note: These settings are only honored by nightly (i.e. shipping) builds
5152
update-channel:
@@ -58,6 +59,7 @@ task-defaults:
5859
nightly-oak: nightly-oak
5960
nightly-pine: nightly-pine
6061
nightly-cypress: nightly-cypress
62+
nightly-enterprise: nightly-enterprise
6163
beta:
6264
by-shipping-product:
6365
devedition: aurora
@@ -74,6 +76,7 @@ task-defaults:
7476
nightly-larch: firefox-nightly-larch
7577
nightly-oak: firefox-nightly-oak
7678
nightly-pine: firefox-nightly-pine
79+
nightly-enterprise: nightly-enterprise
7780
beta:
7881
by-shipping-product:
7982
devedition: firefox-mozilla-aurora
@@ -86,6 +89,7 @@ task-defaults:
8689
nightly-larch: firefox-nightly-larch
8790
nightly-oak: firefox-nightly-oak
8891
nightly-pine: firefox-nightly-pine
92+
nightly-enterprise: nightly-enterprise
8993
beta:
9094
by-shipping-product:
9195
devedition: firefox-mozilla-aurora

‎taskcluster/kinds/build/linux.yml‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,55 @@ linux64/opt:
5151
- sysroot-wasm32-wasi
5252
- onnxruntime-x86_64-linux-gnu
5353

54+
linux64-enterprise/opt:
55+
description: "Linux64 Enterprise Opt"
56+
index:
57+
product: firefox
58+
job-name: linux64-enterprise-opt
59+
attributes:
60+
enable-build-signing: true
61+
enable-full-crashsymbols: true
62+
treeherder:
63+
platform: linux64/opt
64+
symbol: Bent
65+
tier: 1
66+
worker:
67+
max-run-time: 7200
68+
env:
69+
PERFHERDER_EXTRA_OPTIONS: enterprise
70+
# MOZ_AUTOMATION_PACKAGE_TESTS: "1"
71+
# bug 1690154 - enable full symbols on all branches, but only
72+
# upload them on the official set. In conjunction with
73+
# `enable-full-crashsymbols`.
74+
MOZ_ENABLE_FULL_SYMBOLS: "1"
75+
run:
76+
using: mozharness
77+
actions: [get-secrets, build]
78+
config:
79+
- builds/releng_base_firefox.py
80+
- builds/releng_base_linux_64_builds.py
81+
script: "mozharness/scripts/fx_desktop_build.py"
82+
secrets: true
83+
tooltool-downloads: public
84+
run-on-projects: ["enterprise-firefox"]
85+
run-on-repo-type: ["git"]
86+
use-sccache: true
87+
use-python: "3.11"
88+
fetches:
89+
toolchain:
90+
- linux64-clang
91+
- linux64-rust
92+
- linux64-rust-size
93+
- linux64-cbindgen
94+
- linux64-dump_syms
95+
- linux64-sccache
96+
- linux64-nasm
97+
- linux64-node
98+
- linux64-pkgconf
99+
- sysroot-x86_64-linux-gnu
100+
- sysroot-wasm32-wasi
101+
- onnxruntime-x86_64-linux-gnu
102+
54103
linux64-x11/opt:
55104
description: "Linux64 Opt (X11-only)"
56105
index:
@@ -395,6 +444,55 @@ linux64/debug:
395444
- sysroot-wasm32-wasi
396445
- onnxruntime-x86_64-linux-gnu
397446

447+
linux64-enterprise/debug:
448+
description: "Linux64 Enterprise Debug"
449+
index:
450+
product: firefox
451+
job-name: linux64-enterprise-debug
452+
attributes:
453+
enable-full-crashsymbols: true
454+
treeherder:
455+
platform: linux64/debug
456+
symbol: Bent
457+
worker:
458+
max-run-time: 5400
459+
env:
460+
PERFHERDER_EXTRA_OPTIONS: enterprise
461+
# MOZ_AUTOMATION_PACKAGE_TESTS: "1"
462+
# bug 1690154 - enable full symbols on all branches, but only
463+
# upload them on the official set. In conjunction with
464+
# `enable-full-crashsymbols`.
465+
MOZ_ENABLE_FULL_SYMBOLS: "1"
466+
run:
467+
using: mozharness
468+
actions: [get-secrets, build]
469+
config:
470+
- builds/releng_base_firefox.py
471+
- builds/releng_base_linux_64_builds.py
472+
script: "mozharness/scripts/fx_desktop_build.py"
473+
secrets: true
474+
custom-build-variant-cfg: debug
475+
mozconfig-variant: debug-enterprise
476+
tooltool-downloads: public
477+
run-on-projects: ["enterprise-firefox"]
478+
run-on-repo-type: ["git"]
479+
use-sccache: true
480+
use-python: "3.11"
481+
fetches:
482+
toolchain:
483+
- linux64-clang
484+
- linux64-cbindgen
485+
- linux64-dump_syms
486+
- linux64-sccache
487+
- linux64-rust
488+
- linux64-rust-size
489+
- linux64-nasm
490+
- linux64-node
491+
- linux64-pkgconf
492+
- sysroot-x86_64-linux-gnu
493+
- sysroot-wasm32-wasi
494+
- onnxruntime-x86_64-linux-gnu
495+
398496
linux64-non-unified/debug:
399497
description: "Linux64 Debug Hybrid"
400498
index:

‎taskcluster/kinds/build/macosx.yml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,40 @@ macosx64/debug:
6565
- sysroot-wasm32-wasi
6666
- onnxruntime-x86_64-apple-darwin
6767

68+
macosx64-enterprise/debug:
69+
description: "MacOS X x64 Enterprise Cross-compile"
70+
index:
71+
job-name: macosx64-enterprise-debug
72+
attributes:
73+
enable-build-signing: true
74+
enable-full-crashsymbols: true
75+
treeherder:
76+
platform: osx-cross/debug
77+
symbol: Bent
78+
tier: 1
79+
worker:
80+
max-run-time: 5400
81+
env:
82+
PERFHERDER_EXTRA_OPTIONS: enterprise
83+
# MOZ_AUTOMATION_PACKAGE_TESTS: "1"
84+
run:
85+
config:
86+
- builds/releng_base_firefox.py
87+
- builds/releng_base_mac_64_cross_builds.py
88+
custom-build-variant-cfg: cross-debug
89+
mozconfig-variant: debug-enterprise
90+
run-on-projects: ["enterprise-firefox"]
91+
run-on-repo-type: ["git"]
92+
use-sccache: true
93+
use-python: "3.11"
94+
fetches:
95+
toolchain:
96+
- linux64-clang
97+
- linux64-sccache
98+
- macosx64-sdk
99+
- sysroot-wasm32-wasi
100+
- onnxruntime-x86_64-apple-darwin
101+
68102
macosx64-aarch64/debug:
69103
description: "MacOS X Aarch64 Cross-compile"
70104
index:
@@ -161,6 +195,38 @@ macosx64/opt:
161195
- sysroot-wasm32-wasi
162196
- onnxruntime-x86_64-apple-darwin
163197

198+
macosx64-enterprise/opt:
199+
description: "MacOS X x64 Enterprise Cross-compile"
200+
index:
201+
job-name: macosx64-enterprise-opt
202+
attributes:
203+
enable-build-signing: true
204+
enable-full-crashsymbols: true
205+
treeherder:
206+
platform: osx-cross/opt
207+
symbol: Bent
208+
tier: 1
209+
worker:
210+
max-run-time: 7200
211+
env:
212+
# MOZ_AUTOMATION_PACKAGE_TESTS: "1"
213+
PERFHERDER_EXTRA_OPTIONS: enterprise
214+
run:
215+
config:
216+
- builds/releng_base_firefox.py
217+
- builds/releng_base_mac_64_cross_builds.py
218+
run-on-projects: ["enterprise-firefox"]
219+
run-on-repo-type: ["git"]
220+
use-sccache: true
221+
use-python: "3.11"
222+
fetches:
223+
toolchain:
224+
- linux64-clang
225+
- linux64-sccache
226+
- macosx64-sdk
227+
- sysroot-wasm32-wasi
228+
- onnxruntime-x86_64-apple-darwin
229+
164230
macosx64-asan-fuzzing/opt:
165231
description: "MacOS X x64 Cross-compile Fuzzing ASAN"
166232
index:

0 commit comments

Comments
 (0)