slave_port = ini.getint("general", "port")
c['slaves'] = []
+max_builds = dict()
for section in ini.sections():
if section.startswith("slave "):
if ini.has_option(section, "name") and ini.has_option(section, "password"):
name = ini.get(section, "name")
password = ini.get(section, "password")
- max_builds = 1
+ max_builds[name] = 1
if ini.has_option(section, "builds"):
- max_builds = ini.getint(section, "builds")
- c['slaves'].append(BuildSlave(name, password, max_builds = max_builds))
+ max_builds[name] = ini.getint(section, "builds")
+ c['slaves'].append(BuildSlave(name, password, max_builds = max_builds[name]))
# 'slavePortnum' defines the TCP port to listen on for connections from slaves.
# This must match the value configured into the buildslaves (with their
home_dir = os.path.abspath(ini.get("general", "homedir"))
tree_expire = 0
+other_builds = 0
if ini.has_option("general", "expire"):
tree_expire = ini.getint("general", "expire")
+if ini.has_option("general", "other_builds"):
+ other_builds = ini.getint("general", "other_builds")
+
repo_url = ini.get("repo", "url")
repo_branch = "master"
targets = [ ]
if not os.path.isdir(home_dir+'/source.git'):
- subprocess.call(["git", "clone", "--depth=1", repo_url, home_dir+'/source.git'])
- subprocess.call(["git", "checkout", repo_branch], cwd = home_dir+'/source.git')
+ subprocess.call(["git", "clone", "--depth=1", "--branch="+repo_branch, repo_url, home_dir+'/source.git'])
else:
- subprocess.call(["git", "checkout", repo_branch], cwd = home_dir+'/source.git')
subprocess.call(["git", "pull"], cwd = home_dir+'/source.git')
findtargets = subprocess.Popen([home_dir+'/dumpinfo.pl', 'targets'],
c['change_source'] = []
c['change_source'].append(GitPoller(
repo_url,
- workdir=home_dir+'/work.git', branch='master',
+ workdir=home_dir+'/work.git', branch=repo_branch,
pollinterval=300))
####### SCHEDULERS
c['schedulers'] = []
c['schedulers'].append(SingleBranchScheduler(
name="all",
- change_filter=filter.ChangeFilter(branch='master'),
+ change_filter=filter.ChangeFilter(branch=repo_branch),
treeStableTimer=60,
builderNames=targets))
# only take place on one slave.
from buildbot.process.factory import BuildFactory
-from buildbot.steps.source import Git
+from buildbot.steps.source.git import Git
from buildbot.steps.shell import ShellCommand
from buildbot.steps.shell import SetProperty
from buildbot.steps.transfer import FileUpload
return CheckCleanProperty
+def IsTaggingRequested(step):
+ val = step.getProperty("tag")
+ if val and re.match("^[0-9]+\.[0-9]+\.[0-9]+$", val):
+ return True
+ else:
+ return False
+
+def IsNoTaggingRequested(step):
+ return not IsTaggingRequested(step)
+
+def IsNoMasterBuild(step):
+ return repo_branch != "master"
+
+def GetBaseVersion(props):
+ if re.match("^[^-]+-[0-9]+\.[0-9]+$", repo_branch):
+ return repo_branch.split('-')[1]
+ else:
+ return "master"
+
+def GetVersionPrefix(props):
+ basever = GetBaseVersion(props)
+ if props.hasProperty("tag") and re.match("^[0-9]+\.[0-9]+\.[0-9]+$", props["tag"]):
+ return "%s/" % props["tag"]
+ elif basever != "master":
+ return "%s-SNAPSHOT/" % basever
+ else:
+ return ""
+
+def GetNumJobs(props):
+ if props.hasProperty("slavename") and props.hasProperty("nproc"):
+ return ((int(props["nproc"]) / (max_builds[props["slavename"]] + other_builds)) + 1)
+ else:
+ return 1
+
c['builders'] = []
dlLock = locks.SlaveLock("slave_dl")
+tagLock = locks.MasterLock("make_tag")
checkBuiltin = re.sub('[\t\n ]+', ' ', """
checkBuiltin() {
doStepIf = IsCleanRequested(tuple[0])
))
+ factory.addStep(MasterShellCommand(
+ name = "maketag",
+ description = "Tagging Git repository",
+ command = [home_dir+'/maketag.sh', '-i', '-k', str(gpg_keyid or ''),
+ '-p', str(gpg_passfile or ''), '-v', WithProperties("%(tag:-)s")],
+ path = home_dir+'/source.git',
+ env = {'GNUPGHOME': gpg_home},
+ haltOnFailure = True,
+ doStepIf = IsTaggingRequested,
+ locks = [tagLock.access('exclusive')]
+ ))
+
+ # switch to branch
+ factory.addStep(ShellCommand(
+ name = "switchbranch",
+ description = "Checking out Git branch",
+ command = "if [ -d .git ]; then git checkout '%s'; else exit 0; fi" % repo_branch,
+ haltOnFailure = True,
+ doStepIf = IsNoTaggingRequested
+ ))
+
# check out the source
- factory.addStep(Git(repourl=repo_url, branch=repo_branch, mode='update'))
+ factory.addStep(Git(
+ repourl = repo_url,
+ branch = repo_branch,
+ mode = 'incremental',
+ method = 'clean'))
+
+ # update remote refs
+ factory.addStep(ShellCommand(
+ name = "fetchrefs",
+ description = "Fetching Git remote refs",
+ command = ["git", "fetch", "origin", "+refs/heads/%s:refs/remotes/origin/%s" %(repo_branch, repo_branch)],
+ haltOnFailure = True
+ ))
+
+ # fetch tags
+ factory.addStep(ShellCommand(
+ name = "fetchtag",
+ description = "Fetching Git tags",
+ command = ["git", "fetch", "--tags", "--", repo_url],
+ haltOnFailure = True,
+ doStepIf = IsTaggingRequested
+ ))
+
+ # switch to tag
+ factory.addStep(ShellCommand(
+ name = "switchtag",
+ description = "Checking out Git tag",
+ command = ["git", "checkout", WithProperties("tags/v%(tag:-)s")],
+ haltOnFailure = True,
+ doStepIf = IsTaggingRequested
+ ))
factory.addStep(ShellCommand(
name = "rmtmp",
factory.addStep(ShellCommand(
name = "dltar",
description = "Building GNU tar",
- command = ["make", WithProperties("-j%(nproc:~4)s"), "tools/tar/install", "V=s"],
+ command = ["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "tools/tar/install", "V=s"],
haltOnFailure = True
))
factory.addStep(ShellCommand(
name = "dlrun",
description = "Populating dl/",
- command = ["make", WithProperties("-j%(nproc:~4)s"), "download", "V=s"],
+ command = ["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "download", "V=s"],
logEnviron = False,
locks = [dlLock.access('exclusive')]
))
factory.addStep(ShellCommand(
name = "tools",
description = "Building tools",
- command = ["make", WithProperties("-j%(nproc:~4)s"), "tools/install", "V=s"],
+ command = ["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "tools/install", "V=s"],
haltOnFailure = True
))
factory.addStep(ShellCommand(
name = "toolchain",
description = "Building toolchain",
- command=["make", WithProperties("-j%(nproc:~4)s"), "toolchain/install", "V=s"],
+ command=["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "toolchain/install", "V=s"],
haltOnFailure = True
))
factory.addStep(ShellCommand(
name = "kmods",
description = "Building kmods",
- command=["make", WithProperties("-j%(nproc:~4)s"), "target/compile", "V=s", "IGNORE_ERRORS=n m", "BUILD_LOG=1"],
+ command=["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "target/compile", "V=s", "IGNORE_ERRORS=n m", "BUILD_LOG=1"],
#env={'BUILD_LOG_DIR': 'bin/%s' %(ts[0])},
haltOnFailure = True
))
factory.addStep(ShellCommand(
name = "pkgbuild",
description = "Building packages",
- command=["make", WithProperties("-j%(nproc:~4)s"), "package/compile", "V=s", "IGNORE_ERRORS=n m", "BUILD_LOG=1"],
+ command=["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "package/compile", "V=s", "IGNORE_ERRORS=n m", "BUILD_LOG=1"],
#env={'BUILD_LOG_DIR': 'bin/%s' %(ts[0])},
haltOnFailure = True
))
factory.addStep(ShellCommand(
name = "pkginstall",
description = "Installing packages",
- command=["make", WithProperties("-j%(nproc:~4)s"), "package/install", "V=s"],
+ command=["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "package/install", "V=s"],
haltOnFailure = True
))
factory.addStep(ShellCommand(
name = "pkgindex",
description = "Indexing packages",
- command=["make", WithProperties("-j%(nproc:~4)s"), "package/index", "V=s"],
+ command=["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "package/index", "V=s"],
haltOnFailure = True
))
factory.addStep(ShellCommand(
name = "images",
description = "Building images",
- command=["make", WithProperties("-j%(nproc:~4)s"), "target/install", "V=s"],
+ command=["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "target/install", "V=s"],
+ haltOnFailure = True
+ ))
+
+ factory.addStep(ShellCommand(
+ name = "diffconfig",
+ description = "Generating config.seed",
+ command=["make", "-j1", "diffconfig", "V=s"],
haltOnFailure = True
))
description = "Signing files",
command = ["%s/signall.sh" %(home_dir), "%s/signing/%s.%s.tar.gz" %(home_dir, ts[0], ts[1]), gpg_keyid, gpg_comment],
env = {'GNUPGHOME': gpg_home, 'PASSFILE': gpg_passfile},
- haltOnFailure = True,
- logEnviron = False
+ haltOnFailure = True
))
factory.addStep(FileDownload(
# upload
factory.addStep(ShellCommand(
- name = "uploadprepare",
- description = "Preparing target directory",
- command=["rsync", "-av", "--include", "/%s/" %(ts[0]), "--include", "/%s/%s/" %(ts[0], ts[1]), "--exclude", "/*", "--exclude", "/*/*", "--exclude", "/%s/%s/*" %(ts[0], ts[1]), "bin/targets/", "%s/targets/" %(rsync_bin_url)],
+ name = "dirprepare",
+ description = "Preparing upload directory structure",
+ command = ["mkdir", "-p", WithProperties("tmp/upload/%%(prefix)stargets/%s/%s" %(ts[0], ts[1]), prefix=GetVersionPrefix)],
+ haltOnFailure = True
+ ))
+
+ factory.addStep(ShellCommand(
+ name = "linkprepare",
+ description = "Preparing repository symlink",
+ command = ["ln", "-s", "-f", WithProperties("../packages-%(basever)s", basever=GetBaseVersion), WithProperties("tmp/upload/%(prefix)spackages", prefix=GetVersionPrefix)],
+ doStepIf = IsNoMasterBuild,
+ haltOnFailure = True
+ ))
+
+ factory.addStep(ShellCommand(
+ name = "dirupload",
+ description = "Uploading directory structure",
+ command = ["rsync", "-avz", "tmp/upload/", "%s/" %(rsync_bin_url)],
env={'RSYNC_PASSWORD': rsync_bin_key},
haltOnFailure = True,
logEnviron = False
factory.addStep(ShellCommand(
name = "targetupload",
description = "Uploading target files",
- command=["rsync", "--delete", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", WithProperties("bin/targets/%s/%s%%(libc)s/" %(ts[0], ts[1])), "%s/targets/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
+ command=["rsync", "--progress", "--delete", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]),
+ "-avz", WithProperties("bin/targets/%s/%s%%(libc)s/" %(ts[0], ts[1])),
+ WithProperties("%s/%%(prefix)stargets/%s/%s/" %(rsync_bin_url, ts[0], ts[1]), prefix=GetVersionPrefix)],
env={'RSYNC_PASSWORD': rsync_bin_key},
haltOnFailure = True,
logEnviron = False
factory.addStep(ShellCommand(
name = "sourceupload",
description = "Uploading source archives",
- command=["rsync", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "dl/", "%s/" %(rsync_src_url)],
+ command=["rsync", "--progress", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "dl/", "%s/" %(rsync_src_url)],
env={'RSYNC_PASSWORD': rsync_src_key},
haltOnFailure = True,
logEnviron = False
projects / buildbot.git / blobdiff