Bug 1877483 - set-up larch as a branch that supports nightly updates …

…r=jlorenzo Differential Revision: https://phabricator.services.mozilla.com/D200383
dothq · Feb 6, 2024 · 9dd2421 · 9dd2421
1 parent 450b8e9
commit 9dd2421
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 3 deletions.
diff --git a/taskcluster/ci/build-fat-aar/kind.yml b/taskcluster/ci/build-fat-aar/kind.yml
@@ -71,6 +71,7 @@ job-defaults:
                     by-project:
                         try: nightly-try
                         default: nightly
+                nightly-larch: nightly-larch
                 nightly-oak: nightly-oak
                 nightly-pine: nightly-pine
                 beta:

diff --git a/taskcluster/ci/build/kind.yml b/taskcluster/ci/build/kind.yml
@@ -51,6 +51,7 @@ job-defaults:
                     by-project:
                         try: nightly-try
                         default: nightly
+                nightly-larch: nightly-larch
                 nightly-oak: nightly-oak
                 nightly-pine: nightly-pine
                 beta:

diff --git a/taskcluster/gecko_taskgraph/decision.py b/taskcluster/gecko_taskgraph/decision.py
@@ -99,6 +99,10 @@
         "target_tasks_method": "default",
         "release_type": "nightly-pine",
     },
+    "larch": {
+        "target_tasks_method": "default",
+        "release_type": "nightly-larch",
+    },
     "kaios": {
         "target_tasks_method": "kaios_tasks",
     },

diff --git a/taskcluster/gecko_taskgraph/test/test_util_attributes.py b/taskcluster/gecko_taskgraph/test/test_util_attributes.py
@@ -62,7 +62,7 @@ def test_all(self):
 
     def test_release(self):
         self.assertFalse(match_run_on_projects("birch", ["release"]))
-        self.assertFalse(match_run_on_projects("larch", ["release"]))
+        self.assertTrue(match_run_on_projects("larch", ["release"]))
         self.assertFalse(match_run_on_projects("autoland", ["release"]))
         self.assertTrue(match_run_on_projects("mozilla-central", ["release"]))
         self.assertTrue(match_run_on_projects("mozilla-beta", ["release"]))
@@ -78,7 +78,7 @@ def test_integration(self):
 
     def test_combo(self):
         self.assertTrue(match_run_on_projects("birch", ["release", "birch", "maple"]))
-        self.assertFalse(match_run_on_projects("larch", ["release", "birch", "maple"]))
+        self.assertTrue(match_run_on_projects("larch", ["release", "birch", "maple"]))
         self.assertTrue(match_run_on_projects("maple", ["release", "birch", "maple"]))
         self.assertFalse(
             match_run_on_projects("autoland", ["release", "birch", "maple"])

diff --git a/taskcluster/gecko_taskgraph/transforms/partials.py b/taskcluster/gecko_taskgraph/transforms/partials.py
@@ -48,7 +48,7 @@ def _generate_task_output_files(job, filenames, locale=None):
 
 
 def identify_desired_signing_keys(project, product):
-    if project in ["mozilla-central", "comm-central", "pine"]:
+    if project in ["mozilla-central", "comm-central", "larch", "pine"]:
         return "nightly"
     if project == "mozilla-beta":
         if product == "devedition":

diff --git a/taskcluster/gecko_taskgraph/util/attributes.py b/taskcluster/gecko_taskgraph/util/attributes.py
@@ -23,6 +23,8 @@
     # bug 1845368: pine is a permanent project branch used for testing
     # nightly updates
     "pine",
+    # bug 1877483: larch has similar needs for nightlies
+    "larch",
 }
 
 RELEASE_PROMOTION_PROJECTS = {

diff --git a/taskcluster/gecko_taskgraph/util/scriptworker.py b/taskcluster/gecko_taskgraph/util/scriptworker.py
@@ -54,6 +54,8 @@
             # bug 1845368: pine is a permanent project branch used for testing
             # nightly updates
             "pine",
+            # bug 1877483: larch has similar needs for nightlies
+            "larch",
         },
     ],
     [
@@ -102,6 +104,8 @@
             # bug 1845368: pine is a permanent project branch used for testing
             # nightly updates
             "pine",
+            # bug 1877483: larch has similar needs for nightlies
+            "larch",
         },
     ],
     [
@@ -141,6 +145,8 @@
     # bug 1845368: pine is a permanent project branch used for testing
     # nightly updates
     "nightly-pine": "beetmover:action:push-to-nightly",
+    # bug 1877483: larch has similar needs for nightlies
+    "nightly-larch": "beetmover:action:push-to-nightly",
     "default": "beetmover:action:push-to-candidates",
 }
 
@@ -173,6 +179,8 @@
             # bug 1845368: pine is a permanent project branch used for testing
             # nightly updates
             "pine",
+            # bug 1877483: larch has similar needs for nightlies
+            "larch",
         },
     ],
     [