[zorg] r191849 - Removed long time off-line builders from waterfall.

Galina Kistanova gkistanova at gmail.com
Wed Oct 2 12:58:22 PDT 2013


Author: gkistanova
Date: Wed Oct  2 14:58:22 2013
New Revision: 191849

URL: http://llvm.org/viewvc/llvm-project?rev=191849&view=rev
Log:
Removed long time off-line builders from waterfall.
Some code cleaning in builders.py.

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=191849&r1=191848&r2=191849&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed Oct  2 14:58:22 2013
@@ -237,21 +237,6 @@ def _get_clang_builders():
                                            '--with-float=hard',
                                            '--enable-targets=arm'])},
 
-#        {'name': "clang-native-arm-cortex-a15",
-#         'slavenames':["linaro-chrome-01"],
-#         'builddir':"clang-native-arm-cortex-a15",
-#         'factory' : ClangBuilder.getClangBuildFactory(
-#                     stage1_config='Release+Asserts',
-#                     clean=False,
-#                     env = { 'CXXFLAGS' : '-Wno-psabi', 'CFLAGS' : '-Wno-psabi'},
-#                     extra_configure_args=['--build=armv7l-unknown-linux-gnueabihf',
-#                                           '--host=armv7l-unknown-linux-gnueabihf',
-#                                           '--target=armv7l-unknown-linux-gnueabihf',
-#                                           '--with-cpu=cortex-a15',
-#                                           '--with-fpu=neon',
-#                                           '--with-float=hard',
-#                                           '--enable-targets=arm'])},
-
         {'name' : "clang-native-arm-lnt",
          'slavenames':["linaro-chrome-01"],
          'builddir':"clang-native-arm-lnt",
@@ -350,15 +335,6 @@ def _get_clang_builders():
                                                                              '--target=arm-eabi',
                                                                              '--enable-targets=arm'])},
 
-#        {'name' : "clang-x86_64-darwin11-cross-linux-gnu",
-#         'slavenames' :["as-bldslv11"],
-#         'builddir' :"clang-x86_64-darwin11-cross-linux-gnu",
-#         'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4,  use_pty_in_tests=True,
-#                                                       run_cxx_tests=True,
-#                                                       extra_configure_args=['--build=x86_64-apple-darwin11',
-#                                                                             '--host=x86_64-apple-darwin11',
-#                                                                             '--target=i686-pc-linux-gnu '])},
-
         {'name' : "clang-x86_64-darwin12-nt-O3",
          'slavenames' :["lab-mini-01"],
          'builddir' :"clang-x86_64-darwin12-nt-O3",
@@ -384,6 +360,20 @@ def _get_clang_builders():
         ]
 
 # Offline.
+{'name': "clang-native-arm-cortex-a15",
+ 'slavenames':["linaro-chrome-01"],
+ 'builddir':"clang-native-arm-cortex-a15",
+ 'factory' : ClangBuilder.getClangBuildFactory(
+             stage1_config='Release+Asserts',
+             clean=False,
+             env = { 'CXXFLAGS' : '-Wno-psabi', 'CFLAGS' : '-Wno-psabi'},
+             extra_configure_args=['--build=armv7l-unknown-linux-gnueabihf',
+                                   '--host=armv7l-unknown-linux-gnueabihf',
+                                   '--target=armv7l-unknown-linux-gnueabihf',
+                                   '--with-cpu=cortex-a15',
+                                   '--with-fpu=neon',
+                                   '--with-float=hard',
+                                   '--enable-targets=arm'])},
 {'name': "clang-i386-auroraux",
  'slavenames':["evocallaghan"],
  'builddir':"clang-i386-auroraux",
@@ -406,10 +396,10 @@ def _get_clang_builders():
  '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-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",
@@ -428,6 +418,14 @@ def _get_clang_builders():
                                                                stage1_config='Release+Asserts',
                                                                test=False,
                                                                xfails=clang_i386_linux_xfails) },
+{'name' : "clang-x86_64-darwin11-cross-linux-gnu",
+ 'slavenames' :["as-bldslv11"],
+ 'builddir' :"clang-x86_64-darwin11-cross-linux-gnu",
+ 'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4,  use_pty_in_tests=True,
+                                               run_cxx_tests=True,
+                                               extra_configure_args=['--build=x86_64-apple-darwin11',
+                                                                     '--host=x86_64-apple-darwin11',
+                                                                     '--target=i686-pc-linux-gnu '])},
 
 def _get_dragonegg_builders():
     return [
@@ -635,116 +633,24 @@ def _get_sanitizer_builders():
 
 # Experimental and stopped builders
 def _get_experimental_builders():
-
-    LabPackageCache = 'http://10.1.1.2/packages/'
-
     return [
         {'name': "llvm-ppc64-linux2",
          'slavenames':["coho"],
          'builddir':"llvm-ppc64-2",
          'factory': LLVMBuilder.getLLVMBuildFactory("ppc64-linux-gnu", jobs=4, clean=False, timeout=20),
          '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"]),
-         'category' : 'llvm'},
+
         {'name': "clang-atom-d2700-ubuntu",
          'slavenames':["atom-buildbot"],
          'builddir':"clang-atom-d2700-ubuntu",
          'factory' : ClangBuilder.getClangBuildFactory(extra_configure_args=['--enable-shared']),
          'category' : 'clang'},
-        {'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'},
-        ## Cortex-A9 check-all self-host
-        {'name': "clang-native-arm-cortex-a9-self-host",
-         'slavenames':["linaro-panda-02"],
-         'builddir':"clang-native-arm-cortex-a9-self-host",
-         'factory' : ClangBuilder.getClangBuildFactory(
-                     stage1_config='Release+Asserts',
-                     stage2_config='Release+Asserts',
-                     useTwoStage=True,
-                     clean=False,
-                     test=True,
-                     extra_configure_args=[ '--with-cpu=cortex-a9',
-                                            '--with-fpu=neon',
-                                            '--with-float=hard',
-                                            '--enable-targets=arm']),
-         '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"]),
-         'category' : 'clang'},
+
         {'name': "clang-amd64-openbsd",
          'slavenames':["openbsd-buildslave"],
          'builddir':"clang-openbsd",
          'factory' : ClangBuilder.getClangBuildFactory(stage1_config='Release+Asserts'),
          'category' : 'clang'},
-
-        {'name': "clang-native-mingw64-win7",
-         'slavenames':["sschiffli1"],
-         'builddir':"clang-native-mingw64-win7",
-         'factory' : ClangBuilder.getClangMinGWBuildFactory(),
-         'category' : 'clang'},
-
-        {'name' : "clang-x86_64-darwin12-nt-O3-vectorize",
-         'slavenames' :["lab-mini-03"],
-         'builddir' :"clang-x86_64-darwin12-nt-O3-vectorize",
-         'factory' : LNTBuilder.getLNTFactory(triple='x86_64-apple-darwin12',
-                                              nt_flags=['--mllvm=-vectorize', '--multisample=3'], jobs=2,
-                                              use_pty_in_tests=True, testerName='O3-vectorize',
-                                              run_cxx_tests=True, package_cache=LabPackageCache),
-         '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' : "clang-x86_64-darwin12-gdb",
-         'slavenames' :["lab-mini-04"],
-         'builddir' :"clang-x86_64-darwin12-gdb",
-         'factory' : ClangBuilder.getClangBuildFactory(triple='x86_64-apple-darwin12', stage1_config='Release+Asserts', run_gdb=True),
-         'category' : 'clang'},
-
-#        {'name': "llvm-ppc-darwin",
-#         'slavenames':["arxan_bellini"],
-#         'builddir':"llvm-ppc-darwin",
-#         'factory': LLVMBuilder.getLLVMBuildFactory("ppc-darwin", jobs=2, clean=True,
-#                            config_name = 'Release',
-#                            env = { 'CC' : "/usr/bin/gcc-4.2",
-#                                    'CXX': "/usr/bin/g++-4.2" },
-#                            extra_configure_args=['--enable-shared'],
-#                            timeout=600),
-#         'category' : 'llvm'},
         ]
 
 def get_builders():
@@ -810,12 +716,11 @@ def get_builders():
                                                stage1_config='Release+Asserts',
                                                stage2_config='Release+Asserts'),
  'category' : 'clang.exp' },
-
-#{'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-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",
@@ -824,3 +729,90 @@ def get_builders():
                                               stage1_config='Release+Asserts',
                                               stage2_config='Release+Asserts'),
  'category' : 'clang.exp' },
+{'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"]),
+ 'category' : 'llvm'},
+{'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'},
+# Cortex-A9 check-all self-host
+{'name': "clang-native-arm-cortex-a9-self-host",
+ 'slavenames':["linaro-panda-02"],
+ 'builddir':"clang-native-arm-cortex-a9-self-host",
+ 'factory' : ClangBuilder.getClangBuildFactory(
+             stage1_config='Release+Asserts',
+             stage2_config='Release+Asserts',
+             useTwoStage=True,
+             clean=False,
+             test=True,
+             extra_configure_args=[ '--with-cpu=cortex-a9',
+                                    '--with-fpu=neon',
+                                    '--with-float=hard',
+                                    '--enable-targets=arm']),
+ '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"]),
+ 'category' : 'clang'},
+{'name': "clang-native-mingw64-win7",
+ 'slavenames':["sschiffli1"],
+ 'builddir':"clang-native-mingw64-win7",
+ 'factory' : ClangBuilder.getClangMinGWBuildFactory(),
+ 'category' : 'clang'},
+LabPackageCache = 'http://10.1.1.2/packages/'
+{'name' : "clang-x86_64-darwin12-nt-O3-vectorize",
+ 'slavenames' :["lab-mini-03"],
+ 'builddir' :"clang-x86_64-darwin12-nt-O3-vectorize",
+ 'factory' : LNTBuilder.getLNTFactory(triple='x86_64-apple-darwin12',
+                                      nt_flags=['--mllvm=-vectorize', '--multisample=3'], jobs=2,
+                                      use_pty_in_tests=True, testerName='O3-vectorize',
+                                      run_cxx_tests=True, package_cache=LabPackageCache),
+ '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' : "clang-x86_64-darwin12-gdb",
+ 'slavenames' :["lab-mini-04"],
+ 'builddir' :"clang-x86_64-darwin12-gdb",
+ 'factory' : ClangBuilder.getClangBuildFactory(triple='x86_64-apple-darwin12', stage1_config='Release+Asserts', run_gdb=True),
+ 'category' : 'clang'},
+{'name': "llvm-ppc-darwin",
+ 'slavenames':["arxan_bellini"],
+ 'builddir':"llvm-ppc-darwin",
+ 'factory': LLVMBuilder.getLLVMBuildFactory("ppc-darwin", jobs=2, clean=True,
+                    config_name = 'Release',
+                    env = { 'CC' : "/usr/bin/gcc-4.2",
+                            'CXX': "/usr/bin/g++-4.2" },
+                    extra_configure_args=['--enable-shared'],
+                    timeout=600),
+ 'category' : 'llvm'},





More information about the llvm-commits mailing list