X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=phase1%2Fmaster.cfg;h=bc21f809543e62cb3ad5c26692cec38090666475;hb=17b4c63900a461ef5ae3c5cdaed7e8d255847fde;hp=edc3f280501e8127028fa9a70304bf28c4fbbc77;hpb=b71f4a13b2986dff0a6ed551ea4123e99a58df4a;p=buildbot.git diff --git a/phase1/master.cfg b/phase1/master.cfg index edc3f28..bc21f80 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -25,31 +25,62 @@ c = BuildmasterConfig = {} # slave name and password must be configured on the slave. from buildbot.buildslave import BuildSlave +slave_port = 9989 + +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 # --master option) -c['slavePortnum'] = 9989 +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("repo", "branch") rsync_bin_url = ini.get("rsync", "binary_url") rsync_bin_key = ini.get("rsync", "binary_password") @@ -61,9 +92,32 @@ 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") + +if ini.has_option("gpg", "comment"): + gpg_comment = ini.get("gpg", "comment") + +if ini.has_option("gpg", "passfile"): + gpg_passfile = ini.get("gpg", "passfile") + + # find targets targets = [ ] +if not os.path.isdir(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') @@ -82,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 @@ -96,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)) @@ -111,79 +165,93 @@ 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 from buildbot.steps.transfer import FileDownload +from buildbot.steps.master import MasterShellCommand from buildbot.process.properties import WithProperties -MakeTargetMap = { - "^tools/": "tools/clean", - "^toolchain/": "toolchain/clean", - "^target/linux/": "target/linux/clean", - "^(config|include)/": "dirclean" -} +CleanTargetMap = [ + [ "tools", "tools/clean" ], + [ "chain", "toolchain/clean" ], + [ "linux", "target/linux/clean" ], + [ "dir", "dirclean" ], + [ "dist", "distclean" ] +] -def IsAffected(pattern): - def CheckAffected(change): - for request in change.build.requests: - for source in request.sources: - for change in source.changes: - for file in change.files: - if re.match(pattern, file): - return True - return False - return CheckAffected +def IsCleanRequested(pattern): + def CheckCleanProperty(step): + val = step.getProperty("clean") + if val and re.match(pattern, val): + return True + else: + return False -def isPathBuiltin(path): - incl = {} - pkgs = {} - conf = open(".config", "r") + return CheckCleanProperty - while True: - line = conf.readline() - if line == '': - break - m = re.match("^(CONFIG_PACKAGE_.+?)=y", line) - if m: - incl[m.group(1)] = True +def IsTaggingRequested(step): + val = step.getProperty("tag") + if val and re.match("^[0-9]+\.[0-9]+\.[0-9]+$", val): + return True + else: + return False - conf.close() +def IsNoTaggingRequested(step): + return not IsTaggingRequested(step) - deps = open("tmp/.packagedeps", "r") +def IsNoMasterBuild(step): + return repo_branch != "master" - while True: - line = deps.readline() - if line == '': - break - m = re.match("^package-\$\((CONFIG_PACKAGE_.+?)\) \+= (\S+)", line) - if m and incl.get(m.group(1)) == True: - pkgs["package/%s" % m.group(2)] = True +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 "" - deps.close() +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 - while path != '': - if pkgs.get(path) == True: - return True - path = os.path.dirname(path) +def GetCC(props): + if props.hasProperty("cc_command"): + return props["cc_command"] + else: + return "gcc" - return False +def GetCXX(props): + if props.hasProperty("cxx_command"): + return props["cxx_command"] + else: + return "g++" -def isChangeBuiltin(change): - return True -# for request in change.build.requests: -# for source in request.sources: -# for change in source.changes: -# for file in change.files: -# if isPathBuiltin(file): -# return True -# return False +def MakeEnv(overrides=None): + env = { + 'CC': WithProperties("%(cc)s", cc=GetCC), + 'CXX': WithProperties("%(cxx)s", cxx=GetCXX) + } + 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() { @@ -255,8 +323,105 @@ 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( + mastersrc = "expire.sh", + slavedest = "../expire.sh", + mode = 0755)) + + factory.addStep(ShellCommand( + name = "expire", + description = "Checking for build tree expiry", + command = ["./expire.sh", str(tree_expire)], + workdir = ".", + haltOnFailure = True, + timeout = 2400)) + + # user-requested clean targets + for tuple in CleanTargetMap: + factory.addStep(ShellCommand( + 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 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", @@ -269,36 +434,53 @@ for target in targets: # description = "Copy the feeds.conf", # command='''cp ~/feeds.conf ./feeds.conf''' )) + # feed + factory.addStep(ShellCommand( + name = "rmfeedlinks", + description = "Remove feed symlinks", + command=["rm", "-rf", "package/feeds/"])) + # feed 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())) + + # 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"] + )) + + # 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 -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", @@ -309,10 +491,11 @@ 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 / libc + # check arch factory.addStep(ShellCommand( name = "checkarch", description = "Checking architecture", @@ -323,15 +506,12 @@ EOT''' %(ts[0], ts[0], ts[1]) )) haltOnFailure = True )) - factory.addStep(ShellCommand( - name = "checklibc", - description = "Checking libc flavor", - command = ["grep", "-sq", 'CONFIG_LIBC="musl"', ".config"], - logEnviron = False, - want_stdout = False, - want_stderr = False, - haltOnFailure = True - )) + # find libc suffix + factory.addStep(SetProperty( + name = "libc", + property = "libc", + description = "Finding libc suffix", + command = ["sed", "-ne", '/^CONFIG_LIBC=/ { s!^CONFIG_LIBC="\\(.*\\)"!\\1!; s!^musl$!!; s!.\\+!-&!p }', ".config"])) # install build key factory.addStep(FileDownload(mastersrc=home_dir+'/key-build', slavedest="key-build", mode=0600)) @@ -341,16 +521,26 @@ EOT''' %(ts[0], ts[0], ts[1]) )) factory.addStep(ShellCommand( name = "dldir", description = "Preparing dl/", - command = "mkdir -p $HOME/dl && ln -sf $HOME/dl ./dl", + command = "mkdir -p $HOME/dl && rm -rf ./dl && ln -sf $HOME/dl ./dl", logEnviron = False, want_stdout = False )) + # prepare tar + factory.addStep(ShellCommand( + name = "dltar", + description = "Building GNU tar", + command = ["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "tools/tar/install", "V=s"], + env = MakeEnv(), + haltOnFailure = True + )) + # populate dl 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')] )) @@ -361,41 +551,43 @@ EOT''' %(ts[0], ts[0], ts[1]) )) command=["make", "package/base-files/clean", "V=s"] )) - # optional clean steps - for pattern, maketarget in MakeTargetMap.items(): - factory.addStep(ShellCommand( - name = maketarget, - description = maketarget, - command=["make", maketarget, "V=s"], doStepIf=IsAffected(pattern) - )) - # build 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 )) @@ -404,15 +596,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"], - doStepIf = isChangeBuiltin, + 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 )) @@ -420,16 +613,90 @@ EOT''' %(ts[0], ts[0], ts[1]) )) factory.addStep(ShellCommand( name = "images", description = "Building images", - command=["make", "-j1", "target/install", "V=s"], - doStepIf = isChangeBuiltin, + 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 )) + factory.addStep(ShellCommand( + name = "checksums", + description = "Calculating checksums", + command=["make", "-j1", "checksum", "V=s"], + env = MakeEnv(), + haltOnFailure = True + )) + + # sign + if gpg_keyid is not None: + factory.addStep(MasterShellCommand( + name = "signprepare", + description = "Preparing temporary signing directory", + command = ["mkdir", "-p", "%s/signing" %(home_dir)], + haltOnFailure = True + )) + + factory.addStep(ShellCommand( + name = "signpack", + description = "Packing files to sign", + command = WithProperties("find bin/targets/%s/%s%%(libc)s/ -mindepth 1 -maxdepth 2 -type f -name sha256sums -print0 -or -name Packages -print0 | xargs -0 tar -czf sign.tar.gz" %(ts[0], ts[1])), + haltOnFailure = True + )) + + factory.addStep(FileUpload( + slavesrc = "sign.tar.gz", + masterdest = "%s/signing/%s.%s.tar.gz" %(home_dir, ts[0], ts[1]), + haltOnFailure = True + )) + + 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_comment], + env = {'GNUPGHOME': gpg_home, 'PASSFILE': gpg_passfile}, + haltOnFailure = True + )) + + factory.addStep(FileDownload( + mastersrc = "%s/signing/%s.%s.tar.gz" %(home_dir, ts[0], ts[1]), + slavedest = "sign.tar.gz", + haltOnFailure = True + )) + + factory.addStep(ShellCommand( + name = "signunpack", + description = "Unpacking signed files", + command = ["tar", "-xzf", "sign.tar.gz"], + haltOnFailure = True + )) + # 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 @@ -438,7 +705,9 @@ EOT''' %(ts[0], ts[0], ts[1]) )) factory.addStep(ShellCommand( name = "targetupload", description = "Uploading target files", - command=["rsync", "--delete", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(slavename)s"), "-avz", "bin/targets/%s/%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 @@ -448,7 +717,7 @@ EOT''' %(ts[0], ts[0], ts[1]) )) factory.addStep(ShellCommand( name = "sourceupload", description = "Uploading source archives", - command=["rsync", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(slavename)s"), "-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 @@ -458,7 +727,7 @@ EOT''' %(ts[0], ts[0], ts[1]) )) factory.addStep(ShellCommand( name = "packageupload", description = "Uploading package files", - command=["rsync", "--delete", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(slavename)s"), "-avz", "bin/packages/", "%s/packages/" %(rsync_bin_url)], + command=["rsync", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "bin/packages/", "%s/packages/" %(rsync_bin_url)], env={'RSYNC_PASSWORD': rsync_bin_key}, haltOnFailure = False, logEnviron = False @@ -469,7 +738,7 @@ EOT''' %(ts[0], ts[0], ts[1]) )) factory.addStep(ShellCommand( name = "upload", description = "Uploading logs", - command=["rsync", "--delete", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(slavename)s"), "-avz", "logs/", "%s/logs/%s/%s/" %(rsync_bin_url, ts[0], ts[1])], + command=["rsync", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "logs/", "%s/logs/%s/%s/" %(rsync_bin_url, ts[0], ts[1])], env={'RSYNC_PASSWORD': rsync_bin_key}, haltOnFailure = False, alwaysRun = True, @@ -498,7 +767,7 @@ if ini.has_option("status", "bind"): # change any of these to True to enable; see the manual for more # options auth=auth.BasicAuth([(ini.get("status", "user"), ini.get("status", "password"))]), - gracefulShutdown = False, + gracefulShutdown = 'auth', forceBuild = 'auth', # use this to test your slave once it is set up forceAllBuilds = 'auth', pingBuilder = False, @@ -527,12 +796,12 @@ if ini.has_option("irc", "host") and ini.has_option("irc", "nickname") and ini.h irc_pass = ini.get("irc", "password") irc = words.IRC(irc_host, irc_nick, port = irc_port, password = irc_pass, - channels = [{ "channel": irc_chan }], - notify_events = { - 'exception': 1, - 'successToFailure': 1, - 'failureToSuccess': 1 - } + channels = [{ "channel": irc_chan }], + notify_events = { + 'exception': 1, + 'successToFailure': 1, + 'failureToSuccess': 1 + } ) c['status'].append(irc)