Skip to content

Commit 42fac6e

Browse files
committed
Bug 1857026 - Add integration branch bisection for Fenix/Focus
Set the name of the build type to "shippable" since the builds are all PGO. Note that the task names for Fenix call themselved 'nightly-simulation' but the intent is the same as 'shippable'. This also adds support for Focus, but that is less valuable since we don't schedule compatible builds very often.
1 parent 5cabd9a commit 42fac6e

1 file changed

Lines changed: 30 additions & 3 deletions

File tree

mozregression/fetch_configs.py

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,21 @@ def tk_routes(self, push):
604604
return
605605

606606

607+
class FenixIntegrationConfigMixin(IntegrationConfigMixin):
608+
tk_name = "fenix"
609+
610+
def tk_routes(self, push):
611+
for build_type in self.build_types:
612+
yield "gecko.v2.{}.revision.{}.mobile.{}-{}".format(
613+
self.integration_branch,
614+
push.changeset,
615+
self.tk_name,
616+
build_type,
617+
)
618+
self._inc_used_build()
619+
return
620+
621+
607622
class ThunderbirdIntegrationConfigMixin(IntegrationConfigMixin):
608623
default_integration_branch = "comm-central"
609624

@@ -748,9 +763,14 @@ def available_bits(self):
748763

749764

750765
@REGISTRY.register("fenix")
751-
class FenixConfig(CommonConfig, FenixNightlyConfigMixin):
766+
class FenixConfig(CommonConfig, FenixNightlyConfigMixin, FenixIntegrationConfigMixin):
767+
BUILD_TYPES = ("shippable",)
768+
BUILD_TYPE_FALLBACKS = {
769+
"shippable": ("nightly", "nightly-simulation"),
770+
}
771+
752772
def build_regex(self):
753-
return r"fenix-.+\.apk"
773+
return r"(target.{}|fenix-.*)\.apk".format(self.arch)
754774

755775
def build_info_regex(self):
756776
return r"(?!)" # Match nothing
@@ -772,8 +792,12 @@ def should_use_archive(self):
772792

773793
@REGISTRY.register("focus")
774794
class FocusConfig(FenixConfig):
795+
BUILD_TYPE_FALLBACKS = {
796+
"shippable": ("nightly",),
797+
}
798+
775799
def build_regex(self):
776-
return r"focus-.+\.apk"
800+
return r"(target.{}|focus-.*)\.apk".format(self.arch)
777801

778802
# https://archive.mozilla.org/pub/focus/
779803
nightly_base_repo_name = "focus"
@@ -788,6 +812,9 @@ def _get_nightly_repo(self, date):
788812
# https://hg.mozilla.org/mozilla-central/
789813
return "mozilla-central"
790814

815+
# Index: gecko.v2.{repo}.revision.{rev}.mobile.focus-{build_type}
816+
tk_name = "focus"
817+
791818

792819
@REGISTRY.register("gve")
793820
class GeckoViewExampleConfig(CommonConfig, FennecNightlyConfigMixin, FennecIntegrationConfigMixin):

0 commit comments

Comments
 (0)