Skip to content

Commit 33c1728

Browse files
authored
Merge pull request #136 from mozilla/add-fxci
Add fxci
2 parents d8ca2d7 + a1db033 commit 33c1728

File tree

14 files changed

+383
-0
lines changed

14 files changed

+383
-0
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
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+
ac_add_options --enable-enterprise
9+
10+
. "$topsrcdir/build/mozconfig.common.override"
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"
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/common-opt"
2+
3+
ac_add_options --enable-instruments
4+
ac_add_options --enable-enterprise
5+
6+
. "$topsrcdir/build/mozconfig.common.override"
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
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+
ac_add_options --enable-enterprise
9+
10+
. "$topsrcdir/build/mozconfig.common.override"
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
. "$topsrcdir/browser/config/mozconfigs/macosx64/common-opt"
2+
3+
ac_add_options --enable-instruments
4+
ac_add_options --enable-enterprise
5+
6+
. "$topsrcdir/build/mozconfig.common.override"
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
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+
ac_add_options --enable-enterprise
11+
12+
. "$topsrcdir/build/mozconfig.common.override"
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/gecko_taskgraph/decision.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@
114114
"staging-firefox": {
115115
"target_tasks_method": "default",
116116
},
117+
"enterprise-firefox": {
118+
"target_tasks_method": "enterprise_firefox_tasks",
119+
"release_type": "nightly-enterprise",
120+
},
117121
# the default parameters are used for projects that do not match above.
118122
"default": {
119123
"target_tasks_method": "default",

taskcluster/gecko_taskgraph/target_tasks.py

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,50 @@ def filter(task):
450450
return [l for l in filtered_for_project if filter(full_task_graph[l])]
451451

452452

453+
@register_target_task("enterprise_firefox_tasks")
454+
def target_tasks_enterprise_firefox(full_task_graph, parameters, graph_config):
455+
"""In addition to doing the filtering by project that the 'default'
456+
filter does, also remove any tests running against regular (aka not shippable,
457+
asan, etc.) opt builds."""
458+
filtered_for_project = target_tasks_default(
459+
full_task_graph, parameters, graph_config
460+
)
461+
462+
def filter(task):
463+
# Only keep builds that have been explicitely flagged
464+
if task.kind == "build" and "all" in task.attributes.get("run_on_projects"):
465+
return False
466+
467+
if task.kind not in TEST_KINDS:
468+
return True
469+
470+
build_platform = task.attributes.get("build_platform")
471+
build_type = task.attributes.get("build_type")
472+
shippable = task.attributes.get("shippable", False)
473+
474+
if not build_platform or not build_type:
475+
return True
476+
477+
family = platform_family(build_platform)
478+
# We need to know whether this test is against a "regular" opt build
479+
# (which is to say, not shippable, asan, tsan, or any other opt build
480+
# with other properties). There's no positive test for this, so we have to
481+
# do it somewhat hackily. Android doesn't have variants other than shippable
482+
# so it is pretty straightforward to check for. Other platforms have many
483+
# variants, but none of the regular opt builds we're looking for have a "-"
484+
# in their platform name, so this works (for now).
485+
is_regular_opt = (
486+
family == "android" and not shippable
487+
) or "-" not in build_platform
488+
489+
if build_type != "opt" or not is_regular_opt:
490+
return True
491+
492+
return False
493+
494+
return [l for l in filtered_for_project if filter(full_task_graph[l])]
495+
496+
453497
@register_target_task("graphics_tasks")
454498
def target_tasks_graphics(full_task_graph, parameters, graph_config):
455499
"""In addition to doing the filtering by project that the 'default'

taskcluster/gecko_taskgraph/util/attributes.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
"maple",
3737
# bug 1988213: cypress project branch
3838
"cypress",
39+
# https://github.com/mozilla/enterprise-firefox
40+
# "enterprise-firefox",
3941
}
4042

4143
RELEASE_PROMOTION_PROJECTS = {
@@ -73,6 +75,7 @@
7375
"autoland-only": lambda project: project == "autoland",
7476
"mozilla-central": lambda project: project in ("mozilla-central", "toolchains"),
7577
"mozilla-central-only": lambda project: project == "mozilla-central",
78+
"enterprise-firefox": lambda project: project == "enterprise-firefox",
7679
}
7780

7881
_COPYABLE_ATTRIBUTES = (

0 commit comments

Comments
 (0)