Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -936,12 +936,18 @@
         {'name': "lldb-x86-windows-msvc2015",
          'slavenames': ["zturner-win2008"],
          'builddir': "lldb-windows-x86",
-         'factory': LLDBBuilder.getLLDBWindowsCMakeBuildFactory(test=False)},
+         'factory': LLDBBuilder.getLLDBCMakeBuildFactory(
+                    test=False,
+                    python_source_dir=r'C:/Python35',
+                    vs=r"""%VS140COMNTOOLS%""")},
         # Disable the builder till we fix the cmake configuration
         #{'name': "lldb-x86-win7-msvc",
         #'slavenames': ["hexagon-build-01"],
         #'builddir': "builddir/lldb-win7-msvc",
-        #'factory': LLDBBuilder.getLLDBWindowsCMakeBuildFactory(config='Debug')},
+        #'factory': LLDBBuilder.getLLDBCMakeBuildFactory(
+        #           config='Debug',
+        #           python_source_dir=r'C:/Python35',
+        #           vs=r"""%VS140COMNTOOLS%""")},
         {'name': "lldb-x86_64-ubuntu-14.04-buildserver",
          'slavenames': ["lldb-linux-android-buildserver"],
          'builddir': "lldb-android-buildserver",
@@ -974,20 +980,20 @@
          'factory': LLDBBuilder.getLLDBScriptCommandsFactory(
                     downloadBinary=False,
                     runTest=False)},
-        {'name': "lldb-x86_64-fedora-28-cmake",
-         'slavenames': ["lldb-x86_64-fedora-28-cmake"],
-         'builddir': "lldb-x86_64-fedora-28-cmake",
+        {'name': "lldb-x86_64-fedora",
+         'slavenames': ["lldb-x86_64-fedora"],
+         'builddir': "lldb-x86_64-fedora",
          'category' : 'lldb',
-         'factory': LLDBBuilder.getLLDBScriptCommandsFactory(
-                    downloadBinary=False,
-                    runTest=True,
-                    extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=True",
-                                      "-DLLVM_USE_LINKER=gold"])},
+         'factory': LLDBBuilder.getLLDBCMakeBuildFactory(
+                    clean=True,
+                    test=True,
+                    extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=True',
+                                      '-DLLVM_USE_LINKER=gold'])},
         {'name': "lldb-x64-windows-ninja",
          'slavenames': ["win-py3-buildbot"],
          'builddir': "lldb-x64-windows-ninja",
          'category' : 'lldb',
-         'factory': LLDBBuilder.getLLDBWindowsCMakeBuildFactory(
+         'factory': LLDBBuilder.getLLDBCMakeBuildFactory(
                     clean=True,
                     python_source_dir=r'"C:\Program Files (x86)\Microsoft Visual Studio\Shared\Python36_64"',
                     target_arch='x64',
Index: buildbot/osuosl/master/config/slaves.py
===================================================================
--- buildbot/osuosl/master/config/slaves.py
+++ buildbot/osuosl/master/config/slaves.py
@@ -266,8 +266,8 @@
         # OpenBSD amd64
         create_slave("openbsd-amd64", properties={'jobs': 2}, max_builds=1),
 
-        # test only: Fedora 28 x86_64, Intel Xeon E5-2630v3, 32 HT cores, 64GB RAM
-        create_slave("lldb-x86_64-fedora-28-cmake", properties={'jobs': 16}, max_builds=1),
+        # test only: Fedora latest stable x86_64, Intel i5-2500, 4 cores, 12GB RAM
+        create_slave("lldb-x86_64-fedora", properties={'jobs': 4}, max_builds=1),
 
         # Ubuntu 14.04 x86_64, Intel(R) Xeon(R) CPU @ 2.30GHz
         #create_slave("llgo-builder", properties={'jobs': 2}, max_builds=1),
Index: buildbot/osuosl/master/config/status.py
===================================================================
--- buildbot/osuosl/master/config/status.py
+++ buildbot/osuosl/master/config/status.py
@@ -272,4 +272,12 @@
             mode = "failing",
             builders = ["fuchsia-x86_64-linux"],
             addLogs=False),
+        InformativeMailNotifier(
+            fromaddr = "llvm.buildmaster@lab.llvm.org",
+            sendToInterestedUsers = True,
+            extraRecipients = ["jan.kratochvil@redhat.com"],
+            subject="Build %(builder)s Failure",
+            mode = "failing",
+            builders = ["lldb-x86_64-fedora"],
+            addLogs=False),
         ]
Index: zorg/buildbot/builders/LLDBBuilder.py
===================================================================
--- zorg/buildbot/builders/LLDBBuilder.py
+++ zorg/buildbot/builders/LLDBBuilder.py
@@ -45,17 +45,17 @@
                            workdir='%s' % srcdir))
     return f
 
-# CMake Windows builds
-def getLLDBWindowsCMakeBuildFactory(
+# CMake builds
+def getLLDBCMakeBuildFactory(
             clean=False,
             cmake='cmake',
             jobs="%(jobs)s",
 
             # Source directory containing a built python
-            python_source_dir=r'C:/Python35',
+            python_source_dir=None,
 
             # Default values for VS devenv and build configuration
-            vs=r"""%VS140COMNTOOLS%""",
+            vs=None,
             config='Release',
             target_arch='x86',
 
@@ -67,9 +67,10 @@
     f = buildbot.process.factory.BuildFactory()
 
     # Determine Slave Environment and Set MSVC environment.
-    f.addStep(SetProperty(
-        command=getVisualStudioEnvironment(vs, target_arch),
-        extract_fn=extractSlaveEnvironment))
+    if vs:
+        f.addStep(SetProperty(
+            command=getVisualStudioEnvironment(vs, target_arch),
+            extract_fn=extractSlaveEnvironment))
 
     f = getLLDBSource(f,'llvm')
 
@@ -104,9 +105,10 @@
     cmake_cmd = [
         "cmake", "-G", "Ninja", "../llvm",
         "-DCMAKE_BUILD_TYPE=" + config,
-        "-DPYTHON_HOME=" + python_source_dir,
         "-DCMAKE_INSTALL_PREFIX=../install"
         ]
+    if python_source_dir:
+        cmake_cmd.append("-DPYTHON_HOME=" + python_source_dir)
     if extra_cmake_args:
         cmake_cmd += extra_cmake_args
     # Note: ShellCommand does not pass the params with special symbols right.