[llvm-commits] [zorg] r151598 - in /zorg/trunk: buildbot/osuosl/master/config/builders.py buildbot/osuosl/master/config/slaves.py zorg/buildbot/changes/llvmpoller.py
Galina Kistanova
gkistanova at gmail.com
Mon Feb 27 16:21:16 PST 2012
Author: gkistanova
Date: Mon Feb 27 18:21:16 2012
New Revision: 151598
URL: http://llvm.org/viewvc/llvm-project?rev=151598&view=rev
Log:
Remove few obsolete gcc slaves and builders;
Add list of categories to project-category dependecies.
Modified:
zorg/trunk/buildbot/osuosl/master/config/builders.py
zorg/trunk/buildbot/osuosl/master/config/slaves.py
zorg/trunk/zorg/buildbot/changes/llvmpoller.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=151598&r1=151597&r2=151598&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Feb 27 18:21:16 2012
@@ -467,43 +467,7 @@
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",
@@ -517,353 +481,3 @@
stage1_config='Release+Asserts',
stage2_config='Release+Asserts'),
'category' : 'clang.exp' },
-
-# Llvm-gcc cross builders.
-{'name' : "build-self-4-mingw32",
- 'slavenames': [ "kistanova1" ],
- 'builddir' : "build-self-4-mingw32",
- '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/build-self-4-mingw32',
- extra_args = [],
- build_steps = [{'name' : 'clean',
- 'description' : 'clean',
- 'haltOnFailure' : True },
- {'name' : 'copy_cross_tools',
- 'description' : 'copy cross-tools',
- 'haltOnFailure' : True },
- {'name' : 'configure_llvm_1',
- 'description' : 'configure llvm (stage1)',
- 'haltOnFailure' : True },
- {'name' : 'make_llvm_1',
- 'description' : 'compile llvm (stage1)',
- 'extra_args' : ['-j8'], # Extra step-specific properties
- 'haltOnFailure' : True },
- {'name' : 'test_llvm_1',
- 'type' : ClangTestCommand,
- 'description' : 'test llvm (stage1)',
- 'haltOnFailure' : False },
- {'name' : 'configure_llvmgcc_1',
- 'description' : 'configure llvm-gcc (stage1)',
- 'haltOnFailure' : True },
- {'name' : 'make_llvmgcc_1',
- 'description' : 'compile llvm-gcc (stage1)',
- 'extra_args' : ['-j8'],
- 'haltOnFailure' : True },
- {'name' : 'install_llvmgcc_1',
- 'description' : 'install llvm-gcc (stage1)',
- 'haltOnFailure' : True },
- {'name' : 'configure_llvm_2',
- 'description' : 'configure llvm (stage2)',
- 'haltOnFailure' : True },
- {'name' : 'make_llvm_2',
- 'description' : 'compile llvm (stage2)',
- 'extra_args' : ['-j8'], # Extra step-specific properties
- 'haltOnFailure' : True },
- {'name' : 'configure_llvmgcc_2',
- 'description' : 'configure llvm-gcc (stage2)',
- 'haltOnFailure' : True },
- {'name' : 'make_llvmgcc_2',
- 'description' : 'compile llvm-gcc (stage2)',
- 'extra_args' : ['-j8'],
- 'haltOnFailure' : True },
- {'name' : 'install_llvmgcc_2',
- 'description' : 'install llvm-gcc (stage2)',
- 'haltOnFailure' : True },]),
- 'category' : 'llvm-gcc' },
-
-{'name' : "llvm-gcc-x86_64-darwin10-cross-i686-linux",
- 'slavenames': [ "kistanova1" ],
- 'builddir' : "llvm-gcc-x86_64-darwin10-cross-i686-linux",
- '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/build-x-4-linux',
- 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',
- 'extra_args' : ['-j8'], # Extra step-specific properties
- 'haltOnFailure' : True },
- {'name' : 'configure_llvmgcc',
- 'description' : 'configure llvm-gcc',
- 'haltOnFailure' : True },
- {'name' : 'make_llvmgcc',
- 'description' : 'make llvm-gcc',
- 'extra_args' : ['-j8'],
- 'haltOnFailure' : True },
- {'name' : 'install_llvmgcc',
- 'description' : 'install llvm-gcc',
- 'haltOnFailure' : True },]),
- 'category' : 'llvm-gcc' },
-
-{'name' : "llvm-gcc-build-x86_64-darwin10-x-mingw32-x-armeabi",
- 'slavenames': [ "kistanova1" ],
- 'builddir' : "llvm-gcc-build-x86_64-darwin10-x-mingw32-x-armeabi",
- '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/build-darwin-x-mingw32-x-armeabi',
- extra_args = [],
- build_steps = [{'name' : 'clean',
- 'description' : 'clean',
- 'haltOnFailure' : True },
- {'name' : 'copy_cross_tools',
- 'description' : 'copy cross_tools',
- 'haltOnFailure' : True },
- {'name' : 'configure_llvm_1',
- 'description' : 'configure llvm (stage 1)',
- 'haltOnFailure' : True },
- {'name' : 'make_llvm_1',
- 'description' : 'make llvm (stage 1)',
- 'extra_args' : ['-j8'], # Extra step-specific properties
- 'haltOnFailure' : True },
- {'name' : 'test_llvm_1',
- 'description' : 'test llvm (stage 1)',
- 'haltOnFailure' : False },
- {'name' : 'configure_llvmgcc_1',
- 'description' : 'configure llvm-gcc (stage 1)',
- 'haltOnFailure' : True },
- {'name' : 'make_llvmgcc_1',
- 'description' : 'make llvm-gcc (stage 1)', # Note: one thread only here
- 'haltOnFailure' : True },
- {'name' : 'install_llvmgcc_1',
- 'description' : 'install llvm-gcc (stage 1)',
- 'haltOnFailure' : True },
- {'name' : 'configure_llvm_2',
- 'description' : 'configure llvm (stage 2)',
- 'haltOnFailure' : True },
- {'name' : 'make_llvm_2',
- 'description' : 'make llvm (stage 2)',
- 'extra_args' : ['-j8'],
- 'haltOnFailure' : True },
- {'name' : 'configure_llvmgcc_2',
- 'description' : 'configure llvm-gcc (stage 2)',
- 'haltOnFailure' : True },
- {'name' : 'make_llvmgcc_2',
- 'description' : 'make llvm-gcc (stage 2)',
- 'extra_args' : ['-j8'],
- 'haltOnFailure' : True },
- {'name' : 'install_llvmgcc_2',
- 'description' : 'install llvm-gcc (stage 2)',
- 'haltOnFailure' : True },
- {'name' : 'configure_llvm_3',
- 'description' : 'configure llvm (stage 3)',
- 'haltOnFailure' : True },
- {'name' : 'make_llvm_3',
- 'description' : 'make llvm (stage 3)',
- 'extra_args' : ['-j8'],
- 'haltOnFailure' : True },
- {'name' : 'configure_llvmgcc_3',
- 'description' : 'configure llvm-gcc (stage 3)',
- 'haltOnFailure' : True },
- {'name' : 'make_llvmgcc_3',
- 'description' : 'make llvm-gcc (stage 3)',
- 'extra_args' : ['-j8'],
- 'haltOnFailure' : True },
- {'name' : 'install_llvmgcc_3',
- 'description' : 'install llvm-gcc (stage 3)',
- 'haltOnFailure' : True },]),
- 'category' : 'llvm-gcc' },
-
-{'name' : "llvm-gcc-native-mingw32",
- 'slavenames': [ "kistanova2" ],
- 'builddir' : "llvm-gcc-native-mingw32",
- '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/build-native-mingw32',
- extra_args = [],
- build_steps = [{'name' : 'clean',
- 'description' : 'clean',
- 'haltOnFailure' : True },
- {'name' : 'copy_tools',
- 'description' : 'copy tools',
- 'haltOnFailure' : True },
- {'name' : 'configure_llvm',
- 'description' : 'configure llvm',
- 'haltOnFailure' : True },
- {'name' : 'make_llvm',
- 'description' : 'make llvm',
- 'haltOnFailure' : True },
- {'name' : 'test_llvm',
- 'type' : ClangTestCommand,
- 'description' : 'test llvm',
- 'haltOnFailure' : False },
- {'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' : "llvm-gcc-native-mingw32-win7",
- 'slavenames': [ "kistanova3" ],
- 'builddir' : "llvm-gcc-native-mingw32-win7",
- '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/build-native-mingw32',
- extra_args = [],
- build_steps = [{'name' : 'clean',
- 'description' : 'clean',
- 'haltOnFailure' : True },
- {'name' : 'copy_tools',
- 'description' : 'copy tools',
- 'haltOnFailure' : True },
- {'name' : 'configure_llvm',
- 'description' : 'configure llvm',
- 'haltOnFailure' : True },
- {'name' : 'make_llvm',
- 'description' : 'make llvm',
- 'haltOnFailure' : True },
- {'name' : 'test_llvm',
- 'type' : ClangTestCommand,
- 'description' : 'test llvm',
- 'haltOnFailure' : False },
- {'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' : "llvm-gcc-i686-pc-linux-gnu-cross-arm-eabi-hard-float",
- 'slavenames': [ "kistanova4" ],
- 'builddir' : "llvm-gcc-i686-pc-linux-gnu-cross-arm-eabi-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/build-x-4-armeabi-hardfloat',
- 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',
- 'extra_args' : ['-j4'],
- 'haltOnFailure' : True },
- {'name' : 'install_llvm',
- 'description' : 'install llvm',
- 'extra_args' : ['-j4'],
- 'haltOnFailure' : False },
- {'name' : 'configure_llvmgcc',
- 'description' : 'configure llvm-gcc',
- 'haltOnFailure' : True },
- {'name' : 'make_llvmgcc',
- 'description' : 'make llvm-gcc',
- 'extra_args' : ['-j4'],
- 'haltOnFailure' : True },
- {'name' : 'install_llvmgcc',
- 'description' : 'install llvm-gcc',
- 'haltOnFailure' : True },]),
- 'category' : 'llvm-gcc' },
-
-{'name' : "llvm-gcc-i686-pc-linux-gnu-cross-arm-eabi-soft-float",
- 'slavenames': [ "kistanova4" ],
- 'builddir' : "llvm-gcc-i686-pc-linux-gnu-cross-arm-eabi-soft-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/build-x-4-armeabi-softfloat',
- 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',
- 'extra_args' : ['-j4'],
- 'haltOnFailure' : True },
- {'name' : 'install_llvm',
- 'description' : 'install llvm',
- 'extra_args' : ['-j4'],
- 'haltOnFailure' : False },
- {'name' : 'configure_llvmgcc',
- 'description' : 'configure llvm-gcc',
- 'haltOnFailure' : True },
- {'name' : 'make_llvmgcc',
- 'description' : 'make llvm-gcc',
- 'extra_args' : ['-j4'],
- 'haltOnFailure' : True },
- {'name' : 'install_llvmgcc',
- 'description' : 'install llvm-gcc',
- 'haltOnFailure' : True },]),
- 'category' : 'llvm-gcc' },
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=151598&r1=151597&r2=151598&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Mon Feb 27 18:21:16 2012
@@ -20,18 +20,6 @@
# Quad Core Mac Pro running Lion.
create_slave("as-bldslv11", properties={'jobs' : 1}, max_builds=4),
- # Win XP SP3.
- create_slave("kistanova2", properties={'jobs' : 1}, max_builds=1),
-
- # Windows 7 Ultimate.
- create_slave("kistanova3", properties={'jobs' : 1}, max_builds=1),
-
- # CentOS 5.4.
- create_slave("kistanova4", properties={'jobs' : 1}, max_builds=2),
-
- # Win XP SP3.
- create_slave("kistanova5", properties={'jobs' : 1}, max_builds=1),
-
# Ubuntu pandaboard cortex-a9
create_slave("kistanova6", properties={'jobs' : 2}, max_builds=1),
Modified: zorg/trunk/zorg/buildbot/changes/llvmpoller.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/changes/llvmpoller.py?rev=151598&r1=151597&r2=151598&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/changes/llvmpoller.py (original)
+++ zorg/trunk/zorg/buildbot/changes/llvmpoller.py Mon Feb 27 18:21:16 2012
@@ -229,7 +229,8 @@
changes = []
categories = {
- 'llvm' : 'llvm',
+ # Project: Category:
+ 'llvm' : ['clang','dragonegg','llvm','llvm-gcc','polly'],
'cfe' : 'clang',
'polly' : 'polly',
'llvm-gcc-4.2' : 'llvm-gcc',
More information about the llvm-commits
mailing list