Migrate linux memory notifier to LUCI-Notify.

Bug: 1094768
Change-Id: Ibcfa475f90241ab7d9da654b0b14d8f2c1bcd451
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2274379
Commit-Queue: Owen Rodley <orodley@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Auto-Submit: Owen Rodley <orodley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784324}

infra/config/generated/luci-notify.cfg

@@ -403,6 +403,141 @@ notifiers {
     repository: "https://chromium.googlesource.com/chromium/src"
   }
 }
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Linux ASan LSan Builder"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Linux ASan LSan Tests (1)"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Linux ASan Tests (sandboxed)"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Linux CFI"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Linux Chromium OS ASan LSan Builder"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Linux Chromium OS ASan LSan Tests (1)"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Linux ChromiumOS MSan Builder"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Linux ChromiumOS MSan Tests"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Linux MSan Builder"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Linux MSan Tests"
+  }
+}
 notifiers {
   notifications {
     on_occurrence: FAILURE
@@ -427,6 +562,33 @@ notifiers {
     failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
   }
 }
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Linux TSan Builder"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Linux TSan Tests"
+  }
+}
 notifiers {
   notifications {
     on_change: true
@@ -1115,6 +1277,46 @@ notifiers {
     failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
   }
 }
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m83"
+    name: "Linux ASan LSan Builder"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m83"
+    name: "Linux ASan LSan Tests (1)"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m83"
+    name: "Linux ASan Tests (sandboxed)"
+  }
+}
 notifiers {
   notifications {
     on_occurrence: FAILURE
@@ -1139,6 +1341,33 @@ notifiers {
     failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
   }
 }
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m83"
+    name: "Linux TSan Builder"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m83"
+    name: "Linux TSan Tests"
+  }
+}
 notifiers {
   notifications {
     on_occurrence: FAILURE
@@ -1426,6 +1655,46 @@ notifiers {
     failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
   }
 }
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m84"
+    name: "Linux ASan LSan Builder"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m84"
+    name: "Linux ASan LSan Tests (1)"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m84"
+    name: "Linux ASan Tests (sandboxed)"
+  }
+}
 notifiers {
   notifications {
     on_occurrence: FAILURE
@@ -1450,6 +1719,33 @@ notifiers {
     failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
   }
 }
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m84"
+    name: "Linux TSan Builder"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m84"
+    name: "Linux TSan Tests"
+  }
+}
 notifiers {
   notifications {
     on_occurrence: FAILURE
@@ -1737,6 +2033,46 @@ notifiers {
     failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
   }
 }
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m85"
+    name: "Linux ASan LSan Builder"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m85"
+    name: "Linux ASan LSan Tests (1)"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m85"
+    name: "Linux ASan Tests (sandboxed)"
+  }
+}
 notifiers {
   notifications {
     on_occurrence: FAILURE
@@ -1761,6 +2097,33 @@ notifiers {
     failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
   }
 }
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m85"
+    name: "Linux TSan Builder"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m85"
+    name: "Linux TSan Tests"
+  }
+}
 notifiers {
   notifications {
     on_occurrence: FAILURE

infra/config/lib/ci.star

@@ -422,6 +422,7 @@ def ci_builder(
     cq_mirrors_console_view=args.DEFAULT,
     console_view_entry=None,
     tree_closing=False,
+    notifies=None,
     **kwargs):
   """Define a CI builder.
 
@@ -451,12 +452,12 @@ def ci_builder(
     tree_closing - If true, failed builds from this builder that meet certain
       criteria will close the tree and email the sheriff. See the
       'chromium-tree-closer' config in notifiers.star for the full criteria.
+    notifies - Any extra notifiers to attach to this builder.
   """
   # Define the builder first so that any validation of luci.builder arguments
   # (e.g. bucket) occurs before we try to use it
-  notifies = kwargs.pop('notifies', [])
   if tree_closing:
-    notifies += ['chromium-tree-closer', 'chromium-tree-closer-email']
+    notifies = (notifies or []) + ['chromium-tree-closer', 'chromium-tree-closer-email']
   ret = builders.builder(
       name = name,
       resultdb_bigquery_exports = [resultdb.export_test_results(
@@ -774,10 +775,9 @@ def gpu_fyi_windows_builder(*, name, **kwargs):
   )
 
 
-def gpu_builder(*, name, tree_closing=True, **kwargs):
-  notifies = kwargs.pop('notifies', [])
+def gpu_builder(*, name, tree_closing=True, notifies=None, **kwargs):
   if tree_closing:
-    notifies.append('gpu-tree-closer-email')
+    notifies = (notifies or []) + ['gpu-tree-closer-email']
   return ci.builder(
       name = name,
       goma_backend = builders.goma.backend.RBE_PROD,
@@ -860,12 +860,17 @@ def memory_builder(
     *,
     name,
     goma_jobs=builders.goma.jobs.MANY_JOBS_FOR_CI,
+    notifies=None,
     **kwargs):
+  if name.startswith('Linux'):
+    notifies = (notifies or []) + ['linux-memory']
+
   return ci.builder(
       name = name,
       goma_backend = builders.goma.backend.RBE_PROD,
       goma_jobs = goma_jobs,
       mastername = 'chromium.memory',
+      notifies = notifies,
       **kwargs
   )
 

infra/config/notifiers.star

@@ -70,3 +70,10 @@ luci.notifier(
     notify_emails = ['orodley+gpu-test-tree-closing-notifier@chromium.org'],
     failed_step_regexp = TREE_CLOSING_STEPS,
 )
+
+luci.notifier(
+    name = 'linux-memory',
+    on_occurrence = ['FAILURE'],
+    notify_emails = ['thomasanderson@chromium.org'],
+    failed_step_regexp = TREE_CLOSING_STEPS,
+)