[zorg] r174796 - Moved off-line builders to the end of waterfall line.

Galina Kistanova gkistanova at gmail.com
Fri Feb 8 17:57:30 PST 2013


Author: gkistanova
Date: Fri Feb  8 19:57:30 2013
New Revision: 174796

URL: http://llvm.org/viewvc/llvm-project?rev=174796&view=rev
Log:
Moved off-line builders to the end of waterfall line.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.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=174796&r1=174795&r2=174796&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Feb  8 19:57:30 2013
@@ -44,10 +44,17 @@ def _get_llvm_builders():
          'slavenames': ["gcc14"],
          'builddir': "llvm-x86_64",
          'factory': LLVMBuilder.getLLVMBuildFactory(triple="x86_64-pc-linux-gnu")},
-        {'name': "llvm-x86_64-ubuntu",
-         'slavenames':["arxan_davinci"],
-         'builddir':"llvm-x86_64-ubuntu",
-         'factory': LLVMBuilder.getLLVMBuildFactory("x86_64-pc-linux-gnu", jobs=4)},
+        {'name': "llvm-arm-linux",
+         'slavenames':["ranby1"],
+         'builddir':"llvm-arm-linux",
+         'factory': LLVMBuilder.getLLVMBuildFactory("arm-pc-linux-gnu", jobs=1, clean=True,
+                                                    timeout=40)},
+        {'name': "llvm-i686-debian",
+         'slavenames': ["gcc15"],
+         'builddir': "llvm-i686-debian",
+         'factory': LLVMBuilder.getLLVMBuildFactory("i686-pc-linux-gnu",
+                                                    config_name = 'Release+Asserts',
+                                                    env = { 'CC' : "gcc -m32",  'CXX' : "g++ -m32" })},
         {'name': "llvm-ppc64-linux1",
          'slavenames':["chinook"],
          'builddir':"llvm-ppc64",
@@ -68,6 +75,18 @@ def _get_llvm_builders():
          'factory': LLVMBuilder.getLLVMBuildFactory("mips-linux-gnu", timeout=40,
                                                     extra_configure_args=["--with-extra-options=-mips32r2",
                                                                           "--with-extra-ld-options=-mips32r2"])},
+        {'name': "llvm-x86_64-debian-debug-werror",
+         'slavenames':["obbligato-ellington"],
+         'builddir':"llvm-x86-64-debian-debug-werror",
+         'factory': LLVMBuilder.getLLVMBuildFactory("x86_64-pc-linux-gnu",
+                                                    config_name='Debug+Asserts',
+                                                    extra_configure_args=["--enable-werror"])},
+        {'name': "llvm-x86_64-debian-release-werror",
+         'slavenames':["obbligato-ellington"],
+         'builddir':"llvm-x86-64-debian-release-werror",
+         'factory': LLVMBuilder.getLLVMBuildFactory("x86_64-pc-linux-gnu",
+                                                    config_name='Release+Asserts',
+                                                    extra_configure_args=["--enable-werror"])},
         ]
 
 # Offline.
@@ -169,11 +188,6 @@ def _get_clang_builders():
          'builddir':"clang-atom-d2700-ubuntu-rel",
          'factory' : ClangBuilder.getClangBuildFactory(stage1_config='Release+Asserts')},
 
-        {'name': "clang-x86_64-ubuntu",
-         'slavenames':["arxan_raphael"],
-         'builddir':"clang-x86_64-ubuntu",
-         'factory' : ClangBuilder.getClangBuildFactory()},
-
         {'name': "clang-native-arm-cortex-a9",
          'slavenames':["as-bldslv1", "as-bldslv2", "as-bldslv3", "linaro-panda-01"],
          'builddir':"clang-native-arm-cortex-a9",
@@ -219,11 +233,6 @@ def _get_clang_builders():
                                                        stage1_config='Release+Asserts',
                                                        stage2_config='Release+Asserts')},
 
-        {'name': "clang-native-mingw64-win7",
-         'slavenames':["sschiffli1"],
-         'builddir':"clang-native-mingw64-win7",
-         'factory' : ClangBuilder.getClangMinGWBuildFactory()},
-
         {'name' : "clang-ppc64-elf-linux",
          'slavenames' :["chinook-clangslave1"],
          'builddir' :"clang-ppc64-1",
@@ -252,6 +261,25 @@ def _get_clang_builders():
                                                stage1_config='Release+Asserts',
                                                stage2_config='Release+Asserts')},
 
+        {'name': "clang-x86_64-debian-debug-werror",
+         'slavenames':["obbligato-ellington"],
+         'builddir':"clang-x86-64-debian-debug-werror",
+         'factory': ClangBuilder.getClangBuildFactory(triple="x86_64-pc-linux-gnu",
+                                                     useTwoStage=True,
+                                                     stage1_config='Debug+Asserts',
+                                                     stage2_config='Debug+Asserts',
+                                                     extra_configure_args=["--enable-werror"])},
+
+         'category' : 'clang'},
+        {'name': "clang-x86_64-debian-release-werror",
+         'slavenames':["obbligato-ellington"],
+         'builddir':"clang-x86-64-debian-release-werror",
+         'factory': ClangBuilder.getClangBuildFactory(triple="x86_64-pc-linux-gnu",
+                                                     useTwoStage=True,
+                                                     stage1_config='Release+Asserts',
+                                                     stage2_config='Release+Asserts',
+                                                     extra_configure_args=["--enable-werror"])},
+
          {'name' : "clang-x86_64-linux-fnt",
           'slavenames' : ['osu8'],
           'builddir' : "clang-x86_64-linux-fnt",
@@ -314,17 +342,6 @@ def _get_clang_builders():
                                               use_pty_in_tests=True, testerName='O3-vectorize',
                                               run_cxx_tests=True, package_cache=LabPackageCache)},
 
-        {'name' : "clang-x86_64-darwin10-nt-O0-g",
-         'slavenames' :["lab-mini-03"],
-         'builddir' :"clang-x86_64-darwin10-nt-O0-g",
-         'factory' : LNTBuilder.getLNTFactory(triple='x86_64-apple-darwin10',
-                                              nt_flags=['--multisample=3', 
-                                                        '--optimize-option',
-                                                        '-O0', '--cflag', '-g'],
-                                              jobs=2,  use_pty_in_tests=True,
-                                              testerName='O0-g', run_cxx_tests=True,
-                                              package_cache=LabPackageCache)},
-
         {'name' : "clang-x86_64-darwin10-gdb",
          'slavenames' :["lab-mini-04"],
          'builddir' :"clang-x86_64-darwin10-gdb",
@@ -405,7 +422,18 @@ def _get_dragonegg_builders():
                                                                       env={ 'CFLAGS' : '-march=native' }),
          'category'   : 'dragonegg'},
 
-        {'name' : "dragonegg-x86_64-linux-gcc-4.6-self-host-checks",
+        {'name' : "dragonegg-x86_64-linux-gcc-4.6-self-host",
+         'slavenames' : ["gcc15"],
+         'builddir'   : "dragonegg-x86_64-linux-gcc-4.6-self-host",
+         'factory'    : DragonEggBuilder.getDragonEggBootstrapFactory(gcc_repository='http://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@194776',
+                                                                      extra_languages=['fortran', 'objc', 'obj-c++'],
+                                                                      extra_gcc_configure_args=['--disable-bootstrap', '--enable-checking',
+                                                                                                '--with-mpc=/opt/cfarm/mpc-0.8/'],
+                                                                      extra_llvm_configure_args=['--enable-optimized', '--enable-assertions'],
+                                                                      env={ 'CFLAGS' : '-march=native' }),
+         'category'   : 'dragonegg'},
+
+         {'name' : "dragonegg-x86_64-linux-gcc-4.6-self-host-checks",
          'slavenames' : ["gcc10"],
          'builddir'   : "dragonegg-x86_64-linux-gcc-4.6-self-host-checks",
          'factory'    : DragonEggBuilder.getDragonEggBootstrapFactory(gcc_repository='http://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@194776',
@@ -540,61 +568,33 @@ def _get_lldb_builders():
 def _get_experimental_builders():
 
     return [
-        {'name': "llvm-arm-linux",
-         'slavenames':["ranby1"],
-         'builddir':"llvm-arm-linux",
-         'factory': LLVMBuilder.getLLVMBuildFactory("arm-pc-linux-gnu", jobs=1, clean=True,
-                                                    timeout=40),
-         'category' : 'llvm'},
-        {'name': "llvm-i686-debian",
-         'slavenames': ["gcc15"],
-         'builddir': "llvm-i686-debian",
-         'factory': LLVMBuilder.getLLVMBuildFactory("i686-pc-linux-gnu",
-                                                    config_name = 'Release+Asserts',
-                                                    env = { 'CC' : "gcc -m32",  'CXX' : "g++ -m32" }),
-         'category' : 'llvm'},
-        {'name': "llvm-x86_64-debian-debug-werror",
-         'slavenames':["obbligato-ellington"],
-         'builddir':"llvm-x86-64-debian-debug-werror",
-         'factory': LLVMBuilder.getLLVMBuildFactory("x86_64-pc-linux-gnu",
-                                                    config_name='Debug+Asserts',
-                                                    extra_configure_args=["--enable-werror"]),
-         'category' : 'llvm'},
-        {'name': "llvm-x86_64-debian-release-werror",
-         'slavenames':["obbligato-ellington"],
-         'builddir':"llvm-x86-64-debian-release-werror",
-         'factory': LLVMBuilder.getLLVMBuildFactory("x86_64-pc-linux-gnu",
-                                                    config_name='Release+Asserts',
-                                                    extra_configure_args=["--enable-werror"]),
+        {'name': "llvm-x86_64-ubuntu",
+         'slavenames':["arxan_davinci"],
+         'builddir':"llvm-x86_64-ubuntu",
+         'factory': LLVMBuilder.getLLVMBuildFactory("x86_64-pc-linux-gnu", jobs=4),
          'category' : 'llvm'},
-        {'name' : "dragonegg-x86_64-linux-gcc-4.6-self-host",
-         'slavenames' : ["gcc15"],
-         'builddir'   : "dragonegg-x86_64-linux-gcc-4.6-self-host",
-         'factory'    : DragonEggBuilder.getDragonEggBootstrapFactory(gcc_repository='http://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@194776',
-                                                                      extra_languages=['fortran', 'objc', 'obj-c++'],
-                                                                      extra_gcc_configure_args=['--disable-bootstrap', '--enable-checking',
-                                                                                                '--with-mpc=/opt/cfarm/mpc-0.8/'],
-                                                                      extra_llvm_configure_args=['--enable-optimized', '--enable-assertions'],
-                                                                      env={ 'CFLAGS' : '-march=native' }),
-         'category'   : 'dragonegg'},
-        {'name': "clang-x86_64-debian-debug-werror",
-         'slavenames':["obbligato-ellington"],
-         'builddir':"clang-x86-64-debian-debug-werror",
-         'factory': ClangBuilder.getClangBuildFactory(triple="x86_64-pc-linux-gnu",
-                                                     useTwoStage=True,
-                                                     stage1_config='Debug+Asserts',
-                                                     stage2_config='Debug+Asserts',
-                                                     extra_configure_args=["--enable-werror"]),
+        {'name': "clang-x86_64-ubuntu",
+         'slavenames':["arxan_raphael"],
+         'builddir':"clang-x86_64-ubuntu",
+         'factory' : ClangBuilder.getClangBuildFactory(),
          'category' : 'clang'},
-        {'name': "clang-x86_64-debian-release-werror",
-         'slavenames':["obbligato-ellington"],
-         'builddir':"clang-x86-64-debian-release-werror",
-         'factory': ClangBuilder.getClangBuildFactory(triple="x86_64-pc-linux-gnu",
-                                                     useTwoStage=True,
-                                                     stage1_config='Release+Asserts',
-                                                     stage2_config='Release+Asserts',
-                                                     extra_configure_args=["--enable-werror"]),
+        {'name': "clang-native-mingw64-win7",
+         'slavenames':["sschiffli1"],
+         'builddir':"clang-native-mingw64-win7",
+         'factory' : ClangBuilder.getClangMinGWBuildFactory(),
+         'category' : 'clang'},
+        {'name' : "clang-x86_64-darwin10-nt-O0-g",
+         'slavenames' :["lab-mini-03"],
+         'builddir' :"clang-x86_64-darwin10-nt-O0-g",
+         'factory' : LNTBuilder.getLNTFactory(triple='x86_64-apple-darwin10',
+                                              nt_flags=['--multisample=3', 
+                                                        '--optimize-option',
+                                                        '-O0', '--cflag', '-g'],
+                                              jobs=2,  use_pty_in_tests=True,
+                                              testerName='O0-g', run_cxx_tests=True,
+                                              package_cache=LabPackageCache),
          'category' : 'clang'},
+         
 #        {'name': "llvm-ppc-darwin",
 #         'slavenames':["arxan_bellini"],
 #         'builddir':"llvm-ppc-darwin",





More information about the llvm-commits mailing list