[LLDB] Remove all abandoned LLDB bots

[rnk]

Summary

All of these bots have been broken for months -- in some cases years. Removing them from the waterfall.

[stella.stamenova]

There's another patch (https://reviews.llvm.org/D54386/) which is fixing the fedora bot. You might want to leave that one.

[zturner]

I added the Fedora bot back and rebased this on top of Jan's patch from D54386.

[srhines]

LGTM for removing the broken Android builders.

[labath]

Zach, what's the status of this? I'm getting ready to add a new lldb bot, and it would be nice to remove the old ones first..

[zturner]

Rebased

[stella.stamenova]

buildbot/osuosl/master/master.cfg

191 ↗

(On Diff #185864)

The lldb_scheduler should stay. @labath suggested that maybe it doesn't have to because the getSingleBranchSchedulers should cover the LLDB builders, but not all the LLDB builders are setup with depends_on_projects properties, so for some of them, getSingleBranchSchedulers will not work properly. You just need to update the builderNames list for the lldb_scheduler to no longer exclude the now-nonexistent lldb_android_builders

185 ↗

(On Diff #193582)

I think this means you can remove LLDBTriggerable.py as well

[zturner]

Add the scheduler back but remove the android builder only.

[zturner]

Also remove LLDBTriggerable.py

[stella.stamenova]

Thanks!

[gkistanova]

Thanks for cleaning this!

[rnk]

Landing this for @zturner since he's busy with other tasks.

zorg/trunk/buildbot/osuosl/master/config/builders.py

return [
                                 "-DLLVM_ENABLE_LIBCXX:BOOL=ON",
                                 "-DCMAKE_C_COMPILER:FILEPATH=/local/clang+llvm-6.0.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang",
                                 "-DCMAKE_CXX_COMPILER:FILEPATH=/local/clang+llvm-6.0.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang++"])}
     ]
 
 # LLDB builders.
 def _get_lldb_builders():
     return [
-        {'name': "lldb-x86-windows-msvc2015",
-         'slavenames': ["zturner-win2008"],
-         'builddir': "lldb-windows-x86",
-         'factory': LLDBBuilder.getLLDBCMakeBuildFactory(
-                    test=False,
-                    python_source_dir=r'C:/Python35',
-                    vs=r"""%VS140COMNTOOLS%""")},
-        # Disable the builder till we fix the cmake configuration
-        #{'name': "lldb-x86-win7-msvc",
-        #'slavenames': ["hexagon-build-01"],
-        #'builddir': "builddir/lldb-win7-msvc",
-        #'factory': LLDBBuilder.getLLDBCMakeBuildFactory(
-        #           config='Debug',
-        #           python_source_dir=r'C:/Python35',
-        #           vs=r"""%VS140COMNTOOLS%""")},
-        {'name': "lldb-x86_64-ubuntu-14.04-buildserver",
-         'slavenames': ["lldb-linux-android-buildserver"],
-         'builddir': "lldb-android-buildserver",
-         'category' : 'lldb',
-         'factory': LLDBBuilder.getLLDBScriptCommandsFactory(
-                    downloadBinary=False,
-                    buildAndroid=True,
-                    runTest=False,
-                    extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON'])},
-        {'name': "lldb-x86_64-ubuntu-14.04-cmake",
-         'slavenames': ["lldb-build1-ubuntu-1404"],
-         'builddir': "buildWorkingDir",
-         'category' : 'lldb',
-         'factory': LLDBBuilder.getLLDBScriptCommandsFactory(
-                    downloadBinary=False,
-                    buildAndroid=False,
-                    runTest=True,
-                    extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON'])},
         {'name': "lldb-amd64-ninja-freebsd11",
          'slavenames': ["lldb-amd64-ninja-freebsd11"],
          'builddir': "scratch",
          'category' : 'lldb',
          'factory': LLDBBuilder.getLLDBScriptCommandsFactory(
                     downloadBinary=False,
                     runTest=False)},
         {'name': "lldb-x86_64-fedora",
return [
                      gpu_devices=["GPU-af66efa4",  # K40c(sm_35),
                                   "GPU-44fe2444"   # GTX1070(sm_61)
                      ],
                      cuda_jobs = 4, # Speeds up test execution time by ~2x.
                      extra_ts_cmake_args=[],
                      enable_thrust_tests=False,
          ),
          'category' : 'clang'},
-
-        # lldb builders
-        {'name': "lldb-x86_64-darwin-13.4",
-         'slavenames': ["lldb-x86_64-darwin-13.4"],
-         'builddir': "buildDir",
-         'category' : 'lldb',
-         'factory': LLDBBuilder.getLLDBScriptCommandsFactory(
-                    downloadBinary=True,
-                    buildAndroid=False,
-                    runTest=True)},
-        {'name': "lldb-x86_64-ubuntu-14.04-android",
-         'slavenames': ["lldb-lab-linux01"],
-         'builddir': "lldb-cross-compile",
-         'category' : 'lldb',
-         'factory': LLDBBuilder.getLLDBScriptCommandsFactory(
-                    downloadBinary=True,
-                    buildAndroid=False,
-                    runTest=True)},
-        {'name': "lldb-windows7-android",
-         'slavenames': ["lldb-lab-win01"],
-         'builddir': "lldb-win7-android",
-         'category': "lldb",
-         'factory': LLDBBuilder.getLLDBScriptCommandsFactory(
-                    downloadBinary=True,
-                    buildAndroid=False,
-                    runTest=True,
-                    scriptExt='.bat')},
-
         ]
 
 # Builders responsible building Sphinix documentation
 def _get_documentation_builders():
     return [
              {
                'name':"llvm-sphinx-docs",
                'slavenames':["gribozavr3"],

zorg/trunk/buildbot/osuosl/master/config/slaves.py

return [
         # 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),
         # Windows Server 2012 x86_64 16-core GCE instance
         create_slave("sanitizer-windows", properties={'jobs': 16}, max_builds=1),
         create_slave("windows-gcebot1", properties={'jobs': 8}, max_builds=1),
         # Windows Server 2012 x86_64 32-core GCE instance
         create_slave("windows-gcebot2", properties={'jobs': 32}, max_builds=1),
         # Windows Server 2016 x86_64 16-core GCE instance
         create_slave("windows-lld-thinlto-1", max_builds=1),
 
-        # Ubuntu x86-64, 51GiB System memory Intel(R) Xeon(R) CPU @ 2.60GHz
-        create_slave("lldb-build1-ubuntu-1404", properties={'jobs': 32, 'loadaverage':32}, max_builds=1),
-        # Darwin 13.4.0, x86_64
-        create_slave("lldb-x86_64-darwin-13.4", properties={'jobs': 16, 'loadaverage':32}, max_builds=1),
-        # Ubuntu 14.04 x86_64, Intel(R) Xeon(R) CPU E5-2680 v2 @ 2.80GHz
-        create_slave("lldb-lab-linux01", properties={'jobs': 40}, max_builds=1),
-
-        # Windows 7 x86_64
-        create_slave("lldb-lab-win01", properties={'jobs': 40}, max_builds=1),
-        # Ubuntu 14.04 x86_64
-        create_slave("lldb-linux-android-buildserver", properties={'jobs': 40}, max_builds=1),
         # Ubuntu 14.04 x86_64, Intel(R) Xeon(R) CPU L5520 @ 2.27GHz
         create_slave("bpf-build-slave01", properties={'jobs': 16}, max_builds=1),
 
         # Ubuntu 14.04 x86_64-scei-ps4, 2 x Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz
         create_slave("ps4-buildslave1"),
         create_slave("ps4-buildslave1a", properties={'jobs': 64}, max_builds=2),
 
         # Windows 10 Pro x86_64-scei-ps4, 2 x Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz

zorg/trunk/buildbot/osuosl/master/config/status.py

return [
             subject="Build %(builder)s Failure",
             mode = "failing",
             builders = ["llgo-x86_64-linux"],
             addLogs=False,
             num_lines = 15),
         InformativeMailNotifier(
             fromaddr = "[e-mail]",
             sendToInterestedUsers= False,
-            extraRecipients = ["[e-mail]",
-                               "[e-mail]"],
-            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 = "[e-mail]",
-            sendToInterestedUsers= False,
             extraRecipients = ["[e-mail]",
                                "[e-mail]"],
             subject="Build %(builder)s Failure",
             mode = "failing",
             builders = ["clang-x86_64-linux-abi-test"],
             addLogs=False,
             num_lines = 15),
         InformativeMailNotifier(

zorg/trunk/buildbot/osuosl/master/master.cfg

 # All other lld builders use auto-generated schedulers.
 c['schedulers'].append(SingleBranchScheduler(name="lld_scheduler",
                             treeStableTimer=2*60,
                             builderNames=["lld-sphinx-docs"],
                             change_filter=depends_on([
                                 "llvm",
                                 "lld"])))
 
-# lldb android builders will be triggered by completion of buildserver instead of by source change
-lldb_android_builders=["lldb-x86_64-ubuntu-14.04-android",
-                       "lldb-windows7-android",
-                       "lldb-x86_64-darwin-13.4"]
-from zorg.buildbot.schedulers.LLDBTriggerable import LLDBTriggerable
-c['schedulers'].append((LLDBTriggerable(
-                                  projects=['lldb', 'cfe', 'llvm'],
-                                  name="lldb_android_scheduler",
-                                  builderNames=lldb_android_builders)))
-
 c['schedulers'].append(SingleBranchScheduler(name="lldb_scheduler",
                             treeStableTimer=2*60,
-                            builderNames=list(set(get_all_for("lldb"))-set(lldb_android_builders)),
+                            builderNames=get_all_for("lldb"),
                             change_filter=depends_on([
                                 "llvm",
                                 "cfe",
                                 "lldb"])))
 
 c['schedulers'].append(SingleBranchScheduler(name="sanitizer_scheduler",
                             treeStableTimer=2*60,
                             builderNames=get_all_for("sanitizer"),

zorg/trunk/zorg/buildbot/schedulers/LLDBTriggerable.py

-from twisted.python import log
-from twisted.internet import defer
-from buildbot.schedulers.triggerable import Triggerable
-from buildbot.process.properties import Properties
-
-class LLDBTriggerable(Triggerable):
-    """
-    This is the scheduler used for lldb android builders,
-    Overwrite trigger function, so the triggered builder will
-    get changelist based on new changes since their last build.
-    The origianl implementation takes changelist from upstream
-    triggerer builder, this will be inaccurate in the case that
-    some builds in upstream didn't trigger new builds due to
-    failure in their early steps.
-    """
-
-    def __init__(self, projects, maxChange=100, **kwargs):
-        Triggerable.__init__(self, **kwargs)
-        self.projects = projects
-        self.lastRevision = None
-        self.maxChange = maxChange
-
-    def trigger(self, ssid, set_props=None):
-        """Trigger this scheduler with the given sourcestamp ID. Returns a
-        deferred that will fire when the buildset is finished."""
-        # properties for this buildset are composed of our own properties,
-        # potentially overridden by anything from the triggering build
-        props = Properties()
-        props.updateFromProperties(self.properties)
-        if set_props:
-            props.updateFromProperties(set_props)
-
-        newRevision = [None]
-        def getRevision(ss):
-            newRevision[0] = ss['revision']
-            return ss['revision']
-
-        def getRecentChanges(newRev):
-            if self.lastRevision is None:
-                return None
-            return self.master.db.changes.getRecentChanges(self.maxChange)
-
-        # check the last x changeset and pick up the ones that are between
-        # last revision and current revision and belong to interested projects
-        def selectChangeSet(changes):
-            changeids = []
-            if changes is not None:
-                for change in changes:
-                    if change['revision'] > newRevision[0] or change['revision'] <= self.lastRevision or change['project'] not in self.projects:
-                        continue
-                    changeids.append(change['changeid'])
-            log.msg("LLDBTriggerable: last revision change from %s to %s" % (self.lastRevision, newRevision[0]))
-            self.lastRevision = newRevision[0]
-            return changeids
-
-        def addBuildset(changeids):
-            if changeids:
-                log.msg("LLDBTriggerable: addBuildsetForChanges, changeids: %s" % changeids)
-                return self.addBuildsetForChanges(reason=self.reason, changeids=changeids, properties=props)
-            elif ssid:
-                # if this is the first build after master startup, use the source stamp from triggerer build
-                # it's possible to write last revision to a file on master, so after master reconfig we could
-                # pick up the correct last revision.
-                # It's not implemented here because 1) the cases are rare that first build after master restart
-                # is preceded by failing builds on triggerer builder, 2) avoid polluting master with project
-                # specific cache files
-                log.msg("LLDBTriggerable: addBuildsetForSourceStamp")
-                return self.addBuildsetForSourceStamp(reason=self.reason, ssid=ssid, properties=props)
-            else:
-                return self.addBuildsetForLatest(reason=self.reason, properties=props)
-
-        def setup_waiter((bsid,brids)):
-            self._waiters[bsid] = d = defer.Deferred()
-            self._updateWaiters()
-            return d
-
-        d = self.master.db.sourcestamps.getSourceStamp(ssid)
-        d.addCallback(getRevision)
-        d.addCallback(getRecentChanges)
-        d.addCallback(selectChangeSet)
-        d.addCallback(addBuildset)
-        d.addCallback(setup_waiter)
-        return d
-