Skip to content

Commit 704df8f

Browse files
author
Alexandre Lissy
committed
FxCI: Skip shippable builds for PRs
1 parent e38eb0b commit 704df8f

File tree

9 files changed

+145
-11
lines changed

9 files changed

+145
-11
lines changed

‎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
@@ -2079,8 +2079,10 @@ def add_enterprise_index_routes(config, tasks):
20792079
if (
20802080
not "enterprise" in task["label"]
20812081
or "upload" in task["label"]
2082+
or not "shippable" in task["label"]
20822083
or task["label"].endswith("/debug")
20832084
or task["label"].startswith("enterprise-test")
2085+
or task["label"].startswith("test-")
20842086
):
20852087
yield task
20862088
continue

‎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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ 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

‎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

‎taskcluster/kinds/enterprise-test/kind.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,23 @@
44
---
55
loader: taskgraph.loader.transform:loader
66

7+
transforms:
8+
- taskgraph.transforms.from_deps
9+
- gecko_taskgraph.transforms.enterprise_test:transforms
10+
- gecko_taskgraph.transforms.job:transforms
11+
- gecko_taskgraph.transforms.task:transforms
12+
713
only-for-build-platforms:
814
- linux64-enterprise-shippable/opt
15+
- linux64-enterprise/opt
916
- linux64-enterprise/debug
1017
- macosx64-enterprise-shippable/opt
18+
- macosx64-enterprise/opt
1119
- macosx64-enterprise/debug
1220
- win64-enterprise-shippable/opt
21+
- win64-enterprise/opt
1322
- win64-enterprise/debug
1423

15-
transforms:
16-
- taskgraph.transforms.from_deps
17-
- gecko_taskgraph.transforms.enterprise_test:transforms
18-
- gecko_taskgraph.transforms.job:transforms
19-
- gecko_taskgraph.transforms.task:transforms
20-
2124
kind-dependencies:
2225
- build
2326
- fetch

‎taskcluster/kinds/generate-profile/kind.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,37 @@ tasks:
5757
- linux64-clang
5858
- linux64-minidump-stackwalk
5959

60+
linux64-enterprise-shippable/opt:
61+
description: "Linux64 Enterprise Profile Generation"
62+
shipping-phase: build
63+
shipping-product: firefox
64+
index:
65+
product: firefox
66+
job-name: linux64-profile-enterprise
67+
treeherder:
68+
platform: linux64-enterprise-shippable/opt
69+
worker-type: b-linux
70+
worker:
71+
chain-of-trust: true
72+
env:
73+
NEED_XVFB: "true"
74+
max-run-time: 1200
75+
docker-image: {in-tree: ubuntu2404-test}
76+
artifacts:
77+
- type: directory
78+
name: public/build
79+
path: /builds/worker/artifacts/
80+
run:
81+
using: run-task
82+
cwd: '{checkout}'
83+
command: >
84+
./taskcluster/scripts/misc/run-profileserver.sh
85+
run-on-projects: ["enterprise-firefox"]
86+
fetches:
87+
toolchain:
88+
- linux64-clang
89+
- linux64-minidump-stackwalk
90+
6091
android-x86_64-shippable/opt:
6192
description: "Android x86_64 Profile Generation"
6293
shipping-phase: build

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,35 @@ tasks:
7474
- sysroot-x86_64-linux-gnu
7575
- sysroot-wasm32-wasi
7676

77+
linux64-enterprise-shippable/opt:
78+
description: "Linux64 Enterprise Instrumented"
79+
index:
80+
product: firefox
81+
job-name: instrumented-linux64-enterprise
82+
shipping-product: firefox
83+
treeherder:
84+
platform: linux64-enterprise-shippable/opt
85+
worker-type: b-linux-docker-amd
86+
run:
87+
config:
88+
- builds/releng_base_firefox.py
89+
- builds/releng_base_linux_64_builds.py
90+
mozconfig-variant: profile-generate
91+
tooltool-downloads: public
92+
run-on-projects: ["enterprise-firefox"]
93+
fetches:
94+
toolchain:
95+
- linux64-clang
96+
- linux64-rust
97+
- linux64-rust-size
98+
- linux64-cbindgen
99+
- linux64-dump_syms
100+
- linux64-nasm
101+
- linux64-node
102+
- linux64-pkgconf
103+
- sysroot-x86_64-linux-gnu
104+
- sysroot-wasm32-wasi
105+
77106
linux64-aarch64-shippable/opt:
78107
description: "Linux AArch64 (a.k.a. ARM64) Instrumented"
79108
index:

‎taskcluster/test_configs/test-platforms.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,14 @@ linux2404-64/opt:
6161
- web-platform-tests
6262
- web-platform-tests-backlog
6363

64+
linux2404-64-enterprise/opt:
65+
build-platform: linux64-enterprise/opt
66+
test-sets:
67+
- desktop-screenshot-capture
68+
- linux-tests
69+
- web-platform-tests
70+
- web-platform-tests-backlog
71+
6472
linux2404-64-shippable/opt:
6573
build-platform: linux64-shippable/opt
6674
test-sets:

0 commit comments

Comments
 (0)