Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -978,6 +978,7 @@
          'factory': LLDBBuilder.getLLDBScriptCommandsFactory(
                     downloadBinary=False,
                     runTest=True,
+                    uploadTestTraces=False,
                     extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=True",
                                       "-DLLVM_USE_LINKER=gold"])},
         {'name': "lldb-x64-windows-ninja",
Index: zorg/buildbot/builders/LLDBBuilder.py
===================================================================
--- zorg/buildbot/builders/LLDBBuilder.py
+++ zorg/buildbot/builders/LLDBBuilder.py
@@ -921,6 +921,7 @@
                        runTest=True,
                        scriptExt='.sh',
                        extra_cmake_args=None,
+                       uploadTestTraces=True,
                        ):
     f = buildbot.process.factory.BuildFactory()
 
@@ -980,11 +981,13 @@
                                  workdir='scripts'))
         getTestSteps(f, scriptExt, pathSep)
         # upload test traces
-        getShellCommandStep(f, name='upload test traces',
-                            command=[pathSep + 'uploadTestTrace' + scriptExt,
-                                     WithProperties('%(buildnumber)s'),
-                                     WithProperties('%(buildername)s')],
-                            flunkOnFailure=False)
+        if uploadTestTraces:
+            getShellCommandStep(f, name='upload test traces',
+                                command=[pathSep + 'uploadTestTrace'
+                                             + scriptExt,
+                                         WithProperties('%(buildnumber)s'),
+                                         WithProperties('%(buildername)s')],
+                                flunkOnFailure=False)
 
     # Upload lldb-server binaries and trigger android builders
     if buildAndroid: