Merge pull request #527 from hneiva/cedar-nightly

Bug 1752420 - Add nightly config for cedar
mozilla-releng · Feb 9, 2022 · 4724371 · 4724371
2 parents 83eea49 + c81dc8a
commit 4724371
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/src/scriptworker/constants.py b/src/scriptworker/constants.py
@@ -176,7 +176,7 @@
                                     r"^(?P<path>/mozilla-(central|unified))(/|$)",
                                     r"^(?P<path>/integration/(autoland|fx-team|mozilla-inbound))(/|$)",
                                     r"^(?P<path>/releases/mozilla-(beta|release|esr\d+))(/|$)",
-                                    r"^(?P<path>/projects/(maple|oak|pine))(/|$)",
+                                    r"^(?P<path>/projects/(maple|oak|cedar|pine))(/|$)",
                                 ),
                             }
                         ),
@@ -435,6 +435,7 @@
                             # XXX remove /projects/maple when we have a
                             #     different prod signing testing solution
                             # XXX remove /projects/oak when we no longer test updates against it
+                            # XXX remove /projects/cedar when we no longer need
                             # XXX remove /projects/pine when we no longer need
                             #     nightly signing
                             "all-nightly-branches": (
@@ -446,6 +447,7 @@
                                 "/releases/mozilla-esr91",
                                 "/projects/maple",
                                 "/projects/oak",
+                                "/projects/cedar",
                                 "/projects/pine",
                             ),
                             "all-production-branches": (

diff --git a/src/scriptworker/log.py b/src/scriptworker/log.py
@@ -56,10 +56,10 @@ def update_logging_config(context: Any, log_name: Optional[str] = None, file_nam
     if context.config["watch_log_file"]:
         # If we rotate the log file via logrotate.d, let's watch the file
         # so we can automatically close/reopen on move.
-        handler = logging.handlers.WatchedFileHandler(path)
+        handler = logging.handlers.WatchedFileHandler(path)  # type: ignore
     else:
         # Avoid using WatchedFileHandler during scriptworker unittests
-        handler = logging.FileHandler(path)
+        handler = logging.FileHandler(path)  # type: ignore
     handler.setFormatter(formatter)
     top_level_logger.addHandler(handler)
     top_level_logger.addHandler(logging.NullHandler())

diff --git a/tests/data/cotv2/projects.yml b/tests/data/cotv2/projects.yml
@@ -76,6 +76,17 @@ oak:
     taskcluster-docker-routes-v2: true
     taskcluster-cron: true
     taskcluster-push: true
+cedar:
+  repo: https://hg.mozilla.org/projects/cedar
+  repo_type: hg
+  access: scm_level_3
+  trust_domain: gecko
+  features:
+    buildbot: true
+    taskcluster-docker-routes-v1: true
+    taskcluster-docker-routes-v2: true
+    taskcluster-cron: true
+    taskcluster-push: true
 pine:
   repo: https://hg.mozilla.org/projects/pine
   repo_type: hg
@@ -331,4 +342,3 @@ stylo:
     taskcluster-docker-routes-v2: true
     taskcluster-cron: false
     taskcluster-push: true
-
diff --git a/tests/data/cotv4/projects.yml b/tests/data/cotv4/projects.yml
@@ -114,6 +114,19 @@ oak:
     taskcluster-docker-routes-v2: true
     taskcluster-cron: true
     taskcluster-push: true
+cedar:
+  repo: https://hg.mozilla.org/projects/cedar
+  repo_type: hg
+  access: scm_level_3
+  trust_domain: gecko
+  features:
+    gecko-roles: true
+    gecko-actions: true
+    buildbot: true
+    taskcluster-docker-routes-v1: true
+    taskcluster-docker-routes-v2: true
+    taskcluster-cron: true
+    taskcluster-push: true
 pine:
   repo: https://hg.mozilla.org/projects/pine
   repo_type: hg