Cleaning up some things in the master.cfg
This commit is contained in:
parent
28ad33aaae
commit
20a80e67f7
1 changed files with 0 additions and 22 deletions
22
master.cfg
22
master.cfg
|
@ -77,7 +77,6 @@ from buildbot.changes.gitpoller import GitPoller
|
|||
c['change_source'] = []
|
||||
c['change_source'].append(GitPoller(
|
||||
repourl = 'https://gitorious.org/gdb/gdb.git',
|
||||
# repourl = r'git://sourceware.org/git/binutils-gdb.git',
|
||||
workdir = os.path.expanduser (os.path.join ('~/', 'buildbot-master-binutils-gdb')),
|
||||
branches = should_watch_branch,
|
||||
pollinterval = 60 * 3))
|
||||
|
@ -257,18 +256,6 @@ c['db'] = {
|
|||
## the documentation on each build step class to understand what it
|
||||
## does.
|
||||
|
||||
class RandomWaitForClone (ShellCommand):
|
||||
"""This build step is responsible for waiting a random number of
|
||||
seconds before trying to update the local git repository. This is a
|
||||
hack, and is needed because sourceware imposes a load average when one
|
||||
tries to update more than 3 repositories at the same time. An obvious
|
||||
FIXME for this would be to have a git mirror somewhere where we could
|
||||
do more than 3 updates at a time."""
|
||||
name = "random wait for clone"
|
||||
description = r"randomly waiting before git fetching"
|
||||
descriptionDone = r"waited before git fetching"
|
||||
command = ['sleep', WithProperties (r"%s", r'randomWait')]
|
||||
|
||||
class CloneOrUpdateGDBMasterRepo (Git):
|
||||
"""This build step updates the so-called "master" git repository. For
|
||||
each buildslave, we have one master GDB git repository, which is then
|
||||
|
@ -293,7 +280,6 @@ from the principal repository."""
|
|||
def __init__ (self):
|
||||
Git.__init__ (self,
|
||||
repourl = 'https://gitorious.org/gdb/gdb.git',
|
||||
# repourl = r'git://sourceware.org/git/binutils-gdb.git',
|
||||
workdir = WithProperties (r"%s/../binutils-gdb-master/",
|
||||
r'builddir'),
|
||||
retryFetch = True,
|
||||
|
@ -314,7 +300,6 @@ present at the reference repository (i.e., locally)."""
|
|||
def __init__ (self):
|
||||
Git.__init__ (self,
|
||||
repourl = 'https://gitorious.org/gdb/gdb.git',
|
||||
# repourl = 'git://sourceware.org/git/binutils-gdb.git',
|
||||
workdir = WithProperties ('%s/binutils-gdb/', 'builddir'),
|
||||
reference = WithProperties ("%s/../binutils-gdb-master/",
|
||||
'builddir'),
|
||||
|
@ -483,10 +468,6 @@ The parameters of the class are:
|
|||
r'builddir'),
|
||||
description = r"removing old build dir",
|
||||
descriptionDone = r"removed old build dir"))
|
||||
# Unfortunately we need to have this random wait, otherwise
|
||||
# git fetch won't work
|
||||
## Disabling this step for now because we are using a mirror
|
||||
##self.addStep (RandomWaitForClone ())
|
||||
self.addStep (CloneOrUpdateGDBMasterRepo ())
|
||||
self.addStep (CloneOrUpdateGDBRepo ())
|
||||
|
||||
|
@ -524,9 +505,6 @@ The parameters of the class are:
|
|||
r'builddir'),
|
||||
masterdest = WithProperties (r"public_html/results/%s/gdb.log",
|
||||
r'buildername')))
|
||||
# masterdest = WithProperties (r"public_html/results/%s/%s/gdb.log",
|
||||
# r'buildername',
|
||||
# r'got_revision')))
|
||||
self.addStep (SaveGDBResults ())
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue