[llvm-commits] [zorg] r143081 - in /zorg/trunk/buildbot/osuosl/master/config: builders.py slaves.py status.py
Galina Kistanova
gkistanova at gmail.com
Wed Oct 26 16:55:10 PDT 2011
Author: gkistanova
Date: Wed Oct 26 18:55:10 2011
New Revision: 143081
URL: http://llvm.org/viewvc/llvm-project?rev=143081&view=rev
Log:
Moved off-line builders and slaves to #Offline sections instead of deleting.
Moved all clang builders to one place.
Change buildbot email address.
Modified:
zorg/trunk/buildbot/osuosl/master/config/builders.py
zorg/trunk/buildbot/osuosl/master/config/slaves.py
zorg/trunk/buildbot/osuosl/master/config/status.py
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=143081&r1=143080&r2=143081&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed Oct 26 18:55:10 2011
@@ -36,10 +36,6 @@
# Plain LLVM builders.
def _get_llvm_builders():
return [
-# {'name': "llvm-i686-linux",
-# 'slavenames': ["dunbar1"],
-# 'builddir': "llvm-i686",
-# 'factory': LLVMBuilder.getLLVMBuildFactory("i686-pc-linux-gnu", jobs=2, enable_shared=True)},
{'name': "llvm-x86_64-linux",
'slavenames': ["gcc14"],
'builddir': "llvm-x86_64",
@@ -73,7 +69,7 @@
{'name': "llvm-alpha-linux",
'slavenames':["andrew1"],
'builddir':"llvm-alpha",
- 'factory': LLVMBuilder.getLLVMBuildFactory("alpha-linux-gnu", jobs=2)}
+ 'factory': LLVMBuilder.getLLVMBuildFactory("alpha-linux-gnu", jobs=2)},
{'name': "llvm-i386-auroraux",
'slavenames':["evocallaghan"],
'builddir':"llvm-i386-auroraux",
@@ -82,15 +78,26 @@
'slavenames':["nick1"],
'builddir':"llvm-ppc",
'factory': LLVMBuilder.getLLVMBuildFactory("ppc-linux-gnu", jobs=1, clean=False, timeout=40)},
+{'name': "llvm-i686-linux-vg_leak",
+ 'slavenames':["osu8"],
+ 'builddir':"llvm-i686-linux-vg_leak",
+ 'factory': LLVMBuilder.getLLVMBuildFactory("i686-pc-linux-gnu", valgrind=True,
+ valgrindLeakCheck=True,
+ valgrindSuppressions='utils/valgrind/i386-pc-linux-gnu.supp')},
+{'name': "llvm-x86_64-linux-vg_leak",
+ 'slavenames':["osu7"],
+ 'builddir':"llvm-x86_64-linux-vg_leak",
+ 'factory': LLVMBuilder.getLLVMBuildFactory("x86_64-pc-linux-gnu", valgrind=True,
+ valgrindLeakCheck=True,
+ valgrindSuppressions='utils/valgrind/x86_64-pc-linux-gnu.supp')},
+{'name': "llvm-i686-linux",
+ 'slavenames': ["dunbar1"],
+ 'builddir': "llvm-i686",
+ 'factory': LLVMBuilder.getLLVMBuildFactory("i686-pc-linux-gnu", jobs=2, enable_shared=True)},
# llvm-gcc self hosting builders.
def _get_llvmgcc_builders():
return [
-# {'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-i386-linux-selfhost",
'slavenames':["gcc11"],
'builddir':"llvm-gcc-i386-linux-selfhost",
@@ -107,11 +114,6 @@
'--with-as=/home/baldrick/bin32/as',
'--with-mpfr=/home/baldrick/cfarm-32',
'--with-gmp=/home/baldrick/cfarm-32'])},
-# {'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')},
{'name' : "llvm-x86_64-linux-checks",
'slavenames':["gcc10"],
@@ -126,6 +128,23 @@
timeout=120)},
]
+# Offline.
+{'name' : "llvm-gcc-x86_64-linux-selfhost",
+ 'slavenames':["osu7"],
+ 'builddir':"llvm-gcc-x86_64-linux-selfhost",
+ 'factory':LLVMGCCBuilder.getLLVMGCCBuildFactory(triple='x86_64-pc-linux-gnu',
+ extra_configure_args=['--disable-multilib'])},
+{'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 = [
'GCCAS.MultiSource/Benchmarks/tramp3d-v4/tramp3d-v4',
'Bytecode.MultiSource/Benchmarks/tramp3d-v4/tramp3d-v4',
@@ -155,38 +174,10 @@
# Clang builders.
def _get_clang_builders():
return [
-# {'name': "clang-x86_64-linux",
-# 'slavenames':["gcc14"],
-# 'builddir':"clang-x86_64-linux",
-# 'factory': ClangBuilder.getClangBuildFactory(examples=True)},
-# {'name': "clang-i686-linux",
-# 'slavenames':["dunbar1"],
-# 'builddir':"clang-i686-linux",
-# 'factory': ClangBuilder.getClangBuildFactory()},
- {'name': "clang-arm-linux",
- 'slavenames':["nick3"],
- 'builddir':"clang-arm-linux",
- 'factory': ClangBuilder.getClangBuildFactory()},
-# {'name' : "clang-i686-darwin10",
-# 'slavenames' :["dunbar-darwin10"],
-# 'builddir' :"clang-i686-darwin10",
-# 'factory': ClangBuilder.getClangBuildFactory(triple='i686-apple-darwin10',
-# stage1_config='Release')},
{'name': "clang-i686-freebsd",
'slavenames':["freebsd1"],
'builddir':"clang-i686-freebsd",
'factory': ClangBuilder.getClangBuildFactory(clean=True, use_pty_in_tests=True)},
-# {'name' : "clang-i686-xp-msvc9",
-# 'slavenames' :['dunbar-win32-2'],
-# 'builddir' :"clang-i686-xp-msvc9",
-# 'factory' : ClangBuilder.getClangMSVCBuildFactory(jobs=2)},
-# {'name' : "clang-x86_64-darwin10-selfhost",
-# 'slavenames' : ["dunbar-darwin10"],
-# 'builddir' : "clang-x86_64-darwin10-selfhost",
-# 'factory' : ClangBuilder.getClangBuildFactory(triple='x86_64-apple-darwin10',
-# useTwoStage=True,
-# stage1_config='Release+Asserts',
-# stage2_config='Debug+Asserts')},
{'name' : "clang-i686-linux-fnt",
'slavenames' : ['balint1'],
@@ -215,7 +206,52 @@
'factory' : NightlytestBuilder.getFastNightlyTestBuildFactory(triple='x86_64-pc-linux-gnu',
stage1_config='Release+Asserts',
test=False,
- xfails=clang_x86_64_linux_xfails) },
+ xfails=clang_x86_64_linux_xfails)},
+
+ {'name': "clang-native-arm-cortex-a9",
+ 'slavenames':["kistanova6"],
+ 'builddir':"clang-native-arm-cortex-a9",
+ 'factory' : ClangBuilder.getClangBuildFactory(
+ extra_configure_args=['--build=armv7l-unknown-linux-gnueabi',
+ '--host=armv7l-unknown-linux-gnueabi',
+ '--target=armv7l-unknown-linux-gnueabi',
+ '--with-cpu=cortex-a9',
+ '--with-fpu=neon', '--with-abi=aapcs',
+ '--with-float=hard',
+ '--enable-targets=arm,cbe',
+ '--enable-optimized'])},
+
+ {'name': "clang-X86_64-freebsd",
+ 'slavenames':["kistanova7"],
+ 'builddir':"clang-X86_64-freebsd",
+ 'factory': NightlytestBuilder.getFastNightlyTestBuildFactory(triple='x86_64-unknown-freebsd8.2',
+ stage1_config='Release+Asserts',
+ test=True)},
+
+ {'name': "clang-native-mingw32-win7",
+ 'slavenames':["kistanova8"],
+ 'builddir':"clang-native-mingw32-win7",
+ 'factory' : ClangBuilder.getClangBuildFactory(triple='i686-pc-mingw32',
+ useTwoStage=True, test=True,
+ stage1_config='Release+Asserts',
+ stage2_config='Release+Asserts')},
+ # Clang cross builders.
+ {'name': "clang-x86_64-darwin10-self-mingw32",
+ 'slavenames':["kistanova1"],
+ 'builddir':"clang-x86_64-darwin10-self-mingw32",
+ 'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4, test=False,
+ extra_configure_args=['--build=x86_64-apple-darwin10',
+ '--host=i686-pc-mingw32',
+ '--target=i686-pc-mingw32'])},
+ {'name' : "clang-x86_64-darwin10-cross-mingw32",
+ 'slavenames' :["kistanova1"],
+ 'builddir' :"clang-x86_64-darwin10-cross-mingw32",
+ 'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4, use_pty_in_tests=True,
+ run_cxx_tests=True,
+ extra_configure_args=['--build=x86_64-apple-darwin10',
+ '--host=x86_64-apple-darwin10',
+ '--target=i686-pc-mingw32'])},
+
]
# Offline.
@@ -224,6 +260,59 @@
'builddir':"clang-i386-auroraux",
'factory': ClangBuilder.getClangBuildFactory("i386-pc-auroraux",
jobs="%(jobs)s", make='gmake')},
+{'name': "clang-x86_64-linux-vg",
+ 'slavenames':["osu7"],
+ 'builddir':"clang-x86_64-linux-vg",
+ 'factory': ClangBuilder.getClangBuildFactory(valgrind=True)},
+{'name' : "clang-x86_64-linux-selfhost-rel",
+ 'slavenames' : ["osu7"],
+ 'builddir' : "clang-x86_64-linux-selfhost-rel",
+ 'factory' : ClangBuilder.getClangBuildFactory(triple='x86_64-pc-linux-gnu',
+ useTwoStage=True,
+ stage1_config='Release+Asserts',
+ stage2_config='Release+Asserts')},
+{'name' : "clang-x86_64-linux-fnt",
+ 'slavenames' : ['osu7'],
+ 'builddir' : "clang-x86_64-linux-fnt",
+ 'factory' : NightlytestBuilder.getFastNightlyTestBuildFactory(triple='x86_64-pc-linux-gnu',
+ stage1_config='Release+Asserts',
+ test=False,
+ xfails=clang_x86_64_linux_xfails) },
+{'name' : "clang-i686-linux-selfhost-rel",
+ 'slavenames' : ["osu8"],
+ 'builddir' : "clang-i686-linux-selfhost-rel",
+ 'factory' : ClangBuilder.getClangBuildFactory(triple='i686-pc-linux-gnu',
+ useTwoStage=True,
+ stage1_config='Release+Asserts',
+ stage2_config='Release+Asserts')},
+{'name': "clang-x86_64-linux",
+ 'slavenames':["gcc14"],
+ 'builddir':"clang-x86_64-linux",
+ 'factory': ClangBuilder.getClangBuildFactory(examples=True)},
+{'name': "clang-i686-linux",
+ 'slavenames':["dunbar1"],
+ 'builddir':"clang-i686-linux",
+ 'factory': ClangBuilder.getClangBuildFactory()},
+{'name': "clang-arm-linux",
+ 'slavenames':["nick3"],
+ 'builddir':"clang-arm-linux",
+ 'factory': ClangBuilder.getClangBuildFactory()},
+{'name' : "clang-i686-darwin10",
+ 'slavenames' :["dunbar-darwin10"],
+ 'builddir' :"clang-i686-darwin10",
+ 'factory': ClangBuilder.getClangBuildFactory(triple='i686-apple-darwin10',
+ stage1_config='Release')},
+#{'name' : "clang-i686-xp-msvc9",
+# 'slavenames' :['dunbar-win32-2'],
+# 'builddir' :"clang-i686-xp-msvc9",
+# 'factory' : ClangBuilder.getClangMSVCBuildFactory(jobs=2)},
+{'name' : "clang-x86_64-darwin10-selfhost",
+ 'slavenames' : ["dunbar-darwin10"],
+ 'builddir' : "clang-x86_64-darwin10-selfhost",
+ 'factory' : ClangBuilder.getClangBuildFactory(triple='x86_64-apple-darwin10',
+ useTwoStage=True,
+ stage1_config='Release+Asserts',
+ stage2_config='Debug+Asserts')},
def _get_dragonegg_builders():
return [
@@ -273,7 +362,6 @@
# LLDB builders.
def _get_lldb_builders():
gcc_latest_env = {
- 'PATH': '/opt/cfarm/python2-latest/bin:/usr/local/bin:/usr/bin:/bin:/usr/games',
'CC': '/opt/cfarm/release/4.5.1/bin/gcc',
'CXX': '/opt/cfarm/release/4.5.1/bin/g++'}
@@ -296,75 +384,6 @@
def _get_experimental_builders():
return [
-
-# {'name' : "clang-i386-darwin10-selfhost-rel",
-# 'slavenames' : ["dunbar-darwin10"],
-# 'builddir' : "clang-i386-darwin10-selfhost-rel",
-# 'factory' : ClangBuilder.getClangBuildFactory(triple='i386-apple-darwin10',
-# useTwoStage=True,
-# stage1_config='Release+Asserts',
-# stage2_config='Release+Asserts'),
-# 'category' : 'clang.exp' },
-# {'name' : "clang-x86_64-darwin10-selfhost-rel",
-# 'slavenames' : ["dunbar-darwin10"],
-# 'builddir' : "clang-x86_64-darwin10-selfhost-rel",
-# 'factory' : ClangBuilder.getClangBuildFactory(triple='x86_64-apple-darwin10',
-# useTwoStage=True,
-# stage1_config='Release+Asserts',
-# stage2_config='Release+Asserts'),
-# 'category' : 'clang.exp' },
-
- {'name': "clang-native-arm-cortex-a9",
- 'slavenames':["kistanova6"],
- 'builddir':"clang-native-arm-cortex-a9",
- 'factory' : ClangBuilder.getClangBuildFactory(
- extra_configure_args=['--build=armv7l-unknown-linux-gnueabi',
- '--host=armv7l-unknown-linux-gnueabi',
- '--target=armv7l-unknown-linux-gnueabi',
- '--with-cpu=cortex-a9',
- '--with-fpu=neon', '--with-abi=aapcs',
- '--with-float=hard',
- '--enable-targets=arm,cbe',
- '--enable-optimized']),
- 'category' : 'clang'},
-
- {'name': "clang-X86_64-freebsd",
- 'slavenames':["kistanova7"],
- 'builddir':"clang-X86_64-freebsd",
- 'factory': NightlytestBuilder.getFastNightlyTestBuildFactory(triple='x86_64-unknown-freebsd8.2',
- stage1_config='Release+Asserts',
- test=True),
- 'category' : 'clang'},
-
- {'name': "clang-native-mingw32-win7",
- 'slavenames':["kistanova8"],
- 'builddir':"clang-native-mingw32-win7",
- 'factory' : ClangBuilder.getClangBuildFactory(triple='i686-pc-mingw32',
- useTwoStage=True, test=True,
- stage1_config='Release+Asserts',
- stage2_config='Release+Asserts'),
- 'category' : 'clang'},
-
- # Clang cross builders.
- {'name': "clang-x86_64-darwin10-self-mingw32",
- 'slavenames':["kistanova1"],
- 'builddir':"clang-x86_64-darwin10-self-mingw32",
- 'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4, test=False,
- extra_configure_args=['--build=x86_64-apple-darwin10',
- '--host=i686-pc-mingw32',
- '--target=i686-pc-mingw32']),
- 'category' : 'clang'},
-
- {'name' : "clang-x86_64-darwin10-cross-mingw32",
- 'slavenames' :["kistanova1"],
- 'builddir' :"clang-x86_64-darwin10-cross-mingw32",
- 'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4, use_pty_in_tests=True,
- run_cxx_tests=True,
- extra_configure_args=['--build=x86_64-apple-darwin10',
- '--host=x86_64-apple-darwin10',
- '--target=i686-pc-mingw32']),
- 'category' : 'clang'},
-
# Llvm-gcc cross builders.
{'name' : "build-self-4-mingw32",
'slavenames': [ "kistanova1" ],
@@ -425,7 +444,7 @@
{'name' : 'install_llvmgcc_2',
'description' : 'install llvm-gcc (stage2)',
'haltOnFailure' : True },]),
- 'category' : 'llvm-gcc' },
+ 'category' : 'llvm-gcc' },
{'name' : "llvm-gcc-x86_64-darwin10-cross-i686-linux",
'slavenames': [ "kistanova1" ],
@@ -541,7 +560,6 @@
{'name' : 'install_llvmgcc_3',
'description' : 'install llvm-gcc (stage 3)',
'haltOnFailure' : True },]),
-
'category' : 'llvm-gcc' },
{'name' : "llvm-gcc-native-mingw32",
@@ -716,49 +734,6 @@
'haltOnFailure' : True },]),
'category' : 'llvm-gcc' },
-# {'name' : "llvm-gcc-mingw32-cross-arm-linux-gnueabi-hard-float",
-# 'slavenames': [ "kistanova5" ],
-# 'builddir' : "llvm-gcc-mingw32-cross-arm-linux-gnueabi-hard-float",
-# 'factory' : ScriptedBuilder.getScriptedBuildFactory(
-# source_code = [SVN(name='svn-llvm',
-# mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm/',
-# defaultBranch='trunk',
-# workdir="llvm.src"),
-# SVN(name='svn-llvm-gcc',
-# mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm-gcc-4.2/',
-# defaultBranch='trunk',
-# workdir="llvm-gcc.src"),],
-# launcher = 'llvm-gcc.src/extras/buildbot-launcher',
-# build_script = 'llvm-gcc.src/extras/llvm-gcc-mingw32-cross-arm-linux-gnueabi-hard-float',
-# extra_args = [],
-# build_steps = [{'name' : 'clean',
-# 'description' : 'clean',
-# 'haltOnFailure' : True },
-# {'name' : 'copy_cross_tools',
-# 'description' : 'copy cross-tools',
-# 'haltOnFailure' : True },
-# {'name' : 'configure_llvm',
-# 'description' : 'configure llvm',
-# 'haltOnFailure' : True },
-# {'name' : 'make_llvm',
-# 'description' : 'make llvm',
-# 'haltOnFailure' : True },
-# {'name' : 'configure_llvmgcc',
-# 'description' : 'configure llvm-gcc',
-# 'haltOnFailure' : True },
-# {'name' : 'make_llvmgcc',
-# 'description' : 'make llvm-gcc',
-# 'haltOnFailure' : True },
-# {'name' : 'install_llvmgcc',
-# 'description' : 'install llvm-gcc',
-# 'haltOnFailure' : True },]),
-# 'category' : 'llvm-gcc' },
-# {'name' : "clang-i686-xp-msvc9_alt",
-# 'slavenames' :['adobe1'],
-# 'builddir' :"clang-i686-xp-msvc9_alt",
-# 'factory' : ClangBuilder.getClangMSVCBuildFactory(jobs=2),
-# 'category' : 'clang.exp' },
-
{'name': "clang-i686-freebsd-selfhost-rel",
'slavenames':["freebsd1"],
'builddir':"clang-i686-freebsd-selfhost-rel",
@@ -799,10 +774,71 @@
yield b
# Random other unused builders...
-
{'name': "clang-x86_64-openbsd",
'slavenames':["ocean1"],
'builddir':"clang-x86_64-openbsd",
'factory': ClangBuilder.getClangBuildFactory(),
- 'category':'clang.exp'}
-
+ 'category':'clang.exp'},
+{'name': "clang-x86_64-linux-checks",
+ 'slavenames':["osu2"],
+ 'builddir':"clang-x86_64-linux-checks",
+ 'factory': ClangBuilder.getClangBuildFactory(stage1_config='Debug+Asserts+Checks'),
+ 'category':'clang.exp'},
+{'name' : "clang-i386-darwin10-selfhost-rel",
+ 'slavenames' : ["dunbar-darwin10"],
+ 'builddir' : "clang-i386-darwin10-selfhost-rel",
+ 'factory' : ClangBuilder.getClangBuildFactory(triple='i386-apple-darwin10',
+ useTwoStage=True,
+ stage1_config='Release+Asserts',
+ stage2_config='Release+Asserts'),
+ 'category' : 'clang.exp' },
+{'name' : "clang-x86_64-darwin10-selfhost-rel",
+ 'slavenames' : ["dunbar-darwin10"],
+ 'builddir' : "clang-x86_64-darwin10-selfhost-rel",
+ 'factory' : ClangBuilder.getClangBuildFactory(triple='x86_64-apple-darwin10',
+ useTwoStage=True,
+ stage1_config='Release+Asserts',
+ stage2_config='Release+Asserts'),
+ 'category' : 'clang.exp' },
+{'name' : "llvm-gcc-mingw32-cross-arm-linux-gnueabi-hard-float",
+ 'slavenames': [ "kistanova5" ],
+ 'builddir' : "llvm-gcc-mingw32-cross-arm-linux-gnueabi-hard-float",
+ 'factory' : ScriptedBuilder.getScriptedBuildFactory(
+ source_code = [SVN(name='svn-llvm',
+ mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm/',
+ defaultBranch='trunk',
+ workdir="llvm.src"),
+ SVN(name='svn-llvm-gcc',
+ mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm-gcc-4.2/',
+ defaultBranch='trunk',
+ workdir="llvm-gcc.src"),],
+ launcher = 'llvm-gcc.src/extras/buildbot-launcher',
+ build_script = 'llvm-gcc.src/extras/llvm-gcc-mingw32-cross-arm-linux-gnueabi-hard-float',
+ extra_args = [],
+ build_steps = [{'name' : 'clean',
+ 'description' : 'clean',
+ 'haltOnFailure' : True },
+ {'name' : 'copy_cross_tools',
+ 'description' : 'copy cross-tools',
+ 'haltOnFailure' : True },
+ {'name' : 'configure_llvm',
+ 'description' : 'configure llvm',
+ 'haltOnFailure' : True },
+ {'name' : 'make_llvm',
+ 'description' : 'make llvm',
+ 'haltOnFailure' : True },
+ {'name' : 'configure_llvmgcc',
+ 'description' : 'configure llvm-gcc',
+ 'haltOnFailure' : True },
+ {'name' : 'make_llvmgcc',
+ 'description' : 'make llvm-gcc',
+ 'haltOnFailure' : True },
+ {'name' : 'install_llvmgcc',
+ 'description' : 'install llvm-gcc',
+ 'haltOnFailure' : True },]),
+ 'category' : 'llvm-gcc' },
+#{'name' : "clang-i686-xp-msvc9_alt",
+# 'slavenames' :['adobe1'],
+# 'builddir' :"clang-i686-xp-msvc9_alt",
+# 'factory' : ClangBuilder.getClangMSVCBuildFactory(jobs=2),
+# 'category' : 'clang.exp' },
Modified: zorg/trunk/buildbot/osuosl/master/config/slaves.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/slaves.py?rev=143081&r1=143080&r2=143081&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Wed Oct 26 18:55:10 2011
@@ -13,27 +13,6 @@
# FreeBSD zero.sajd.net 9.0-CURRENT i386
create_slave("freebsd1", properties={'jobs' : 1}, max_builds=1),
- # PowerPC Linux machine. 900MHz G3 processor with 256MB of RAM.
- create_slave("nick1", properties={'jobs' : 1}, max_builds=1),
-
- # Linux, Beagleboard, Cortex A8, 256MB RAM.
- create_slave("nick2", properties={'jobs' : 1}, max_builds=1),
-
- # Linux, NVidia Tegra 250, Dual-core Cortex A9, 1GB RAM
- create_slave("nick3", properties={'jobs' : 2}, max_builds=1),
-
- # Core 2 Duo running Ubuntu.
- create_slave("dunbar1", properties={'jobs' : 2}, max_builds=1),
-
- # Athlon 1.2 XP SP 3.
- create_slave("dunbar-win32", properties={'jobs' : 1}, max_builds=1),
-
- # Dual Quad Core Mc Pro (Nehalem) running SnowLeopard.
- create_slave("dunbar-darwin10", properties={'jobs' : 4}, max_builds=2),
-
- # Dual Core Pentium M, XP SP 3.
- create_slave("dunbar-win32-2", properties={'jobs' : 2}, max_builds=1),
-
# CPU Marvell Kirkwood 88F6281 ARM Based armv5tejl running at 1.2Ghz
# Memory 512MB SDRAM
# Power 2.3w idle no attached devices, 7.0w running at 100% CPU utilization
@@ -65,13 +44,6 @@
# Windows 7 Ultimate
create_slave("kistanova8", properties={'jobs' : 1}, max_builds=1),
- # Quad Core x86_64, Solaris / AurorAUX
- create_slave("evocallaghan", properties={'jobs' : 4}, max_builds=1),
-
- # Adobe Contributed VM
- # Win XP SP2, Intel Core2 Duo 2.99GHz -E6850, 2.93 GB
- create_slave("adobe1", properties={'jobs' : 2}, max_builds=1),
-
# GCC Compile Farm Slaves, see http://gcc.gnu.org/wiki/CompileFarm
# gcc10 2TB 2x12x1.5 GHz AMD Opteron Magny-Cours / 64 GB RAM / Supermicro AS-1022G-BTF / Debian x86-64
@@ -160,9 +132,6 @@
# Debian, P4 2.8GHz, 1GB mem
create_slave("balint1", properties={'jobs' : 1}, max_builds=1),
- # Pentium Dual CPU T3400 @ 2.1GHz
- create_slave("dumitrescu1", properties={'jobs' : 2}, max_builds=1),
-
# AMD Athlon(tm) 64 X2 Dual Core 3800+, Ubuntu x86_64
create_slave("grosser1", properties={'jobs': 2}, max_builds=1),
@@ -173,6 +142,32 @@
create_slave("arxan_bellini", properties={'jobs': 2}, max_builds=1),
# Defunct.
+ # Pentium Dual CPU T3400 @ 2.1GHz
+ #create_slave("dumitrescu1", properties={'jobs' : 2}, max_builds=1),
+ # Quad Core x86_64, Solaris / AurorAUX
+ #create_slave("evocallaghan", properties={'jobs' : 4}, max_builds=1),
+ # Adobe Contributed VM
+ # Win XP SP2, Intel Core2 Duo 2.99GHz -E6850, 2.93 GB
+ #create_slave("adobe1", properties={'jobs' : 2}, max_builds=1),
+ # PowerPC Linux machine. 900MHz G3 processor with 256MB of RAM.
+ #create_slave("nick1", properties={'jobs' : 1}, max_builds=1),
+ # Linux, Beagleboard, Cortex A8, 256MB RAM.
+ #create_slave("nick2", properties={'jobs' : 1}, max_builds=1),
+ # Linux, NVidia Tegra 250, Dual-core Cortex A9, 1GB RAM
+ #create_slave("nick3", properties={'jobs' : 2}, max_builds=1),
+ # Core 2 Duo running Ubuntu.
+ #create_slave("dunbar1", properties={'jobs' : 2}, max_builds=1),
+ # Athlon 1.2 XP SP 3.
+ #create_slave("dunbar-win32", properties={'jobs' : 1}, max_builds=1),
+ # Dual Quad Core Mc Pro (Nehalem) running SnowLeopard.
+ #create_slave("dunbar-darwin10", properties={'jobs' : 4}, max_builds=2),
+ # Dual Core Pentium M, XP SP 3.
+ #create_slave("dunbar-win32-2", properties={'jobs' : 2}, max_builds=1),
+ #create_slave("osu1", properties={'jobs' : 4}, max_builds=1),
+ #create_slave("osu2", properties={'jobs' : 4}, max_builds=2),
+ # Debian x86_64, 2 x 6-core Opteron 2.6 GHz
+ #create_slave("osu7", properties={'jobs' : 6}, max_builds=4),
+ #create_slave("osu8", properties={'jobs' : 6}, max_builds=4),
#create_slave("andrew1"),
#create_slave("danmbp1"),
]
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=143081&r1=143080&r2=143081&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/status.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/status.py Wed Oct 26 18:55:10 2011
@@ -33,20 +33,20 @@
return [
buildbot.status.html.WebStatus(
http_port = 8011, authz=authz_cfg),
-# buildbot.status.mail.MailNotifier(
-# fromaddr = "buildbot at lab.llvm.org",
-# extraRecipients = [default_email],
-# lookup = ConfigEmailLookup(os.path.join(os.path.dirname(__file__),
-# "llvmauthors.cfg"),
-# default_email),
-# mode = "problem",
-# builders = standard_builders),
+ buildbot.status.mail.MailNotifier(
+ fromaddr = "llvm.buildmaster at lab.llvm.org",
+ extraRecipients = [default_email],
+ lookup = ConfigEmailLookup(os.path.join(os.path.dirname(__file__),
+ "llvmauthors.cfg"),
+ default_email),
+ mode = "problem",
+ builders = standard_builders),
buildbot.status.words.IRC(
host = "irc.oftc.net", nick = "llvmbb", channels = ["#llvm"],
allowForce = True,
notify_events = ['successToFailure', 'failureToSuccess']),
InformativeMailNotifier(
- fromaddr = "buildbot at lab.llvm.org",
+ fromaddr = "llvm.buildmaster at lab.llvm.org",
sendToInterestedUsers= False,
extraRecipients = ["baldrick at free.fr", "gkistanova at gmail.com"],
subject="Build %(builder)s Failure",
@@ -55,7 +55,7 @@
addLogs=False,
num_lines = 15),
InformativeMailNotifier(
- fromaddr = "buildbot at lab.llvm.org",
+ fromaddr = "llvm.buildmaster at lab.llvm.org",
sendToInterestedUsers= False,
extraRecipients = ["tobias at grosser.es"],
subject="Build %(builder)s Failure",
More information about the llvm-commits
mailing list