X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=phase1%2Fmaster.cfg;h=b9bbf1214839ee08e410e7a3c48c1b66473f0632;hb=eaf8408145a72e13fbb602c172487d644ab8cfc8;hp=91cc1a7409cf79c1fc1e270fbb633bd39b901de6;hpb=5ac39cda9c32b4be2edf9147002212d6f8d6abad;p=buildbot.git diff --git a/phase1/master.cfg b/phase1/master.cfg index 91cc1a7..b9bbf12 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -59,6 +59,10 @@ if ini.has_option("general", "expire"): tree_expire = ini.getint("general", "expire") repo_url = ini.get("repo", "url") +repo_branch = "master" + +if ini.has_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") @@ -70,10 +74,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") @@ -88,7 +96,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", "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') @@ -108,7 +118,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 @@ -122,7 +132,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)) @@ -137,7 +147,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 @@ -164,10 +174,39 @@ def IsCleanRequested(pattern): 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 "" + c['builders'] = [] dlLock = locks.SlaveLock("slave_dl") +tagLock = locks.MasterLock("make_tag") checkBuiltin = re.sub('[\t\n ]+', ' ', """ checkBuiltin() { @@ -263,8 +302,59 @@ for target in targets: 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, 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", @@ -295,27 +385,19 @@ for target in targets: description = "Installing feeds", command=["./scripts/feeds", "install", "-a"])) + # 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", @@ -469,7 +551,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 )) @@ -488,9 +571,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 @@ -499,7 +597,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", "--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