[zorg] r344865 - Add placeholders for new libc++ docker builders.
Eric Fiselier via llvm-commits
llvm-commits at lists.llvm.org
Sat Oct 20 18:33:03 PDT 2018
Author: ericwf
Date: Sat Oct 20 18:33:03 2018
New Revision: 344865
URL: http://llvm.org/viewvc/llvm-project?rev=344865&view=rev
Log:
Add placeholders for new libc++ docker builders.
I'm working on a patch to build dockerized libc++ buildbots hosted on VM's
hosted on Google Cloud. That will land in the coming days.
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=344865&r1=344864&r2=344865&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Sat Oct 20 18:33:03 2018
@@ -1307,7 +1307,11 @@ def _get_openmp_builders():
]
def _get_libcxx_builders():
- ericwf_slaves = ['ericwf-buildslave2', 'ericwf-buildslave-fast']
+ ericwf_slaves = ['ericwf-buildslave2']
+ docker_slaves = [
+ 'libcxx-cloud1', 'libcxx-cloud2', 'libcxx-cloud3', 'libcxx-cloud4',
+ 'libcxx-cloud5'
+ ]
return [
# gribozavr's builders on gribozavr4
{'name': 'libcxx-libcxxabi-x86_64-linux-debian',
@@ -1350,7 +1354,7 @@ def _get_libcxx_builders():
# EricWF's builders
{'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx03',
- 'slavenames': ericwf_slaves,
+ 'slavenames': ericwf_slaves + docker_slaves,
'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx03',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
env={'PATH': '/usr/local/bin:/usr/bin:/bin',
@@ -1360,7 +1364,7 @@ def _get_libcxx_builders():
'category': 'libcxx'},
{'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx11',
- 'slavenames': ericwf_slaves,
+ 'slavenames': ericwf_slaves + docker_slaves,
'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx11',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
env={'PATH': '/usr/local/bin:/usr/bin:/bin',
@@ -1370,7 +1374,7 @@ def _get_libcxx_builders():
'category': 'libcxx'},
{'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx14',
- 'slavenames': ericwf_slaves,
+ 'slavenames': ericwf_slaves + docker_slaves,
'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx14',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
env={'PATH': '/usr/local/bin:/usr/bin:/bin',
@@ -1380,7 +1384,7 @@ def _get_libcxx_builders():
'category': 'libcxx'},
{'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx17',
- 'slavenames': ericwf_slaves,
+ 'slavenames': ericwf_slaves + docker_slaves,
'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx17',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
env={'PATH': '/usr/local/bin:/usr/bin:/bin',
@@ -1390,7 +1394,7 @@ def _get_libcxx_builders():
'category': 'libcxx'},
{'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx2a',
- 'slavenames': ericwf_slaves,
+ 'slavenames': ericwf_slaves + docker_slaves,
'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx2a',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
env={'PATH': '/usr/local/bin:/usr/bin:/bin',
@@ -1400,7 +1404,7 @@ def _get_libcxx_builders():
'category': 'libcxx'},
{'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-32bit',
- 'slavenames': ericwf_slaves,
+ 'slavenames': ericwf_slaves + docker_slaves,
'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-32bit',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
env={'PATH': '/usr/local/bin:/usr/bin:/bin',
@@ -1411,7 +1415,7 @@ def _get_libcxx_builders():
'category': 'libcxx'},
{'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-asan',
- 'slavenames': ericwf_slaves,
+ 'slavenames': ericwf_slaves + docker_slaves,
'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-asan',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
env={'PATH': '/usr/local/bin:/usr/bin:/bin',
@@ -1420,7 +1424,7 @@ def _get_libcxx_builders():
'category': 'libcxx'},
{'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-ubsan',
- 'slavenames': ericwf_slaves,
+ 'slavenames': ericwf_slaves + docker_slaves,
'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-ubsan',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
env={'PATH': '/usr/local/bin:/usr/bin:/bin',
@@ -1431,7 +1435,7 @@ def _get_libcxx_builders():
# EricWF's builders on ericwf-buildslave2
{'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-msan',
- 'slavenames': ericwf_slaves,
+ 'slavenames': ericwf_slaves + docker_slaves,
'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-msan',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
env={'PATH': '/usr/local/bin:/usr/bin:/bin',
@@ -1440,7 +1444,7 @@ def _get_libcxx_builders():
'category': 'libcxx'},
{'name': 'libcxx-libcxxabi-libunwind-x86_64-linux-ubuntu',
- 'slavenames': ericwf_slaves,
+ 'slavenames': ericwf_slaves + docker_slaves,
'builddir' : 'libcxx-libcxxabi-libunwind-x86_64-linux-ubuntu',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
env={'PATH': '/usr/local/bin:/usr/bin:/bin',
@@ -1449,7 +1453,7 @@ def _get_libcxx_builders():
'category': 'libcxx'},
{'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-tsan',
- 'slavenames': ericwf_slaves,
+ 'slavenames': ericwf_slaves + docker_slaves,
'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-tsan',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
env={'PATH': '/usr/local/bin:/usr/bin:/bin',
@@ -1458,7 +1462,7 @@ def _get_libcxx_builders():
'category': 'libcxx'},
{'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-gcc49-cxx11',
- 'slavenames': ericwf_slaves,
+ 'slavenames': ericwf_slaves + docker_slaves,
'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-gcc49-cxx11',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
env={'PATH': '/usr/local/bin:/usr/bin:/bin',
@@ -1467,7 +1471,7 @@ def _get_libcxx_builders():
'category': 'libcxx'},
{'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-gcc-tot-latest-std',
- 'slavenames': ericwf_slaves,
+ 'slavenames': ericwf_slaves + docker_slaves,
'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-gcc-tot-latest-std',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
env={'PATH': '/usr/local/bin:/usr/bin:/bin',
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=344865&r1=344864&r2=344865&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Sat Oct 20 18:33:03 2018
@@ -189,8 +189,14 @@ def get_build_slaves():
# Ubuntu 14.10 x86_64, Intel(R) Xeon(R) CPU E3-1245 V2 @ 3.40GHz
create_slave('ericwf-buildslave2', properties={'jobs': 4}, max_builds=2),
- # Ubuntu 16.04 x86_64, Intel(R) Xeon(R) CPU E5649 @ 2.53GHz (24 threads)
- create_slave('ericwf-buildslave-fast', properties={'jobs': 24}, max_builds=1),
+
+ # Debian 9, Docker based build. See libcxx/utils/docker.
+ create_slave('libcxx-cloud1', properties={'jobs': 64}, max_builds=1),
+ create_slave('libcxx-cloud2', properties={'jobs': 64}, max_builds=1),
+ create_slave('libcxx-cloud3', properties={'jobs': 64}, max_builds=1),
+ create_slave('libcxx-cloud4', properties={'jobs': 64}, max_builds=1),
+ create_slave('libcxx-cloud5', properties={'jobs': 64}, max_builds=1),
+
# Windows Server 2008 R2, Quad 2.6GHz Intel Xeon(R) 4GB RAM
create_slave("zturner-win2008", properties={'jobs': 4}, max_builds=1),
More information about the llvm-commits
mailing list