Skip to content

Commit 258b1f2

Browse files
author
Alexandre Lissy
committed
FxCI: Skip shippable builds for PRs, add tests
1 parent a4b8ed0 commit 258b1f2

File tree

18 files changed

+463
-28
lines changed

18 files changed

+463
-28
lines changed

‎browser/config/mozconfigs/linux64/profile-generate-enterprise‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
. $topsrcdir/browser/config/mozconfigs/linux64/nightly-enterprise
2+
3+
mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
4+
5+
ac_add_options --enable-profile-generate=cross
6+
ac_add_options --disable-tests

‎browser/config/mozconfigs/macosx64-aarch64/profile-generate-enterprise‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
. $topsrcdir/browser/config/mozconfigs/macosx64-aarch64/nightly-enterprise
2+
3+
mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
4+
5+
ac_add_options --enable-profile-generate=cross
6+
ac_add_options --disable-tests

‎taskcluster/gecko_taskgraph/target_tasks.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -492,13 +492,17 @@ def filter(task):
492492
):
493493
return False
494494

495-
if task.kind == "enterprise-test":
496-
return True
497-
498495
build_platform = task.attributes.get("build_platform")
499496
build_type = task.attributes.get("build_type")
500497
shippable = task.attributes.get("shippable", False)
501498

499+
level = int(parameters["level"])
500+
if ("shippable" in task.label or shippable) and level < 3:
501+
return False
502+
503+
if task.kind == "enterprise-test":
504+
return True
505+
502506
if not build_platform or not build_type:
503507
return True
504508

‎taskcluster/gecko_taskgraph/transforms/task.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2081,8 +2081,10 @@ def add_enterprise_index_routes(config, tasks):
20812081
if (
20822082
not "enterprise" in task["label"]
20832083
or "upload" in task["label"]
2084+
or not "shippable" in task["label"]
20842085
or task["label"].endswith("/debug")
20852086
or task["label"].startswith("enterprise-test")
2087+
or task["label"].startswith("test-")
20862088
):
20872089
yield task
20882090
continue

‎taskcluster/gecko_taskgraph/transforms/test/worker.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@
6969
"virtual-with-gpu": "win11-64-24h2-gpu",
7070
"hardware": "win11-64-24h2-hw",
7171
},
72+
"windows11-64-24h2-enterprise": {
73+
"virtual": "win11-64-24h2",
74+
"virtual-with-gpu": "win11-64-24h2-gpu",
75+
"hardware": "win11-64-24h2-hw",
76+
},
7277
"windows11-64-24h2-ccov": {
7378
"virtual": "win11-64-24h2",
7479
"virtual-with-gpu": "win11-64-24h2-gpu",

‎taskcluster/gecko_taskgraph/util/verify.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,9 @@ def has_one_route_with(what):
381381

382382
if (
383383
"upload" in task.label
384+
or not "shippable" in task.label
384385
or task.label.startswith("enterprise-test")
386+
or task.label.startswith("test-")
385387
or task.label.startswith("build-signing")
386388
or task.label.startswith("build-mac-signing")
387389
):
@@ -396,6 +398,7 @@ def has_one_route_with(what):
396398
)
397399

398400

401+
399402
@verifications.add("full_task_graph")
400403
def verify_routes_notification_filters(
401404
task, taskgraph, scratch_pad, graph_config, parameters

‎taskcluster/kinds/beetmover-geckoview/kind.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,18 @@ only-for-attributes:
2020

2121
not-for-build-platforms:
2222
- linux64-shippable/opt
23+
- linux64-enterprise/opt
2324
- linux64-enterprise-shippable/opt
2425
- linux64-aarch64-shippable/opt
2526
- linux64-aarch64-enterprise-shippable/opt
2627
- linux64-nightlyasrelease/opt
2728
- macosx64-shippable/opt
29+
- macosx64-enterprise/opt
2830
- macosx64-enterprise-shippable/opt
2931
- macosx64-nightlyasrelease/opt
3032
- win32-shippable/opt
3133
- win64-shippable/opt
34+
- win64-enterprise/opt
3235
- win64-enterprise-shippable/opt
3336
- win64-aarch64-shippable/opt
3437
- win64-nightlyasrelease/opt

‎taskcluster/kinds/build-mac-signing/kind.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ only-for-build-platforms:
2222
- macosx64-shippable/opt
2323
- macosx64-devedition/opt
2424
- macosx64-aarch64/debug
25+
- macosx64-enterprise/opt
2526
- macosx64-enterprise-shippable/opt
2627

2728
tasks:

‎taskcluster/kinds/build-signing/kind.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ not-for-build-platforms:
2424
- macosx64-shippable/opt
2525
- macosx64-devedition/opt
2626
- macosx64-aarch64/debug
27+
- macosx64-enterprise/opt
2728
- macosx64-enterprise-shippable/opt
2829

2930
tasks:

‎taskcluster/kinds/build/linux.yml‎

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,69 @@ linux64/opt:
5252
- onnxruntime-x86_64-linux-gnu
5353

5454
linux64-enterprise-shippable/opt:
55-
description: "Linux64 Enterprise Opt"
55+
description: "Linux64 Enterprise Shippable Opt"
56+
use-pgo: true
5657
index:
5758
product: firefox
58-
job-name: linux64-enterprise-opt
59+
job-name: linux64-enterprise-shippable-opt
5960
attributes:
6061
shippable: true
6162
enable-build-signing: true
6263
enable-full-crashsymbols: true
6364
shipping-phase: build
6465
shipping-product: firefox
66+
treeherder:
67+
platform: linux64-enterprise-shippable/opt
68+
symbol: Bpgo(Bent)
69+
tier: 1
70+
worker-type: b-linux-docker-xlarge-amd
71+
worker:
72+
max-run-time: 7200
73+
env:
74+
PERFHERDER_EXTRA_OPTIONS: enterprise
75+
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
76+
# bug 1690154 - enable full symbols on all branches, but only
77+
# upload them on the official set. In conjunction with
78+
# `enable-full-crashsymbols`.
79+
MOZ_ENABLE_FULL_SYMBOLS: "1"
80+
run:
81+
using: mozharness
82+
actions: [get-secrets, build]
83+
config:
84+
- builds/releng_base_firefox.py
85+
- builds/releng_base_linux_64_builds.py
86+
- taskcluster_nightly.py
87+
script: "mozharness/scripts/fx_desktop_build.py"
88+
secrets: true
89+
tooltool-downloads: public
90+
run-on-projects: ["enterprise-firefox"]
91+
run-on-repo-type: ["git"]
92+
use-sccache: false
93+
use-python: "3.11"
94+
fetches:
95+
toolchain:
96+
- linux64-clang
97+
- linux64-rust
98+
- linux64-rust-size
99+
- linux64-cbindgen
100+
- linux64-dump_syms
101+
- linux64-sccache
102+
- linux64-nasm
103+
- linux64-node
104+
- linux64-pkgconf
105+
- sysroot-x86_64-linux-gnu
106+
- sysroot-wasm32-wasi
107+
- onnxruntime-x86_64-linux-gnu
108+
109+
linux64-enterprise/opt:
110+
description: "Linux64 Enterprise Opt"
111+
index:
112+
product: firefox
113+
job-name: linux64-enterprise-opt
114+
attributes:
115+
enable-full-crashsymbols: true
116+
shipping-phase: build
117+
shipping-product: firefox
65118
treeherder:
66119
platform: linux64-enterprise/opt
67120
symbol: Bent

0 commit comments

Comments
 (0)