Index: buildbot/osuosl/master/config/builders.py =================================================================== --- buildbot/osuosl/master/config/builders.py +++ buildbot/osuosl/master/config/builders.py @@ -937,39 +937,6 @@ # LLDB builders. def _get_lldb_builders(): return [ - {'name': "lldb-x86-windows-msvc2015", - 'slavenames': ["zturner-win2008"], - 'builddir': "lldb-windows-x86", - '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.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", - 'category' : 'lldb', - 'factory': LLDBBuilder.getLLDBScriptCommandsFactory( - downloadBinary=False, - buildAndroid=True, - runTest=False, - extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON'])}, - {'name': "lldb-x86_64-ubuntu-14.04-cmake", - 'slavenames': ["lldb-build1-ubuntu-1404"], - 'builddir': "buildWorkingDir", - 'category' : 'lldb', - 'factory': LLDBBuilder.getLLDBScriptCommandsFactory( - downloadBinary=False, - buildAndroid=False, - runTest=True, - extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON'])}, {'name': "lldb-amd64-ninja-netbsd8", 'slavenames': ["lldb-amd64-ninja-netbsd8"], 'builddir': "netbsd8", @@ -1587,34 +1554,6 @@ enable_thrust_tests=False, ), 'category' : 'clang'}, - - # lldb builders - {'name': "lldb-x86_64-darwin-13.4", - 'slavenames': ["lldb-x86_64-darwin-13.4"], - 'builddir': "buildDir", - 'category' : 'lldb', - 'factory': LLDBBuilder.getLLDBScriptCommandsFactory( - downloadBinary=True, - buildAndroid=False, - runTest=True)}, - {'name': "lldb-x86_64-ubuntu-14.04-android", - 'slavenames': ["lldb-lab-linux01"], - 'builddir': "lldb-cross-compile", - 'category' : 'lldb', - 'factory': LLDBBuilder.getLLDBScriptCommandsFactory( - downloadBinary=True, - buildAndroid=False, - runTest=True)}, - {'name': "lldb-windows7-android", - 'slavenames': ["lldb-lab-win01"], - 'builddir': "lldb-win7-android", - 'category': "lldb", - 'factory': LLDBBuilder.getLLDBScriptCommandsFactory( - downloadBinary=True, - buildAndroid=False, - runTest=True, - scriptExt='.bat')}, - ] # Builders responsible building Sphinix documentation Index: buildbot/osuosl/master/config/slaves.py =================================================================== --- buildbot/osuosl/master/config/slaves.py +++ buildbot/osuosl/master/config/slaves.py @@ -189,8 +189,6 @@ create_slave('libcxx-cloud5', properties={'jobs': 64}, max_builds=1), - # Windows Server 2008 R2, Quad 2.6GHz Intel Xeon(R) 4GB RAM - create_slave("zturner-win2008", properties={'jobs': 4}, max_builds=1), # Windows Server 2012 x86_64 16-core GCE instance create_slave("sanitizer-windows", properties={'jobs': 16}, max_builds=1), create_slave("windows-gcebot1", properties={'jobs': 8}, max_builds=1), @@ -199,17 +197,6 @@ # Windows Server 2016 x86_64 16-core GCE instance create_slave("windows-lld-thinlto-1", max_builds=1), - # Ubuntu x86-64, 51GiB System memory Intel(R) Xeon(R) CPU @ 2.60GHz - create_slave("lldb-build1-ubuntu-1404", properties={'jobs': 32, 'loadaverage':32}, max_builds=1), - # Darwin 13.4.0, x86_64 - create_slave("lldb-x86_64-darwin-13.4", properties={'jobs': 16, 'loadaverage':32}, max_builds=1), - # Ubuntu 14.04 x86_64, Intel(R) Xeon(R) CPU E5-2680 v2 @ 2.80GHz - create_slave("lldb-lab-linux01", properties={'jobs': 40}, max_builds=1), - - # Windows 7 x86_64 - create_slave("lldb-lab-win01", properties={'jobs': 40}, max_builds=1), - # Ubuntu 14.04 x86_64 - create_slave("lldb-linux-android-buildserver", properties={'jobs': 40}, max_builds=1), # Ubuntu 14.04 x86_64, Intel(R) Xeon(R) CPU L5520 @ 2.27GHz create_slave("bpf-build-slave01", properties={'jobs': 16}, max_builds=1), Index: buildbot/osuosl/master/config/status.py =================================================================== --- buildbot/osuosl/master/config/status.py +++ buildbot/osuosl/master/config/status.py @@ -145,20 +145,6 @@ InformativeMailNotifier( fromaddr = "llvm.buildmaster@lab.llvm.org", sendToInterestedUsers= False, - extraRecipients = ["lldb-build-police-gmt@grotations.appspotmail.com", - "lldb-build-police-pst@grotations.appspotmail.com"], - subject="Build %(builder)s Failure", - mode = "failing", - builders = ["lldb-x86_64-ubuntu-14.04-cmake", - "lldb-x86_64-ubuntu-14.04-buildserver", - "lldb-windows7-android", - "lldb-x86_64-darwin-13.4", - "lldb-x86_64-ubuntu-14.04-android"], - addLogs=False, - num_lines = 15), - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers= False, extraRecipients = ["sunil_srivastava@playstation.sony.com", "warren_ristow@playstation.sony.com"], subject="Build %(builder)s Failure", Index: buildbot/osuosl/master/master.cfg =================================================================== --- buildbot/osuosl/master/master.cfg +++ buildbot/osuosl/master/master.cfg @@ -178,24 +178,6 @@ "llvm", "lld"]))) -# lldb android builders will be triggered by completion of buildserver instead of by source change -lldb_android_builders=["lldb-x86_64-ubuntu-14.04-android", - "lldb-windows7-android", - "lldb-x86_64-darwin-13.4"] -from zorg.buildbot.schedulers.LLDBTriggerable import LLDBTriggerable -c['schedulers'].append((LLDBTriggerable( - projects=['lldb', 'cfe', 'llvm'], - name="lldb_android_scheduler", - builderNames=lldb_android_builders))) - -c['schedulers'].append(SingleBranchScheduler(name="lldb_scheduler", - treeStableTimer=2*60, - builderNames=list(set(get_all_for("lldb"))-set(lldb_android_builders)), - change_filter=depends_on([ - "llvm", - "cfe", - "lldb"]))) - c['schedulers'].append(SingleBranchScheduler(name="sanitizer_scheduler", treeStableTimer=2*60, builderNames=get_all_for("sanitizer"),