diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py --- a/buildbot/osuosl/master/config/builders.py +++ b/buildbot/osuosl/master/config/builders.py @@ -18,7 +18,6 @@ from zorg.buildbot.builders import AnnotatedBuilder from zorg.buildbot.builders import LLDPerformanceTestsuite from zorg.buildbot.builders import FuchsiaBuilder -from zorg.buildbot.builders import LibcBuilder # Plain LLVM builders. def _get_llvm_builders(): @@ -1340,19 +1339,6 @@ ])}, ] -def _get_libc_builders(): - return [ - {'name': "libc-x86_64-debian", - 'slavenames': ["libc-x86_64-debian"], - 'builddir': "libc-x86_64-debian", - 'category' : 'libc', - 'factory': LibcBuilder.getBuildFactory(clean=False)}, - {'name': "libc-x86_64-debian-asan", - 'slavenames': ["libc-x86_64-debian"], - 'builddir': "libc-x86_64-debian-asan", - 'category' : 'libc', - 'factory': LibcBuilder.getBuildFactory(clean=False, asan=True)}, - ] # Experimental and stopped builders def _get_on_demand_builders(): diff --git a/buildbot/osuosl/master/config/slaves.py b/buildbot/osuosl/master/config/slaves.py --- a/buildbot/osuosl/master/config/slaves.py +++ b/buildbot/osuosl/master/config/slaves.py @@ -188,9 +188,6 @@ # Debian x86_64 Buster Xeon(R) Gold 6154 CPU @ 3.00GHz, 192GB RAM create_slave("lldb-x86_64-debian", properties={'jobs': 72}, max_builds=1), - # Debian x86_64 Intel Broadwell 32 CPUs, 120 GB RAM - create_slave("libc-x86_64-debian", properties={'jobs': 32}, max_builds=2), - # Windows dellfx2-sled3 create_slave("as-builder-3", max_builds=1), diff --git a/buildbot/osuosl/master/config/status.py b/buildbot/osuosl/master/config/status.py --- a/buildbot/osuosl/master/config/status.py +++ b/buildbot/osuosl/master/config/status.py @@ -247,12 +247,4 @@ builders = ["llvm-clang-x86_64-win-fast","lld-x86_64-ubuntu-fast", "llvm-clang-x86_64-expensive-checks-ubuntu"], addLogs=False), - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers = True, - extraRecipients = ["sivachandra@google.com"], - subject="Build %(builder)s Failure", - mode = "failing", - builders = ["libc-x86_64-debian", "libc-x86_64_debian-asan"], - addLogs=False), ] diff --git a/buildbot/osuosl/master/master.cfg b/buildbot/osuosl/master/master.cfg --- a/buildbot/osuosl/master/master.cfg +++ b/buildbot/osuosl/master/master.cfg @@ -42,7 +42,6 @@ "clang-tools-extra", "polly", "compiler-rt", - "libc", "libcxx", "libcxxabi", "libunwind", @@ -226,12 +225,6 @@ "llvm", "polly"]))) -c['schedulers'].append(SingleBranchScheduler(name="libc_scheduler", - treeStableTimer=2*60, - builderNames=get_all_for("libc"), - change_filter=depends_on(["llvm", - "libc"]))) - c['schedulers'].extend( config.schedulers.getSingleBranchSchedulers(c['builders'], c['schedulers']) )