repo_url = ini.get("repo", "url")
-rsync_url = ini.get("rsync", "url")
-rsync_key = ini.get("rsync", "password")
+rsync_bin_url = ini.get("rsync", "binary_url")
+rsync_bin_key = ini.get("rsync", "binary_password")
+
+rsync_src_url = None
+rsync_src_key = None
+
+if ini.has_option("rsync", "source_url"):
+ rsync_src_url = ini.get("rsync", "source_url")
+ rsync_src_key = ini.get("rsync", "source_password")
# find targets
targets = [ ]
from buildbot.process.factory import BuildFactory
from buildbot.steps.source import Git
from buildbot.steps.shell import ShellCommand
+from buildbot.steps.shell import SetProperty
from buildbot.steps.transfer import FileDownload
+from buildbot.process.properties import WithProperties
MakeTargetMap = {
factory = BuildFactory()
+ # find number of cores
+ factory.addStep(SetProperty(
+ name = "nproc",
+ property = "nproc",
+ description = "Finding number of CPUs",
+ command = ["nproc"]))
+
# check out the source
factory.addStep(Git(repourl=repo_url, mode='update'))
CONFIG_CCACHE=y
CONFIG_SIGNED_PACKAGES=y
# CONFIG_PER_FEED_REPO_ADD_COMMENTED is not set
-CONFIG_KERNEL_KALLSYMS=y
+CONFIG_KERNEL_KALLSYMS=y
CONFIG_COLLECT_KERNEL_DEBUG=y
EOT''' %(ts[0], ts[0], ts[1]) ))
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=0400))
- factory.addStep(FileDownload(mastersrc=home_dir+'/key-build.pub', slavedest="key-build.pub", mode=0400))
+ 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))
# prepare dl
factory.addStep(ShellCommand(
factory.addStep(ShellCommand(
name = "dlrun",
description = "Populating dl/",
- command = ["make", "-j4", "download", "V=s"],
+ command = ["make", WithProperties("-j%(nproc:~4)s"), "download", "V=s"],
logEnviron = False,
locks = [dlLock.access('exclusive')]
))
factory.addStep(ShellCommand(
name = "tools",
description = "Building tools",
- command = ["make", "-j4", "tools/install", "V=s"],
+ command = ["make", WithProperties("-j%(nproc:~4)s"), "tools/install", "V=s"],
haltOnFailure = True
))
factory.addStep(ShellCommand(
name = "toolchain",
description = "Building toolchain",
- command=["make", "-j4", "toolchain/install", "V=s"],
+ command=["make", WithProperties("-j%(nproc:~4)s"), "toolchain/install", "V=s"],
haltOnFailure = True
))
factory.addStep(ShellCommand(
name = "kmods",
description = "Building kmods",
- command=["make", "-j4", "target/compile", "V=s", "IGNORE_ERRORS=n m", "BUILD_LOG=1"],
+ command=["make", WithProperties("-j%(nproc:~4)s"), "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", "-j4", "package/compile", "V=s", "IGNORE_ERRORS=n m", "BUILD_LOG=1"],
+ command=["make", WithProperties("-j%(nproc:~4)s"), "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", "-j4", "package/install", "V=s"],
+ command=["make", WithProperties("-j%(nproc:~4)s"), "package/install", "V=s"],
doStepIf = isChangeBuiltin,
haltOnFailure = True
))
factory.addStep(ShellCommand(
name = "pkgindex",
description = "Indexing packages",
- command=["make", "-j4", "package/index", "V=s"],
+ command=["make", WithProperties("-j%(nproc:~4)s"), "package/index", "V=s"],
haltOnFailure = True
))
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_url)],
- env={'RSYNC_PASSWORD': rsync_key},
+ 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)],
+ env={'RSYNC_PASSWORD': rsync_bin_key},
haltOnFailure = True,
logEnviron = False
))
factory.addStep(ShellCommand(
name = "targetupload",
description = "Uploading target files",
- command=["rsync", "--delete", "-avz", "bin/targets/%s/%s/" %(ts[0], ts[1]), "%s/targets/%s/%s/" %(rsync_url, ts[0], ts[1])],
- env={'RSYNC_PASSWORD': rsync_key},
+ command=["rsync", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "bin/targets/%s/%s%s/" %(ts[0], ts[1], WithProperties("%(libc)s")), "%s/targets/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
+ env={'RSYNC_PASSWORD': rsync_bin_key},
haltOnFailure = True,
logEnviron = False
))
+ if rsync_src_url is not None:
+ factory.addStep(ShellCommand(
+ name = "sourceupload",
+ description = "Uploading source archives",
+ command=["rsync", "--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
+ ))
+
if False:
factory.addStep(ShellCommand(
name = "packageupload",
description = "Uploading package files",
- command=["rsync", "--delete", "-avz", "bin/packages/", "%s/packages/" %(rsync_url)],
- env={'RSYNC_PASSWORD': rsync_key},
+ 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
))
factory.addStep(ShellCommand(
name = "upload",
description = "Uploading logs",
- command=["rsync", "--delete", "-avz", "logs/", "%s/logs/%s/%s/" %(rsync_url, ts[0], ts[1])],
- env={'RSYNC_PASSWORD': rsync_key},
+ 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,
logEnviron = False
# 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,
else:
c['status'].append(html.WebStatus(http_port=ini.get("status", "bind")))
+
+from buildbot.status import words
+
+if ini.has_option("irc", "host") and ini.has_option("irc", "nickname") and ini.has_option("irc", "channel"):
+ irc_host = ini.get("irc", "host")
+ irc_port = 6667
+ irc_chan = ini.get("irc", "channel")
+ irc_nick = ini.get("irc", "nickname")
+ irc_pass = None
+
+ if ini.has_option("irc", "port"):
+ irc_port = ini.getint("irc", "port")
+
+ if ini.has_option("irc", "password"):
+ 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
+ }
+ )
+
+ c['status'].append(irc)
+
+
####### PROJECT IDENTITY
# the 'title' string will appear at the top of this buildbot
# this at its default for all but the largest installations.
'db_url' : "sqlite:///state.sqlite",
}
-