[zorg] r257369 - Removed few long time off-line slaves and builders.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Mon Jan 11 13:32:28 2016
New Revision: 257369

URL: http://llvm.org/viewvc/llvm-project?rev=257369&view=rev
Log:
Removed few long time off-line slaves and builders.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/buildbot/osuosl/master/config/slaves.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=257369&r1=257368&r2=257369&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Jan 11 13:32:28 2016
@@ -411,22 +411,6 @@ def _get_clang_builders():
                         extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON',
                                           '-DLLVM_TARGETS_TO_BUILD=X86'])},
         ]
-# Offline
-# Cortex-A9 triple check-all bots with autoconf builder
-{'name': "clang-native-arm-cortex-a9",
- 'slavenames':["as-bldslv1", "as-bldslv2", "as-bldslv3"],
- 'builddir':"clang-native-arm-cortex-a9",
- '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-a9',
-                                     '--with-fpu=neon',
-                                     '--with-float=hard',
-                                     '--enable-targets=arm'])},
 
 # Polly builders.
 def _get_polly_builders():
@@ -879,15 +863,6 @@ def _get_libcxx_builders():
 def _get_on_demand_builders():
     return [
         ]
-# Offline
-{'name': "clang-native-mingw32-win7",
- 'slavenames':["as-bldslv7"],
- 'builddir':"clang-native-mingw32-win7",
- 'category':'clang',
- 'factory' : ClangBuilder.getClangBuildFactory(triple='i686-pc-mingw32',
-                                                       useTwoStage=True, test=False,
-                                                       stage1_config='Release+Asserts',
-                                                       stage2_config='Release+Asserts')},
 
 def _get_experimental_scheduled_builders():
     return [
@@ -1092,8 +1067,31 @@ def get_builders():
  'slavenames': ["dunbar1"],
  'builddir': "llvm-i686",
  'factory': LLVMBuilder.getLLVMBuildFactory("i686-pc-linux-gnu", jobs=2, enable_shared=True)},
- 
+
 # Clang builders
+{'name': "clang-native-mingw32-win7",
+ 'slavenames':["as-bldslv7"],
+ 'builddir':"clang-native-mingw32-win7",
+ 'category':'clang',
+ 'factory' : ClangBuilder.getClangBuildFactory(triple='i686-pc-mingw32',
+                                                       useTwoStage=True, test=False,
+                                                       stage1_config='Release+Asserts',
+                                                       stage2_config='Release+Asserts')},
+# Cortex-A9 triple check-all bots with autoconf builder
+{'name': "clang-native-arm-cortex-a9",
+ 'slavenames':["as-bldslv1", "as-bldslv2", "as-bldslv3"],
+ 'builddir':"clang-native-arm-cortex-a9",
+ '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-a9',
+                                     '--with-fpu=neon',
+                                     '--with-float=hard',
+                                     '--enable-targets=arm'])},
 {'name' : "clang-x64-ninja-win7-debug",
  'slavenames' : ["windows7-buildbot"],
  'builddir' : "clang-x64-ninja-win7-debug",

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=257369&r1=257368&r2=257369&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Mon Jan 11 13:32:28 2016
@@ -10,20 +10,12 @@ def create_slave(name, *args, **kwargs):
 
 def get_build_slaves():
     return [
-        # Ubuntu pandaboard cortex-a9 slaves
-        create_slave("as-bldslv1", properties={'jobs' : 2}, max_builds=1),
-        create_slave("as-bldslv2", properties={'jobs' : 2}, max_builds=1),
-        create_slave("as-bldslv3", properties={'jobs' : 2}, max_builds=1),
-
         # Windows 7 Professional x64
         create_slave("as-bldslv4", properties={'jobs' : 2}, max_builds=1),
 
         # FreeBSD 11.0-CURRENT
         create_slave("as-bldslv5", properties={'jobs' : 24}, max_builds=2),
 
-        # Windows 7 Ultimate
-        create_slave("as-bldslv7", properties={'jobs' : 1}, max_builds=1),
-
         # Linux Ubuntu 14.04 LTS
         create_slave("as-bldslv8"),