[zorg] r205815 - Done some code cleaning mostly related to obsolete builders LLVMGCCBuilder, ScriptedBuilder, DragonEggBuilder.
Galina Kistanova
gkistanova at gmail.com
Tue Apr 8 16:27:11 PDT 2014
Author: gkistanova
Date: Tue Apr 8 18:27:11 2014
New Revision: 205815
URL: http://llvm.org/viewvc/llvm-project?rev=205815&view=rev
Log:
Done some code cleaning mostly related to obsolete builders LLVMGCCBuilder, ScriptedBuilder, DragonEggBuilder.
Modified:
zorg/trunk/buildbot/osuosl/master/config/__init__.py
zorg/trunk/buildbot/osuosl/master/config/builders.py
zorg/trunk/buildbot/osuosl/master/config/status.py
zorg/trunk/buildbot/osuosl/master/master.cfg
zorg/trunk/zorg/buildbot/changes/llvmpoller.py
Modified: zorg/trunk/buildbot/osuosl/master/config/__init__.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/__init__.py?rev=205815&r1=205814&r2=205815&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/__init__.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/__init__.py Tue Apr 8 18:27:11 2014
@@ -7,4 +7,3 @@ options.read(os.path.join(os.path.dirnam
import builders
import slaves
import status
-
Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=205815&r1=205814&r2=205815&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Tue Apr 8 18:27:11 2014
@@ -6,10 +6,6 @@ from zorg.buildbot.builders import LLVMB
reload(LLVMBuilder)
from zorg.buildbot.builders import LLVMBuilder
-from zorg.buildbot.builders import LLVMGCCBuilder
-reload(LLVMGCCBuilder)
-from zorg.buildbot.builders import LLVMGCCBuilder
-
from zorg.buildbot.builders import LNTBuilder
reload(LNTBuilder)
from zorg.buildbot.builders import LNTBuilder
@@ -18,10 +14,6 @@ from zorg.buildbot.builders import Night
reload(NightlytestBuilder)
from zorg.buildbot.builders import NightlytestBuilder
-from zorg.buildbot.builders import ScriptedBuilder
-reload(ScriptedBuilder)
-from zorg.buildbot.builders import ScriptedBuilder
-
from zorg.buildbot.builders import PollyBuilder
reload(PollyBuilder)
from zorg.buildbot.builders import PollyBuilder
@@ -50,8 +42,6 @@ from zorg.buildbot.builders import Libio
reload(Libiomp5Builder)
from zorg.buildbot.builders import Libiomp5Builder
-from buildbot.steps.source import SVN
-
# Plain LLVM builders.
def _get_llvm_builders():
return [
@@ -121,16 +111,6 @@ def _get_llvm_builders():
'slavenames': ["dunbar1"],
'builddir': "llvm-i686",
'factory': LLVMBuilder.getLLVMBuildFactory("i686-pc-linux-gnu", jobs=2, enable_shared=True)},
-{'name' : "llvm-gcc-i686-darwin10-selfhost",
- 'slavenames':["dunbar-darwin10"],
- 'builddir':"llvm-gcc-i686-darwin10-selfhost",
- 'factory':LLVMGCCBuilder.getLLVMGCCBuildFactory(4, triple='i686-apple-darwin10',
- gxxincludedir='/usr/include/c++/4.2.1')},
-{'name' : "llvm-gcc-x86_64-darwin10-selfhost",
- 'slavenames':["dunbar-darwin10"],
- 'builddir':"llvm-gcc-x86_64-darwin10-selfhost",
- 'factory':LLVMGCCBuilder.getLLVMGCCBuildFactory(4, triple='x86_64-apple-darwin10',
- gxxincludedir='/usr/include/c++/4.2.1')},
clang_i386_linux_xfails = [
'LLC.MultiSource/Applications/oggenc/oggenc',
Modified: zorg/trunk/buildbot/osuosl/master/config/status.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/status.py?rev=205815&r1=205814&r2=205815&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/status.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/status.py Tue Apr 8 18:27:11 2014
@@ -55,15 +55,6 @@ def get_status_targets(standard_builders
InformativeMailNotifier(
fromaddr = "llvm.buildmaster at lab.llvm.org",
sendToInterestedUsers= False,
- extraRecipients = ["baldrick at free.fr"],
- subject="Build %(builder)s Failure",
- mode = "failing",
- builders = ["dragonegg-i386-linux", "dragonegg-x86_64-linux"],
- addLogs=False,
- num_lines = 15),
- InformativeMailNotifier(
- fromaddr = "llvm.buildmaster at lab.llvm.org",
- sendToInterestedUsers= False,
extraRecipients = ["tobias at grosser.es"],
subject="Build %(builder)s Failure",
mode = "failing",
Modified: zorg/trunk/buildbot/osuosl/master/master.cfg
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/master.cfg?rev=205815&r1=205814&r2=205815&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/master.cfg (original)
+++ zorg/trunk/buildbot/osuosl/master/master.cfg Tue Apr 8 18:27:11 2014
@@ -42,9 +42,7 @@ c['change_source'].append(LLVMPoller(pro
"clang-tests-external",
"clang-tools-extra",
"polly",
- "llvm-gcc-4.2",
"compiler-rt",
- "dragonegg",
"lld",
"lldb",
"openmp"]))
@@ -107,20 +105,6 @@ c['schedulers'] = [SingleBranchScheduler
change_filter=depends_on(
"llvm"))]
-c['schedulers'].append(SingleBranchScheduler(name="llvmgcc_scheduler",
- treeStableTimer=2*60,
- builderNames=get_all_for("llvm-gcc"),
- change_filter=depends_on([
- "llvm",
- "llvm-gcc-4.2"])))
-
-c['schedulers'].append(SingleBranchScheduler(name="dragonegg_scheduler",
- treeStableTimer=2*60,
- builderNames=get_all_for("dragonegg"),
- change_filter=depends_on([
- "llvm",
- "dragonegg"])))
-
c['schedulers'].append(SingleBranchScheduler(name="clang_scheduler",
treeStableTimer=2*60,
builderNames=get_all_for("clang"),
Modified: zorg/trunk/zorg/buildbot/changes/llvmpoller.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/changes/llvmpoller.py?rev=205815&r1=205814&r2=205815&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/changes/llvmpoller.py (original)
+++ zorg/trunk/zorg/buildbot/changes/llvmpoller.py Tue Apr 8 18:27:11 2014
@@ -233,9 +233,7 @@ class LLVMPoller(base.PollingChangeSourc
'llvm' : 'llvm',
'cfe' : 'clang',
'polly' : 'polly',
- 'llvm-gcc-4.2' : 'llvm-gcc',
'compiler-rt' : 'compiler-rt',
- 'dragonegg' : 'dragonegg',
'lldb' : 'lldb',
'openmp' : 'openmp',
}
More information about the llvm-commits
mailing list