Index: zorg/trunk/buildbot/osuosl/master/config/builders.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py
@@ -1081,6 +1081,10 @@
            'slavenames' :["sanitizer-buildbot1", "sanitizer-buildbot2"],
            'builddir': "sanitizer-x86_64-linux-fast",
            'factory': SanitizerBuilder.getSanitizerBuildFactory()},
+          {'name': "sanitizer-x86_64-linux-gn",
+           'slavenames' :["sanitizer-buildbot1", "sanitizer-buildbot2"],
+           'builddir': "sanitizer-x86_64-linux-gn",
+           'factory': SanitizerBuilder.getSanitizerBuildFactory()},
 
           {'name': "sanitizer-x86_64-linux-bootstrap",
            'slavenames' :["sanitizer-buildbot3", "sanitizer-buildbot4"],
Index: zorg/trunk/buildbot/osuosl/master/config/status.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/status.py
+++ zorg/trunk/buildbot/osuosl/master/config/status.py
@@ -273,4 +273,12 @@
             mode = "failing",
             builders = ["lldb-x86_64-debian"],
             addLogs=False),
+        InformativeMailNotifier(
+            fromaddr = "llvm.buildmaster@lab.llvm.org",
+            sendToInterestedUsers= False,
+            extraRecipients = ["vitalybuka@google.com", "eugenis@google.com"],
+            subject="Build %(builder)s Failure",
+            mode = "failing",
+            builders = ["sanitizer-x86_64-linux-gn"],
+            addLogs=False),
         ]
Index: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_gn.sh
===================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_gn.sh
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_gn.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+set -exu
+
+HERE="$(cd $(dirname $0) && pwd)"
+. ${HERE}/buildbot_functions.sh
+
+ROOT=`pwd`
+PLATFORM=`uname`
+export PATH="/usr/local/bin:$PATH"
+
+CHECK_LIBCXX=${CHECK_LIBCXX:-0}
+CHECK_LLD=${CHECK_LLD:-0}
+LLVM=$ROOT/llvm
+
+if [ "$BUILDBOT_CLOBBER" != "" ]; then
+  echo @@@BUILD_STEP clobber@@@
+  rm -rf llvm
+fi
+
+echo @@@BUILD_STEP update@@@
+buildbot_update
+
Index: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py
===================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py
@@ -24,6 +24,7 @@
     'sanitizer-x86_64-linux-android': bash('buildbot_android.sh'),
     'sanitizer-x86_64-linux-bootstrap-msan': bash('buildbot_bootstrap_msan.sh'),
     'sanitizer-x86_64-linux-bootstrap-ubsan': bash('buildbot_bootstrap_ubsan.sh'),
+    'sanitizer-x86_64-linux-gn': bash('buildbot_gn.sh'),
 }
 
 BOT_ADDITIONAL_ENV = {
@@ -37,6 +38,7 @@
     'sanitizer-x86_64-linux-android': {},
     'sanitizer-x86_64-linux-bootstrap-msan': {},
     'sanitizer-x86_64-linux-bootstrap-ubsan': {},
+    'sanitizer-x86_64-linux-gn': {},
 }
 
 def Main():