X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=phase1%2Fmaster.cfg;h=04879e800f6ebfa17470714bc679dc1ccfc178b7;hb=da4174f4bd4d3af7e10f3d9f3fcd5ac713b33b09;hp=750763ea877193fa9e3026ad4180b2e0669cdf90;hpb=dce80571478b96b63a80655b987e61c8da1ad2fb;p=buildbot.git diff --git a/phase1/master.cfg b/phase1/master.cfg index 750763e..04879e8 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -31,16 +31,17 @@ if ini.has_option("general", "port"): 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 @@ -50,19 +51,36 @@ c['slavePortnum'] = slave_port # coalesce builds c['mergeRequests'] = True +# Reduce amount of backlog data +c['buildHorizon'] = 30 +c['logHorizon'] = 20 + ####### CHANGESOURCES home_dir = os.path.abspath(ini.get("general", "homedir")) tree_expire = 0 +other_builds = 0 +cc_version = None + +cc_command = "gcc" +cxx_command = "g++" 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") + +if ini.has_option("general", "cc_version"): + cc_version = ini.get("general", "cc_version").split() + if len(cc_version) == 1: + cc_version = ["eq", cc_version[0]] + repo_url = ini.get("repo", "url") repo_branch = "master" if ini.has_option("repo", "branch"): - repo_branch = ini.get_option("repo", "branch") + repo_branch = ini.get("repo", "branch") rsync_bin_url = ini.get("rsync", "binary_url") rsync_bin_key = ini.get("rsync", "binary_password") @@ -74,10 +92,14 @@ if ini.has_option("rsync", "source_url"): rsync_src_url = ini.get("rsync", "source_url") rsync_src_key = ini.get("rsync", "source_password") +gpg_home = "~/.gnupg" gpg_keyid = None gpg_comment = "Unattended build signature" gpg_passfile = "/dev/null" +if ini.has_option("gpg", "home"): + gpg_home = ini.get("gpg", "home") + if ini.has_option("gpg", "keyid"): gpg_keyid = ini.get("gpg", "keyid") @@ -92,8 +114,9 @@ if ini.has_option("gpg", "passfile"): 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", "pull"], cwd = home_dir+'/source.git') findtargets = subprocess.Popen([home_dir+'/dumpinfo.pl', 'targets'], stdout = subprocess.PIPE, cwd = home_dir+'/source.git') @@ -113,7 +136,7 @@ from buildbot.changes.gitpoller import GitPoller c['change_source'] = [] c['change_source'].append(GitPoller( repo_url, - workdir=home_dir+'/source.git', branch='master', + workdir=home_dir+'/work.git', branch=repo_branch, pollinterval=300)) ####### SCHEDULERS @@ -127,7 +150,7 @@ from buildbot.changes import filter 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)) @@ -142,7 +165,7 @@ c['schedulers'].append(ForceScheduler( # 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 @@ -169,10 +192,81 @@ def IsCleanRequested(pattern): return CheckCleanProperty +def IsTaggingRequested(step): + val = step.getProperty("tag") + if val and re.match("^[0-9]+\.[0-9]+\.[0-9]+(?:-rc[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]+(?:-rc[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 + +def GetCC(props): + if props.hasProperty("cc_command"): + return props["cc_command"] + else: + return "gcc" + +def GetCXX(props): + if props.hasProperty("cxx_command"): + return props["cxx_command"] + else: + return "g++" + +def GetCwd(props): + if props.hasProperty("builddir"): + return props["builddir"] + elif props.hasProperty("workdir"): + return props["workdir"] + else: + return "/" + +def GetNextBuild(builder, requests): + for r in requests: + if r.properties and r.properties.hasProperty("tag"): + return r + return requests[0] + +def MakeEnv(overrides=None): + env = { + 'CC': WithProperties("%(cc)s", cc=GetCC), + 'CXX': WithProperties("%(cxx)s", cxx=GetCXX), + 'CCACHE_BASEDIR': WithProperties("%(cwd)s", cwd=GetCwd) + } + if overrides is not None: + env.update(overrides) + return env + c['builders'] = [] dlLock = locks.SlaveLock("slave_dl") +tagLock = locks.MasterLock("make_tag") checkBuiltin = re.sub('[\t\n ]+', ' ', """ checkBuiltin() { @@ -244,6 +338,27 @@ for target in targets: description = "Finding number of CPUs", command = ["nproc"])) + # find gcc and g++ compilers + if cc_version is not None: + factory.addStep(FileDownload( + mastersrc = "findbin.pl", + slavedest = "../findbin.pl", + mode = 0755)) + + factory.addStep(SetProperty( + name = "gcc", + property = "cc_command", + description = "Finding gcc command", + command = ["../findbin.pl", "gcc", cc_version[0], cc_version[1]], + haltOnFailure = True)) + + factory.addStep(SetProperty( + name = "g++", + property = "cxx_command", + description = "Finding g++ command", + command = ["../findbin.pl", "g++", cc_version[0], cc_version[1]], + haltOnFailure = True)) + # expire tree if needed if tree_expire > 0: factory.addStep(FileDownload( @@ -265,11 +380,63 @@ for target in targets: name = tuple[1], description = 'User-requested "make %s"' % tuple[1], command = ["make", tuple[1], "V=s"], + env = MakeEnv(), 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 fetch && 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", @@ -292,35 +459,29 @@ for target in targets: factory.addStep(ShellCommand( name = "updatefeeds", description = "Updating feeds", - command=["./scripts/feeds", "update"])) + command=["./scripts/feeds", "update"], + env = MakeEnv())) # feed factory.addStep(ShellCommand( name = "installfeeds", description = "Installing feeds", - command=["./scripts/feeds", "install", "-a"])) + command=["./scripts/feeds", "install", "-a"], + env = MakeEnv())) + + # seed config + factory.addStep(FileDownload( + mastersrc = "config.seed", + slavedest = ".config", + mode = 0644 + )) # configure factory.addStep(ShellCommand( name = "newconfig", description = "Seeding .config", - command='''cat < .config -CONFIG_TARGET_%s=y -CONFIG_TARGET_%s_%s=y -CONFIG_ALL_NONSHARED=y -CONFIG_SDK=y -CONFIG_IB=y -# CONFIG_IB_STANDALONE is not set -CONFIG_DEVEL=y -CONFIG_CCACHE=y -CONFIG_SIGNED_PACKAGES=y -# CONFIG_PER_FEED_REPO_ADD_COMMENTED is not set -CONFIG_KERNEL_KALLSYMS=y -CONFIG_COLLECT_KERNEL_DEBUG=y -CONFIG_TARGET_ALL_PROFILES=y -CONFIG_TARGET_MULTI_PROFILE=y -CONFIG_TARGET_PER_DEVICE_ROOTFS=y -EOT''' %(ts[0], ts[0], ts[1]) )) + command = "printf 'CONFIG_TARGET_%s=y\\nCONFIG_TARGET_%s_%s=y\\n' >> .config" %(ts[0], ts[0], ts[1]) + )) factory.addStep(ShellCommand( name = "delbin", @@ -331,7 +492,8 @@ EOT''' %(ts[0], ts[0], ts[1]) )) factory.addStep(ShellCommand( name = "defconfig", description = "Populating .config", - command = ["make", "defconfig"] + command = ["make", "defconfig"], + env = MakeEnv() )) # check arch @@ -352,6 +514,20 @@ EOT''' %(ts[0], ts[0], ts[1]) )) description = "Finding libc suffix", command = ["sed", "-ne", '/^CONFIG_LIBC=/ { s!^CONFIG_LIBC="\\(.*\\)"!\\1!; s!^musl$!!; s!.\\+!-&!p }', ".config"])) + # ccache helper + factory.addStep(FileDownload( + mastersrc = "ccache.sh", + slavedest = "ccache.sh", + mode = 0755 + )) + + # ccache prepare + factory.addStep(ShellCommand( + name = "prepccache", + description = "Preparing ccache", + command = ["./ccache.sh"] + )) + # install build key factory.addStep(FileDownload(mastersrc=home_dir+'/key-build', slavedest="key-build", mode=0600)) factory.addStep(FileDownload(mastersrc=home_dir+'/key-build.pub', slavedest="key-build.pub", mode=0600)) @@ -369,7 +545,8 @@ EOT''' %(ts[0], ts[0], ts[1]) )) 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/compile", "V=s"], + env = MakeEnv(), haltOnFailure = True )) @@ -377,7 +554,8 @@ EOT''' %(ts[0], ts[0], ts[1]) )) 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"], + env = MakeEnv(), logEnviron = False, locks = [dlLock.access('exclusive')] )) @@ -392,29 +570,39 @@ EOT''' %(ts[0], ts[0], ts[1]) )) 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"], + env = MakeEnv(), 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"], + env = MakeEnv(), 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 = MakeEnv(), #env={'BUILD_LOG_DIR': 'bin/%s' %(ts[0])}, haltOnFailure = True )) + factory.addStep(ShellCommand( + name = "pkgclean", + description = "Cleaning up package build", + command=["make", "package/cleanup", "V=s"] + )) + 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 = MakeEnv(), #env={'BUILD_LOG_DIR': 'bin/%s' %(ts[0])}, haltOnFailure = True )) @@ -423,14 +611,16 @@ EOT''' %(ts[0], ts[0], ts[1]) )) 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"], + env = MakeEnv(), 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"], + env = MakeEnv(), haltOnFailure = True )) @@ -438,7 +628,16 @@ EOT''' %(ts[0], ts[0], ts[1]) )) 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"], + env = MakeEnv(), + haltOnFailure = True + )) + + factory.addStep(ShellCommand( + name = "diffconfig", + description = "Generating config.seed", + command=["make", "-j1", "diffconfig", "V=s"], + env = MakeEnv(), haltOnFailure = True )) @@ -446,6 +645,7 @@ EOT''' %(ts[0], ts[0], ts[1]) )) name = "checksums", description = "Calculating checksums", command=["make", "-j1", "checksum", "V=s"], + env = MakeEnv(), haltOnFailure = True )) @@ -474,7 +674,8 @@ EOT''' %(ts[0], ts[0], ts[1]) )) factory.addStep(MasterShellCommand( name = "signfiles", description = "Signing files", - command = ["%s/signall.sh" %(home_dir), "%s/signing/%s.%s.tar.gz" %(home_dir, ts[0], ts[1]), gpg_keyid, gpg_passfile, gpg_comment], + 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 )) @@ -493,9 +694,24 @@ EOT''' %(ts[0], ts[0], ts[1]) )) # 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 @@ -504,7 +720,9 @@ EOT''' %(ts[0], ts[0], ts[1]) )) 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 @@ -514,7 +732,7 @@ EOT''' %(ts[0], ts[0], ts[1]) )) 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 @@ -544,7 +762,7 @@ EOT''' %(ts[0], ts[0], ts[1]) )) from buildbot.config import BuilderConfig - c['builders'].append(BuilderConfig(name=target, slavenames=slaveNames, factory=factory)) + c['builders'].append(BuilderConfig(name=target, slavenames=slaveNames, factory=factory, nextBuild=GetNextBuild)) ####### STATUS TARGETS