[zorg] r304071 - [zorg][SystemZ] Upgrade build machine and add builders

[Ulrich Weigand via llvm-commits]

Author: uweigand
Date: Sat May 27 08:26:12 2017
New Revision: 304071

URL: http://llvm.org/viewvc/llvm-project?rev=304071&view=rev
Log:
[zorg][SystemZ] Upgrade build machine and add builders

Differential Revision: https://reviews.llvm.org/D33502

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=304071&r1=304070&r2=304071&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Sat May 27 08:26:12 2017
@@ -419,13 +419,39 @@ def _get_clang_builders():
         {'name': "clang-s390x-linux",
          'slavenames':["systemz-1"],
          'builddir':"clang-s390x-linux",
-         'factory' : ClangBuilder.getClangCMakeBuildFactory(clean=False,
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(jobs=4,
+                                                            clean=False,
                                                             checkout_lld=False,
                                                             useTwoStage=False,
                                                             stage1_config='Release',
                                                             extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"]),
          'category' : 'clang'},
 
+        {'name' : "clang-s390x-linux-multistage",
+         'slavenames':["systemz-1"],
+         'builddir' :"clang-s390x-linux-multistage",
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(jobs=4,
+                                                            clean=False,
+                                                            checkout_lld=False,
+                                                            useTwoStage=True,
+                                                            stage1_config='Release',
+                                                            stage2_config='Release',
+                                                            extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON']),
+         'category' : 'clang'},
+
+        {'name' : "clang-s390x-linux-lnt",
+         'slavenames':["systemz-1"],
+         'builddir' :"clang-s390x-linux-lnt",
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(jobs=4,
+                                                            clean=False,
+                                                            checkout_lld=False,
+                                                            useTwoStage=False,
+                                                            runTestSuite=True,
+                                                            stage1_config='Release',
+                                                            nt_flags=['--threads=4', '--build-threads=4'],
+                                                            extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"]),
+         'category' : 'clang'},
+
         # ABI test-suite with CMake builder
         {'name'          : "clang-x86_64-linux-abi-test",
          'mergeRequests' : False,

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=304071&r1=304070&r2=304071&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Sat May 27 08:26:12 2017
@@ -143,8 +143,8 @@ def get_build_slaves():
         # Debian 7.7 x86_64 GCE instance
         create_slave("modules-slave-2", properties={'jobs': 16}, max_builds=1),
 
-        # zEnterprise 196 (s390x), SLES 12
-        create_slave("systemz-1", properties={'jobs': 4}, max_builds=1),
+        # IBM z13 (s390x), Ubuntu 16.04.2
+        create_slave("systemz-1", properties={'jobs': 4}, max_builds=4),
 
         # Ubuntu 14.04 x86_64, Intel(R) Xeon(R) CPU E5-1650 0 @ 3.20GHz
         create_slave("ericwf-buildslave", properties={'jobs': 4}, max_builds=2),