Index: buildbot/osuosl/master/config/builders.py =================================================================== --- buildbot/osuosl/master/config/builders.py +++ buildbot/osuosl/master/config/builders.py @@ -357,7 +357,7 @@ useTwoStage=False, runTestSuite=True, testsuite_flags=['--cppflags', '-mcpu=cortex-a57', - '--threads=8', '--build-threads=8'], + '--threads=64', '--build-threads=64'], extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"], )}, @@ -376,7 +376,7 @@ useTwoStage=True, runTestSuite=True, testsuite_flags=['--cppflags', '-mcpu=cortex-a57 -fuse-ld=lld', - '--threads=8', '--build-threads=8'], + '--threads=64', '--build-threads=64'], extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'", "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'", "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64;X86'", @@ -396,7 +396,7 @@ useTwoStage=False, runTestSuite=True, testsuite_flags=['--cppflags', '-O0', - '--threads=8', '--build-threads=8'], + '--threads=64', '--build-threads=64'], extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"], )}, @@ -1129,7 +1129,7 @@ testStage1=False, runTestSuite=True, testsuite_flags=['--cppflags', '-mcpu=cortex-a57', - '--threads=8', '--build-threads=8'], + '--threads=64', '--build-threads=64'], extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'", "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'", "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"], @@ -1437,8 +1437,7 @@ 'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder( cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON', 'CMAKE_C_FLAGS': '-mcpu=cortex-a57', - 'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57', - 'LLVM_PARALLEL_LINK_JOBS': '4'})}, + 'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57'})}, {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions', 'slavenames': ['linaro-apm-03', 'linaro-armv8-01-aarch64-libcxx-noeh'], @@ -1449,8 +1448,7 @@ 'LIBCXX_ENABLE_EXCEPTIONS': 'OFF', 'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF', 'CMAKE_C_FLAGS': '-mcpu=cortex-a57', - 'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57', - 'LLVM_PARALLEL_LINK_JOBS': '4'})}, + 'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57'})}, ] @@ -1557,13 +1555,6 @@ 'builddir':"libcxx-sphinx-docs", 'factory': SphinxDocsBuilder.getSphinxDocsBuildFactory(libcxx_html=True), 'category' : 'libcxx' - }, - { - 'name':"libunwind-sphinx-docs", - 'slavenames':["gribozavr3"], - 'builddir':"libunwind-sphinx-docs", - 'factory': SphinxDocsBuilder.getSphinxDocsBuildFactory(libunwind_html=True), - 'category' : 'libunwind' } ] Index: buildbot/osuosl/master/config/slaves.py =================================================================== --- buildbot/osuosl/master/config/slaves.py +++ buildbot/osuosl/master/config/slaves.py @@ -5,7 +5,7 @@ import config def create_slave(name, *args, **kwargs): - password = config.options.get('Slave Passwords', name) + password = 'LinaroTest' return buildbot.buildslave.BuildSlave(name, password=password, *args, **kwargs) def get_build_slaves(): Index: buildbot/osuosl/master/config/status.py =================================================================== --- buildbot/osuosl/master/config/status.py +++ buildbot/osuosl/master/config/status.py @@ -28,213 +28,7 @@ cancelPendingBuild = True, ) - default_email = config.options.get('Master Options', 'default_email') - return [ buildbot.status.html.WebStatus( http_port = 8011, authz=authz_cfg), - - # All the standard builders send e-mail and IRC notifications. - buildbot.status.mail.MailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - extraRecipients = [default_email], - lookup = ConfigEmailLookup(os.path.join(os.path.dirname(__file__), - "llvmauthors.cfg"), - default_email), - mode = "problem", - builders = standard_builders), - buildbot.status.words.IRC( - host = "irc.oftc.net", nick = "llvmbb", - channels = ["#llvm"], - allowForce = True, - categories = standard_categories, - notify_events = ['successToFailure', 'failureToSuccess']), - # Use different nick's in the different channels to support ignoring - # one bot or the other. - # (Note: /ignore applies to all channels on the network) - buildbot.status.words.IRC( - host = "irc.oftc.net", nick = "llvmbb-llvm-build", - channels = ["#llvm-build"], - allowForce = True, - categories = standard_categories, - notify_events = ['successToFailure', 'failureToSuccess']), - - # In addition to that the following notifiers are defined for special - # cases. - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers= False, - extraRecipients = ["tobias@grosser.es"], - subject="Build %(builder)s Failure", - mode = "failing", - builders = ["polly-amd64-linux", "polly-intel32-linux", - "polly-perf-O3", "polly-perf-O3-polly", - "polly-perf-O3-polly-codegen-isl", - "polly-perf-O3-polly-scev", - "polly-perf-O3-polly-scev-codegen-isl", - "polly-perf-O3-polly-detect"], - addLogs=False, - num_lines = 15), - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers= False, - extraRecipients = ["dblaikie@gmail.com", "echristo@gmail.com", - "daniel.malea@intel.com", "matt.kopec@intel.com", - "andrew.kaylor@intel.com", "ashok.thirumurthi@intel.com"], - subject="Build %(builder)s Failure", - mode = "failing", - builders = ["clang-x86_64-darwin10-gdb", "clang-x86_64-ubuntu-gdb-75"], - addLogs=False, - num_lines = 15), - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers= False, - extraRecipients = ["gribozavr@gmail.com"], - subject="Build %(builder)s Failure", - mode = "failing", - builders = ["clang-x86_64-debian-fast"], - addLogs=False, - num_lines = 15), - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers= False, - extraRecipients = ["mstester.llvm@gmail.com"], - subject="Build %(builder)s Failure", - mode = "failing", - builders = ["clang-atom-d525-fedora", "clang-atom-d525-fedora-rel", - "clang-x64-ninja-win7"], - addLogs=False, - num_lines = 15), - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers= False, - extraRecipients = ["llvm.buildmaster@quicinc.com"], - subject="Build %(builder)s Failure", - mode = "failing", - builders = ["llvm-hexagon-elf","clang-hexagon-elf"], - addLogs=False, - num_lines = 15), - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers= False, - extraRecipients = ["Ulrich.Weigand@de.ibm.com"], - subject="Build %(builder)s Failure", - mode = "failing", - builders = ["clang-s390x-linux", "clang-s390x-linux-multistage", - "clang-s390x-linux-lnt"], - addLogs=False, - num_lines = 15), - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers= False, - extraRecipients = ["axwalk@gmail.com","peter@pcc.me.uk"], - subject="Build %(builder)s Failure", - mode = "failing", - builders = ["llgo-x86_64-linux"], - addLogs=False, - num_lines = 15), - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers= False, - extraRecipients = ["lldb-build-police-gmt@grotations.appspotmail.com", - "lldb-build-police-pst@grotations.appspotmail.com"], - subject="Build %(builder)s Failure", - mode = "failing", - builders = ["lldb-x86_64-ubuntu-14.04-cmake", - "lldb-x86_64-ubuntu-14.04-buildserver", - "lldb-windows7-android", - "lldb-x86_64-darwin-13.4", - "lldb-x86_64-ubuntu-14.04-android"], - addLogs=False, - num_lines = 15), - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers= False, - extraRecipients = ["sunil_srivastava@playstation.sony.com", - "warren_ristow@playstation.sony.com"], - subject="Build %(builder)s Failure", - mode = "failing", - builders = ["clang-x86_64-linux-abi-test"], - addLogs=False, - num_lines = 15), - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers= False, - extraRecipients = ["simon.dardis@mips.com"], - subject="Build %(builder)s Failure", - mode = "failing", - builders = ["llvm-mips-linux", "clang-cmake-mips", - "clang-cmake-mipsel"], - addLogs=False, - num_lines = 15), - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers = False, - extraRecipients = ["me@dylanmckay.io"], - subject="Build %(builder)s Failure", - mode = "failing", - builders = ["llvm-avr-linux"], - addLogs=False, - num_lines = 15), - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers= False, - extraRecipients = ["gkistanova@gmail.com"], - subject="Build %(builder)s Failure", - mode = "failing", - builders = ["clang-lld-x86_64-2stage", "lld-x86_64-win7", - "lld-x86_64-freebsd", "sanitizer_x86_64-freebsd", - "clang-x86_64-linux-abi-test", "lld-x86_64-darwin13", - "llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast", - "clang-with-lto-ubuntu", "clang-with-thin-lto-ubuntu", - "llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast", - "llvm-clang-x86_64-expensive-checks-win"], - addLogs=False), - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers= False, - extraRecipients = ["efriedma@codeaurora.org"], - subject="Build %(builder)s Failure", - mode = "failing", - builders = ["polly-arm-linux", - "aosp-O3-polly-before-vectorizer-unprofitable"], - addLogs=False, - num_lines = 15), - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers= True, - extraRecipients = ["mgrang@codeaurora.org"], - subject="Build %(builder)s Failure", - mode = "problem", - builders = ["reverse-iteration"], - addLogs=False, - num_lines = 15), - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers= False, - extraRecipients = ["tra+buildbot@google.com"], - subject="Build %(builder)s Failure", - mode = "failing", - builders = ["clang-cuda-build"], - addLogs=False, - num_lines = 15), - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers= False, - extraRecipients = ["n54@gmx.com"], - subject="Build %(builder)s Failure", - mode = "failing", - builders = ["lldb-amd64-ninja-netbsd7", - "lldb-amd64-ninja-netbsd8"], - addLogs=False, - num_lines = 15), - InformativeMailNotifier( - fromaddr = "llvm.buildmaster@lab.llvm.org", - sendToInterestedUsers = False, - extraRecipients = ["asb@lowrisc.org"], - subject="Build %(builder)s Failure", - mode = "failing", - builders = ["llvm-riscv-linux"], - addLogs=False, - num_lines = 15), ] Index: buildbot/osuosl/master/master.cfg =================================================================== --- buildbot/osuosl/master/master.cfg +++ buildbot/osuosl/master/master.cfg @@ -3,7 +3,7 @@ # Extend paths to allow loading zorg and config modules. import os, sys -path = os.path.join(os.environ.get('HOME'), 'zorg', 'buildbot', 'osuosl', 'master') +path = os.path.join(os.environ.get('HOME'), 'buildmaster') if path not in sys.path: sys.path.append(path) path = os.path.join(os.environ.get('HOME'), 'zorg') @@ -245,10 +245,10 @@ ####### PROJECT IDENTITY -c['title'] = "LLVM" -c['titleURL'] = "http://llvm.org/" -c['buildbotURL'] = "http://lab.llvm.org:8011/" +c['title'] = "Linaro LLVM" +c['titleURL'] = "http://ex40-01.tcwglab.linaro.org/" +c['buildbotURL'] = "http://ex40-01.tcwglab.linaro.org:8011/" ####### DB URL -c['db_url'] = "postgresql://localhost/buildmasterdb" +c['db_url'] = "sqlite:///state.sqlite"