import os
import re
+import base64
import subprocess
import ConfigParser
# 'master.cfg' in your buildmaster's base directory.
ini = ConfigParser.ConfigParser()
-ini.read("./config.ini")
+ini.read(os.getenv("BUILDMASTER_CONFIG", "./config.ini"))
# This is the dictionary that the buildmaster pays attention to. We also use
# a shorter alias to save typing.
# with an externally-visible host name which the buildbot cannot figure out
# without some help.
-c['buildbotURL'] = ini.get("general", "buildbot_url")
+c['buildbotURL'] = ini.get("phase1", "buildbot_url")
####### BUILDSLAVES
slave_port = 9989
-if ini.has_option("general", "port"):
- slave_port = ini.getint("general", "port")
+if ini.has_option("phase1", "port"):
+ slave_port = ini.getint("phase1", "port")
c['slaves'] = []
-max_builds = dict()
-do_cleanup = dict()
NetLocks = dict()
for section in ini.sections():
if section.startswith("slave "):
- if ini.has_option(section, "name") and ini.has_option(section, "password"):
- sl_props = { 'dl_lock':None, 'ul_lock':None, }
+ if ini.has_option(section, "name") and ini.has_option(section, "password") and \
+ (not ini.has_option(section, "phase") or ini.getint(section, "phase") == 1):
+ sl_props = { 'dl_lock':None, 'ul_lock':None, 'do_cleanup':False, 'max_builds':1, 'shared_wd':False }
name = ini.get(section, "name")
password = ini.get(section, "password")
- max_builds[name] = 1
- do_cleanup[name] = False
+ max_builds = 1
if ini.has_option(section, "builds"):
- max_builds[name] = ini.getint(section, "builds")
+ max_builds = ini.getint(section, "builds")
+ sl_props['max_builds'] = max_builds
+ if max_builds == 1:
+ sl_props['shared_wd'] = True
if ini.has_option(section, "cleanup"):
- do_cleanup[name] = ini.getboolean(section, "cleanup")
+ sl_props['do_cleanup'] = ini.getboolean(section, "cleanup")
if ini.has_option(section, "dl_lock"):
lockname = ini.get(section, "dl_lock")
sl_props['dl_lock'] = lockname
sl_props['ul_lock'] = lockname
if lockname not in NetLocks:
NetLocks[lockname] = locks.MasterLock(lockname)
- c['slaves'].append(BuildSlave(name, password, max_builds = max_builds[name], properties = sl_props))
+ if ini.has_option(section, "shared_wd"):
+ shared_wd = ini.getboolean(section, "shared_wd")
+ sl_props['shared_wd'] = shared_wd
+ if shared_wd and (max_builds != 1):
+ raise ValueError('max_builds must be 1 with shared workdir!')
+ c['slaves'].append(BuildSlave(name, password, max_builds = max_builds, properties = sl_props))
# 'slavePortnum' defines the TCP port to listen on for connections from slaves.
# This must match the value configured into the buildslaves (with their
####### CHANGESOURCES
-home_dir = os.path.abspath(ini.get("general", "homedir"))
+work_dir = os.path.abspath(ini.get("general", "workdir") or ".")
+scripts_dir = os.path.abspath("../scripts")
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")
+config_seed = ""
-if ini.has_option("general", "other_builds"):
- other_builds = ini.getint("general", "other_builds")
+git_ssh = False
+git_ssh_key = None
-if ini.has_option("general", "cc_version"):
- cc_version = ini.get("general", "cc_version").split()
+if ini.has_option("phase1", "expire"):
+ tree_expire = ini.getint("phase1", "expire")
+
+if ini.has_option("phase1", "other_builds"):
+ other_builds = ini.getint("phase1", "other_builds")
+
+if ini.has_option("phase1", "cc_version"):
+ cc_version = ini.get("phase1", "cc_version").split()
if len(cc_version) == 1:
cc_version = ["eq", cc_version[0]]
+if ini.has_option("general", "git_ssh"):
+ git_ssh = ini.getboolean("general", "git_ssh")
+
+if ini.has_option("general", "git_ssh_key"):
+ git_ssh_key = ini.get("general", "git_ssh_key")
+else:
+ git_ssh = False
+
+if ini.has_option("phase1", "config_seed"):
+ config_seed = ini.get("phase1", "config_seed")
+
repo_url = ini.get("repo", "url")
repo_branch = "master"
rsync_bin_url = ini.get("rsync", "binary_url")
rsync_bin_key = ini.get("rsync", "binary_password")
+rsync_bin_defopts = ["-v", "-4", "--timeout=120"]
+
+if rsync_bin_url.find("::") > 0 or rsync_bin_url.find("rsync://") == 0:
+ rsync_bin_defopts += ["--contimeout=20"]
rsync_src_url = None
rsync_src_key = None
+rsync_src_defopts = ["-v", "-4", "--timeout=120"]
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 rsync_src_url.find("::") > 0 or rsync_src_url.find("rsync://") == 0:
+ rsync_src_defopts += ["--contimeout=20"]
-if ini.has_option("gpg", "keyid"):
- gpg_keyid = ini.get("gpg", "keyid")
+usign_key = None
+usign_comment = "untrusted comment: " + repo_branch.replace("-", " ").title() + " key"
-if ini.has_option("gpg", "comment"):
- gpg_comment = ini.get("gpg", "comment")
+if ini.has_option("usign", "key"):
+ usign_key = ini.get("usign", "key")
-if ini.has_option("gpg", "passfile"):
- gpg_passfile = ini.get("gpg", "passfile")
+if ini.has_option("usign", "comment"):
+ usign_comment = ini.get("usign", "comment")
enable_kmod_archive = True
# 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'])
+if not os.path.isdir(work_dir+'/source.git'):
+ subprocess.call(["git", "clone", "--depth=1", "--branch="+repo_branch, repo_url, work_dir+'/source.git'])
else:
- subprocess.call(["git", "pull"], cwd = home_dir+'/source.git')
+ subprocess.call(["git", "pull"], cwd = work_dir+'/source.git')
-findtargets = subprocess.Popen([home_dir+'/dumpinfo.pl', 'targets'],
- stdout = subprocess.PIPE, cwd = home_dir+'/source.git')
+findtargets = subprocess.Popen([scripts_dir + '/dumpinfo.pl', 'targets'],
+ stdout = subprocess.PIPE, cwd = work_dir+'/source.git')
while True:
line = findtargets.stdout.readline()
c['change_source'] = []
c['change_source'].append(GitPoller(
repo_url,
- workdir=home_dir+'/work.git', branch=repo_branch,
+ workdir=work_dir+'/work.git', branch=repo_branch,
pollinterval=300))
####### SCHEDULERS
from buildbot.process.factory import BuildFactory
from buildbot.steps.source.git import Git
from buildbot.steps.shell import ShellCommand
-from buildbot.steps.shell import SetProperty
+from buildbot.steps.shell import SetPropertyFromCommand
from buildbot.steps.transfer import FileUpload
from buildbot.steps.transfer import FileDownload
+from buildbot.steps.transfer import StringDownload
from buildbot.steps.master import MasterShellCommand
-from buildbot.process.properties import WithProperties
+from buildbot.process.properties import Interpolate
from buildbot.process import properties
return CheckCleanProperty
+def IsSharedWorkdir(step):
+ return bool(step.getProperty("shared_wd"))
+
def IsCleanupRequested(step):
- val = step.getProperty("slavename")
- if val and do_cleanup[val]:
+ if IsSharedWorkdir(step):
+ return False
+ do_cleanup = step.getProperty("do_cleanup")
+ if do_cleanup:
return True
else:
return False
+def IsExpireRequested(step):
+ if IsSharedWorkdir(step):
+ return False
+ else:
+ return not IsCleanupRequested(step)
+
+def IsGitFreshRequested(step):
+ do_cleanup = step.getProperty("do_cleanup")
+ if do_cleanup:
+ return True
+ else:
+ return False
+
+def IsGitCleanRequested(step):
+ return not IsGitFreshRequested(step)
+
def IsTaggingRequested(step):
val = step.getProperty("tag")
if val and re.match("^[0-9]+\.[0-9]+\.[0-9]+(?:-rc[0-9]+)?$", val):
def IsNoMasterBuild(step):
return repo_branch != "master"
-def IsCleanupConfigured(step):
- slave = step.getProperty("slavename")
- if slave and slave in do_cleanup:
- return do_cleanup[slave] > 0
- else:
- return False
-
-def GetBaseVersion(props):
+def GetBaseVersion():
if re.match("^[^-]+-[0-9]+\.[0-9]+$", repo_branch):
return repo_branch.split('-')[1]
else:
return "master"
+@properties.renderer
def GetVersionPrefix(props):
- basever = GetBaseVersion(props)
+ basever = GetBaseVersion()
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":
else:
return ""
+@properties.renderer
def GetNumJobs(props):
- if props.hasProperty("slavename") and props.hasProperty("nproc"):
- return ((int(props["nproc"]) / (max_builds[props["slavename"]] + other_builds)) + 1)
+ if props.hasProperty("max_builds") and props.hasProperty("nproc"):
+ return str(int(props["nproc"]) / (props["max_builds"] + other_builds))
else:
- return 1
+ return "1"
+@properties.renderer
def GetCC(props):
if props.hasProperty("cc_command"):
return props["cc_command"]
else:
return "gcc"
+@properties.renderer
def GetCXX(props):
if props.hasProperty("cxx_command"):
return props["cxx_command"]
else:
return "g++"
+@properties.renderer
def GetCwd(props):
if props.hasProperty("builddir"):
return props["builddir"]
else:
return "/"
+@properties.renderer
+def GetCCache(props):
+ if props.hasProperty("ccache_command") and "ccache" in props["ccache_command"]:
+ return props["ccache_command"]
+ 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):
+def MakeEnv(overrides=None, tryccache=False):
env = {
- 'CC': WithProperties("%(cc)s", cc=GetCC),
- 'CXX': WithProperties("%(cxx)s", cxx=GetCXX),
- 'CCACHE_BASEDIR': WithProperties("%(cwd)s", cwd=GetCwd)
+ 'CCC': Interpolate("%(kw:cc)s", cc=GetCC),
+ 'CCXX': Interpolate("%(kw:cxx)s", cxx=GetCXX),
}
+ if tryccache:
+ env['CC'] = Interpolate("%(kw:cwd)s/ccache_cc.sh", cwd=GetCwd)
+ env['CXX'] = Interpolate("%(kw:cwd)s/ccache_cxx.sh", cwd=GetCwd)
+ env['CCACHE'] = Interpolate("%(kw:ccache)s", ccache=GetCCache)
+ else:
+ env['CC'] = env['CCC']
+ env['CXX'] = env['CCXX']
+ env['CCACHE'] = ''
if overrides is not None:
env.update(overrides)
return env
else:
return []
+def UsignSec2Pub(seckey, comment="untrusted comment: secret key"):
+ try:
+ seckey = base64.b64decode(seckey)
+ except:
+ return None
+
+ return "{}\n{}".format(re.sub(r"\bsecret key$", "public key", comment),
+ base64.b64encode(seckey[0:2] + seckey[32:40] + seckey[72:]))
+
+
c['builders'] = []
dlLock = locks.SlaveLock("slave_dl")
factory = BuildFactory()
+ # setup shared work directory if required
+ factory.addStep(ShellCommand(
+ name = "sharedwd",
+ description = "Setting up shared work directory",
+ command = 'test -L "$PWD" || (mkdir -p ../shared-workdir && rm -rf "$PWD" && ln -s shared-workdir "$PWD")',
+ workdir = ".",
+ haltOnFailure = True,
+ doStepIf = IsSharedWorkdir))
+
# find number of cores
- factory.addStep(SetProperty(
+ factory.addStep(SetPropertyFromCommand(
name = "nproc",
property = "nproc",
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))
+ factory.addStep(FileDownload(
+ name = "dlfindbinpl",
+ mastersrc = scripts_dir + '/findbin.pl',
+ slavedest = "../findbin.pl",
+ mode = 0755))
+
+ factory.addStep(SetPropertyFromCommand(
+ name = "gcc",
+ property = "cc_command",
+ description = "Finding gcc command",
+ command = [
+ "../findbin.pl", "gcc",
+ cc_version[0] if cc_version is not None else '',
+ cc_version[1] if cc_version is not None else ''
+ ],
+ haltOnFailure = True))
+
+ factory.addStep(SetPropertyFromCommand(
+ name = "g++",
+ property = "cxx_command",
+ description = "Finding g++ command",
+ command = [
+ "../findbin.pl", "g++",
+ cc_version[0] if cc_version is not None else '',
+ cc_version[1] if cc_version is not None else ''
+ ],
+ haltOnFailure = True))
+
+ # see if ccache is available
+ factory.addStep(SetPropertyFromCommand(
+ property = "ccache_command",
+ command = ["which", "ccache"],
+ description = "Testing for ccache command",
+ haltOnFailure = False,
+ flunkOnFailure = False,
+ warnOnFailure = False,
+ ))
# expire tree if needed
if tree_expire > 0:
factory.addStep(FileDownload(
- mastersrc = "expire.sh",
+ name = "dlexpiresh",
+ doStepIf = IsExpireRequested,
+ mastersrc = scripts_dir + '/expire.sh',
slavedest = "../expire.sh",
mode = 0755))
command = ["./expire.sh", str(tree_expire)],
workdir = ".",
haltOnFailure = True,
+ doStepIf = IsExpireRequested,
timeout = 2400))
# cleanup.sh if needed
factory.addStep(FileDownload(
- mastersrc = "cleanup.sh",
+ name = "dlcleanupsh",
+ mastersrc = scripts_dir + '/cleanup.sh',
slavedest = "../cleanup.sh",
mode = 0755,
doStepIf = IsCleanupRequested))
factory.addStep(ShellCommand(
name = "cleanold",
description = "Cleaning previous builds",
- command = ["./cleanup.sh", c['buildbotURL'], WithProperties("%(slavename)s"), WithProperties("%(buildername)s"), "full"],
+ command = ["./cleanup.sh", c['buildbotURL'], Interpolate("%(prop:slavename)s"), Interpolate("%(prop:buildername)s"), "full"],
workdir = ".",
haltOnFailure = True,
doStepIf = IsCleanupRequested,
factory.addStep(ShellCommand(
name = "cleanup",
description = "Cleaning work area",
- command = ["./cleanup.sh", c['buildbotURL'], WithProperties("%(slavename)s"), WithProperties("%(buildername)s"), "single"],
+ command = ["./cleanup.sh", c['buildbotURL'], Interpolate("%(prop:slavename)s"), Interpolate("%(prop:buildername)s"), "single"],
workdir = ".",
haltOnFailure = True,
doStepIf = IsCleanupRequested,
doStepIf = IsMakeCleanRequested(tuple[0])
))
- # switch to branch
+ # Workaround bug when switching from a checked out tag back to a branch
+ # Ref: http://lists.infradead.org/pipermail/openwrt-devel/2019-June/017809.html
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,
- locks = NetLockDl,
- ))
+ name = "gitcheckout",
+ description = "Ensure that Git HEAD is sane",
+ command = "if [ -d .git ]; then git checkout -f %s; git branch --set-upstream-to origin/%s; else exit 0; fi" %(repo_branch, repo_branch),
+ haltOnFailure = True))
# check out the source
+ # Git() runs:
+ # if repo doesn't exist: 'git clone repourl'
+ # method 'clean' runs 'git clean -d -f', method fresh runs 'git clean -d -f x'. Only works with mode='full'
+ # 'git fetch -t repourl branch; git reset --hard revision'
+ # Git() parameters can't take a renderer until buildbot 0.8.10, so we have to split the fresh and clean cases
+ # if buildbot is updated, one can use: method = Interpolate('%(prop:do_cleanup:#?|fresh|clean)s')
factory.addStep(Git(
+ name = "gitclean",
repourl = repo_url,
branch = repo_branch,
- mode = 'incremental',
+ mode = 'full',
method = 'clean',
- locks = NetLockDl,
+ haltOnFailure = True,
+ doStepIf = IsGitCleanRequested,
+ ))
+
+ factory.addStep(Git(
+ name = "gitfresh",
+ repourl = repo_url,
+ branch = repo_branch,
+ mode = 'full',
+ method = 'fresh',
+ haltOnFailure = True,
+ doStepIf = IsGitFreshRequested,
))
# update remote refs
haltOnFailure = True
))
- # fetch tags
- factory.addStep(ShellCommand(
- name = "fetchtag",
- description = "Fetching Git tags",
- command = ["git", "fetch", "--tags", "--", repo_url],
- haltOnFailure = True,
- doStepIf = IsTaggingRequested,
- locks = NetLockDl,
- ))
-
# switch to tag
factory.addStep(ShellCommand(
name = "switchtag",
description = "Checking out Git tag",
- command = ["git", "checkout", WithProperties("tags/v%(tag:-)s")],
+ command = ["git", "checkout", Interpolate("tags/v%(prop:tag:-)s")],
haltOnFailure = True,
doStepIf = IsTaggingRequested
))
+ # Verify that Git HEAD points to a tag or branch
+ # Ref: http://lists.infradead.org/pipermail/openwrt-devel/2019-June/017809.html
+ factory.addStep(ShellCommand(
+ name = "gitverify",
+ description = "Ensure that Git HEAD is pointing to a branch or tag",
+ command = 'git rev-parse --abbrev-ref HEAD | grep -vxqF HEAD || git show-ref --tags --dereference 2>/dev/null | sed -ne "/^$(git rev-parse HEAD) / { s|^.*/||; s|\\^.*||; p }" | grep -qE "^v[0-9][0-9]\\."',
+ haltOnFailure = True))
+
factory.addStep(ShellCommand(
name = "rmtmp",
description = "Remove tmp folder",
description = "Remove feed symlinks",
command=["rm", "-rf", "package/feeds/"]))
+ factory.addStep(StringDownload(
+ name = "ccachecc",
+ s = '#!/bin/sh\nexec ${CCACHE} ${CCC} "$@"\n',
+ slavedest = "../ccache_cc.sh",
+ mode = 0755,
+ ))
+
+ factory.addStep(StringDownload(
+ name = "ccachecxx",
+ s = '#!/bin/sh\nexec ${CCACHE} ${CCXX} "$@"\n',
+ slavedest = "../ccache_cxx.sh",
+ mode = 0755,
+ ))
+
+ # Git SSH
+ if git_ssh:
+ factory.addStep(StringDownload(
+ name = "dlgitclonekey",
+ s = git_ssh_key,
+ slavedest = "../git-clone.key",
+ mode = 0600,
+ ))
+
+ factory.addStep(ShellCommand(
+ name = "patchfeedsconf",
+ description = "Patching feeds.conf",
+ command="sed -e 's#https://#ssh://git@#g' feeds.conf.default > feeds.conf",
+ haltOnFailure = True
+ ))
+
# feed
factory.addStep(ShellCommand(
name = "updatefeeds",
description = "Updating feeds",
command=["./scripts/feeds", "update"],
- env = MakeEnv(),
- locks = NetLockDl,
+ env = MakeEnv(tryccache=True, overrides={'GIT_SSH_COMMAND': Interpolate("ssh -o IdentitiesOnly=yes -o IdentityFile=%(kw:cwd)s/git-clone.key -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no", cwd=GetCwd)} if git_ssh else {}),
+ haltOnFailure = True
))
+ # Git SSH
+ if git_ssh:
+ factory.addStep(ShellCommand(
+ name = "rmfeedsconf",
+ description = "Removing feeds.conf",
+ command=["rm", "feeds.conf"],
+ haltOnFailure = True
+ ))
+
# feed
factory.addStep(ShellCommand(
name = "installfeeds",
description = "Installing feeds",
command=["./scripts/feeds", "install", "-a"],
- env = MakeEnv()))
+ env = MakeEnv(tryccache=True),
+ haltOnFailure = True
+ ))
# seed config
- factory.addStep(FileDownload(
- mastersrc = "config.seed",
- slavedest = ".config",
- mode = 0644
- ))
+ if config_seed is not None:
+ factory.addStep(StringDownload(
+ name = "dlconfigseed",
+ s = config_seed + '\n',
+ slavedest = ".config",
+ mode = 0644
+ ))
# configure
factory.addStep(ShellCommand(
name = "newconfig",
description = "Seeding .config",
- command = "printf 'CONFIG_TARGET_%s=y\\nCONFIG_TARGET_%s_%s=y\\n' >> .config" %(ts[0], ts[0], ts[1])
+ command = "printf 'CONFIG_TARGET_%s=y\\nCONFIG_TARGET_%s_%s=y\\nCONFIG_SIGNED_PACKAGES=%s\\n' >> .config" %(ts[0], ts[0], ts[1], 'y' if usign_key is not None else 'n')
))
factory.addStep(ShellCommand(
))
# find libc suffix
- factory.addStep(SetProperty(
+ factory.addStep(SetPropertyFromCommand(
name = "libc",
property = "libc",
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
- ))
+ # install build key
+ if usign_key is not None:
+ factory.addStep(StringDownload(
+ name = "dlkeybuildpub",
+ s = UsignSec2Pub(usign_key, usign_comment),
+ slavedest = "key-build.pub",
+ mode = 0600,
+ ))
- # ccache prepare
- factory.addStep(ShellCommand(
- name = "prepccache",
- description = "Preparing ccache",
- command = ["./ccache.sh"]
- ))
+ factory.addStep(StringDownload(
+ name = "dlkeybuild",
+ s = "# fake private key",
+ slavedest = "key-build",
+ mode = 0600,
+ ))
- # 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))
+ factory.addStep(StringDownload(
+ name = "dlkeybuilducert",
+ s = "# fake certificate",
+ slavedest = "key-build.ucert",
+ mode = 0600,
+ ))
# prepare dl
factory.addStep(ShellCommand(
# prepare tar
factory.addStep(ShellCommand(
name = "dltar",
- description = "Building GNU tar",
- command = ["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "tools/tar/compile", "V=s"],
- env = MakeEnv(),
+ description = "Building and installing GNU tar",
+ command = ["make", Interpolate("-j%(kw:jobs)s", jobs=GetNumJobs), "tools/tar/compile", "V=s"],
+ env = MakeEnv(tryccache=True),
haltOnFailure = True
))
factory.addStep(ShellCommand(
name = "dlrun",
description = "Populating dl/",
- command = ["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "download", "V=s"],
+ command = ["make", Interpolate("-j%(kw:jobs)s", jobs=GetNumJobs), "download", "V=s"],
env = MakeEnv(),
logEnviron = False,
- locks = properties.FlattenList(NetLockDl, [dlLock.access('exclusive')]),
+ locks = [dlLock.access('exclusive')],
))
factory.addStep(ShellCommand(
# build
factory.addStep(ShellCommand(
name = "tools",
- description = "Building tools",
- command = ["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "tools/install", "V=s"],
- env = MakeEnv(),
+ description = "Building and installing tools",
+ command = ["make", Interpolate("-j%(kw:jobs)s", jobs=GetNumJobs), "tools/install", "V=s"],
+ env = MakeEnv(tryccache=True),
haltOnFailure = True
))
factory.addStep(ShellCommand(
name = "toolchain",
- description = "Building toolchain",
- command=["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "toolchain/install", "V=s"],
+ description = "Building and installing toolchain",
+ command=["make", Interpolate("-j%(kw:jobs)s", jobs=GetNumJobs), "toolchain/install", "V=s"],
env = MakeEnv(),
haltOnFailure = True
))
factory.addStep(ShellCommand(
name = "kmods",
description = "Building kmods",
- command=["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "target/compile", "V=s", "IGNORE_ERRORS=n m", "BUILD_LOG=1"],
+ command=["make", Interpolate("-j%(kw:jobs)s", 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
))
# find kernel version
- factory.addStep(SetProperty(
+ factory.addStep(SetPropertyFromCommand(
name = "kernelversion",
property = "kernelversion",
description = "Finding the effective Kernel version",
- command = "make --no-print-directory -C target/linux/ val.LINUX_VERSION val.LINUX_RELEASE val.LINUX_VERMAGIC | xargs printf '%s-%s-%s'",
- env = { 'TOPDIR': WithProperties("%(cwd)s/build", cwd=GetCwd) }
+ command = "make --no-print-directory -C target/linux/ val.LINUX_VERSION val.LINUX_RELEASE val.LINUX_VERMAGIC | xargs printf '%s-%s-%s\\n'",
+ env = { 'TOPDIR': Interpolate("%(kw:cwd)s/build", cwd=GetCwd) }
))
factory.addStep(ShellCommand(
factory.addStep(ShellCommand(
name = "pkgbuild",
description = "Building packages",
- command=["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "package/compile", "V=s", "IGNORE_ERRORS=n m", "BUILD_LOG=1"],
+ command=["make", Interpolate("-j%(kw:jobs)s", 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
factory.addStep(ShellCommand(
name = "pkginstall",
description = "Installing packages",
- command=["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "package/install", "V=s"],
+ command=["make", Interpolate("-j%(kw:jobs)s", jobs=GetNumJobs), "package/install", "V=s"],
env = MakeEnv(),
haltOnFailure = True
))
factory.addStep(ShellCommand(
name = "pkgindex",
description = "Indexing packages",
- command=["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "package/index", "V=s"],
+ command=["make", Interpolate("-j%(kw:jobs)s", jobs=GetNumJobs), "package/index", "V=s", "CONFIG_SIGNED_PACKAGES="],
env = MakeEnv(),
haltOnFailure = True
))
if enable_kmod_archive:
- factory.addStep(ShellCommand(
- name = "kmoddir",
- description = "Creating kmod directory",
- command=["mkdir", "-p", WithProperties("bin/targets/%s/%s%%(libc)s/kmods/%%(kernelversion)s" %(ts[0], ts[1]))],
- haltOnFailure = True
- ))
-
- factory.addStep(ShellCommand(
- name = "kmodprepare",
- description = "Preparing kmod archive",
- command=["rsync", "--include=/kmod-*.ipk", "--exclude=*", "-va",
- WithProperties("bin/targets/%s/%s%%(libc)s/packages/" %(ts[0], ts[1])),
- WithProperties("bin/targets/%s/%s%%(libc)s/kmods/%%(kernelversion)s/" %(ts[0], ts[1]))],
- haltOnFailure = True
- ))
-
- factory.addStep(ShellCommand(
- name = "kmodindex",
- description = "Indexing kmod archive",
- command=["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "package/index", "V=s",
- WithProperties("PACKAGE_SUBDIRS=bin/targets/%s/%s%%(libc)s/kmods/%%(kernelversion)s/" %(ts[0], ts[1]))],
- env = MakeEnv(),
- haltOnFailure = True
- ))
+ # embed kmod repository. Must happen before 'images'
# find rootfs staging directory
- factory.addStep(SetProperty(
+ factory.addStep(SetPropertyFromCommand(
name = "stageroot",
property = "stageroot",
description = "Finding the rootfs staging directory",
command=["make", "--no-print-directory", "val.STAGING_DIR_ROOT"],
- env = { 'TOPDIR': WithProperties("%(cwd)s/build", cwd=GetCwd) }
+ env = { 'TOPDIR': Interpolate("%(kw:cwd)s/build", cwd=GetCwd) }
))
factory.addStep(ShellCommand(
factory.addStep(ShellCommand(
name = "kmodconfig",
description = "Embedding kmod repository configuration",
- command=WithProperties("sed -e 's#^\\(src/gz .*\\)_core \\(.*\\)/packages$#&\\n\\1_kmods \\2/kmods/%(kernelversion)s#' " +
- "%(stageroot)s/etc/opkg/distfeeds.conf > files/etc/opkg/distfeeds.conf"),
+ command=Interpolate("sed -e 's#^\\(src/gz .*\\)_core \\(.*\\)/packages$#&\\n\\1_kmods \\2/kmods/%(prop:kernelversion)s#' " +
+ "%(prop:stageroot)s/etc/opkg/distfeeds.conf > files/etc/opkg/distfeeds.conf"),
haltOnFailure = True
))
#factory.addStep(IfBuiltinShellCommand(
factory.addStep(ShellCommand(
name = "images",
- description = "Building images",
- command=["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "target/install", "V=s"],
+ description = "Building and installing images",
+ command=["make", Interpolate("-j%(kw:jobs)s", 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"],
+ name = "buildinfo",
+ description = "Generating config.buildinfo, version.buildinfo and feeds.buildinfo",
+ command=["make", "-j1", "prepare", "V=s"],
env = MakeEnv(),
haltOnFailure = True
))
haltOnFailure = True
))
+ if enable_kmod_archive:
+ factory.addStep(ShellCommand(
+ name = "kmoddir",
+ description = "Creating kmod directory",
+ command=["mkdir", "-p", Interpolate("bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/kmods/%(prop:kernelversion)s", target=ts[0], subtarget=ts[1])],
+ haltOnFailure = True
+ ))
+
+ factory.addStep(ShellCommand(
+ name = "kmodprepare",
+ description = "Preparing kmod archive",
+ command=["rsync", "--include=/kmod-*.ipk", "--exclude=*", "-va",
+ Interpolate("bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/packages/", target=ts[0], subtarget=ts[1]),
+ Interpolate("bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/kmods/%(prop:kernelversion)s/", target=ts[0], subtarget=ts[1])],
+ haltOnFailure = True
+ ))
+
+ factory.addStep(ShellCommand(
+ name = "kmodindex",
+ description = "Indexing kmod archive",
+ command=["make", Interpolate("-j%(kw:jobs)s", jobs=GetNumJobs), "package/index", "V=s", "CONFIG_SIGNED_PACKAGES=",
+ Interpolate("PACKAGE_SUBDIRS=bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/kmods/%(prop:kernelversion)s/", target=ts[0], subtarget=ts[1])],
+ env = MakeEnv(),
+ haltOnFailure = True
+ ))
+
# sign
- if gpg_keyid is not None:
+ if ini.has_option("gpg", "key") or usign_key is not None:
factory.addStep(MasterShellCommand(
name = "signprepare",
description = "Preparing temporary signing directory",
- command = ["mkdir", "-p", "%s/signing" %(home_dir)],
+ command = ["mkdir", "-p", "%s/signing" %(work_dir)],
haltOnFailure = True
))
factory.addStep(ShellCommand(
name = "signpack",
description = "Packing files to sign",
- command = WithProperties("find bin/targets/%s/%s%%(libc)s/ bin/targets/%s/%s%%(libc)s/kmods/ -mindepth 1 -maxdepth 2 -type f -name sha256sums -print0 -or -name Packages -print0 | xargs -0 tar -czf sign.tar.gz" %(ts[0], ts[1], ts[0], ts[1])),
+ command = Interpolate("find bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/ bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/kmods/ -mindepth 1 -maxdepth 2 -type f -name sha256sums -print0 -or -name Packages -print0 | xargs -0 tar -czf sign.tar.gz", target=ts[0], subtarget=ts[1]),
haltOnFailure = True
))
factory.addStep(FileUpload(
slavesrc = "sign.tar.gz",
- masterdest = "%s/signing/%s.%s.tar.gz" %(home_dir, ts[0], ts[1]),
+ masterdest = "%s/signing/%s.%s.tar.gz" %(work_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},
+ command = ["%s/signall.sh" %(scripts_dir), "%s/signing/%s.%s.tar.gz" %(work_dir, ts[0], ts[1])],
+ env = { 'CONFIG_INI': os.getenv("BUILDMASTER_CONFIG", "./config.ini") },
haltOnFailure = True
))
factory.addStep(FileDownload(
- mastersrc = "%s/signing/%s.%s.tar.gz" %(home_dir, ts[0], ts[1]),
+ name = "dlsigntargz",
+ mastersrc = "%s/signing/%s.%s.tar.gz" %(work_dir, ts[0], ts[1]),
slavedest = "sign.tar.gz",
haltOnFailure = True
))
factory.addStep(ShellCommand(
name = "dirprepare",
description = "Preparing upload directory structure",
- command = ["mkdir", "-p", WithProperties("tmp/upload/%%(prefix)stargets/%s/%s" %(ts[0], ts[1]), prefix=GetVersionPrefix)],
+ command = ["mkdir", "-p", Interpolate("tmp/upload/%(kw:prefix)stargets/%(kw:target)s/%(kw:subtarget)s", target=ts[0], subtarget=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)],
+ command = ["ln", "-s", "-f", Interpolate("../packages-%(kw:basever)s", basever=GetBaseVersion()), Interpolate("tmp/upload/%(kw:prefix)spackages", prefix=GetVersionPrefix)],
doStepIf = IsNoMasterBuild,
haltOnFailure = True
))
factory.addStep(ShellCommand(
name = "kmoddirprepare",
description = "Preparing kmod archive upload directory",
- command = ["mkdir", "-p", WithProperties("tmp/upload/%%(prefix)stargets/%s/%s/kmods/%%(kernelversion)s" %(ts[0], ts[1]), prefix=GetVersionPrefix)],
+ command = ["mkdir", "-p", Interpolate("tmp/upload/%(kw:prefix)stargets/%(kw:target)s/%(kw:subtarget)s/kmods/%(prop:kernelversion)s", target=ts[0], subtarget=ts[1], prefix=GetVersionPrefix)],
haltOnFailure = True
))
factory.addStep(ShellCommand(
name = "dirupload",
description = "Uploading directory structure",
- command = ["rsync", "-4", "--info=name", "-az", "tmp/upload/", "%s/" %(rsync_bin_url)],
+ command = ["rsync", "-az"] + rsync_bin_defopts + ["tmp/upload/", "%s/" %(rsync_bin_url)],
env={'RSYNC_PASSWORD': rsync_bin_key},
haltOnFailure = True,
logEnviron = False,
- locks = NetLockUl,
))
+ # download remote sha256sums to 'target-sha256sums'
+ factory.addStep(ShellCommand(
+ name = "target-sha256sums",
+ description = "Fetching remote sha256sums for target",
+ command = ["rsync", "-z"] + rsync_bin_defopts + [Interpolate("%(kw:rsyncbinurl)s/%(kw:prefix)stargets/%(kw:target)s/%(kw:subtarget)s/sha256sums", rsyncbinurl=rsync_bin_url, target=ts[0], subtarget=ts[1], prefix=GetVersionPrefix), "target-sha256sums"],
+ env={'RSYNC_PASSWORD': rsync_bin_key},
+ logEnviron = False,
+ haltOnFailure = False,
+ flunkOnFailure = False,
+ warnOnFailure = False,
+ ))
+
+ # build list of files to upload
factory.addStep(FileDownload(
- mastersrc = "rsync.sh",
- slavedest = "../rsync.sh",
- mode = 0755))
+ name = "dlsha2rsyncpl",
+ mastersrc = scripts_dir + '/sha2rsync.pl',
+ slavedest = "../sha2rsync.pl",
+ mode = 0755,
+ ))
+ factory.addStep(ShellCommand(
+ name = "buildlist",
+ description = "Building list of files to upload",
+ command = ["../sha2rsync.pl", "target-sha256sums", Interpolate("bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/sha256sums", target=ts[0], subtarget=ts[1]), "rsynclist"],
+ haltOnFailure = True,
+ ))
+
+ factory.addStep(FileDownload(
+ name = "dlrsync.sh",
+ mastersrc = scripts_dir + '/rsync.sh',
+ slavedest = "../rsync.sh",
+ mode = 0755
+ ))
+
+ # upload new files and update existing ones
factory.addStep(ShellCommand(
name = "targetupload",
description = "Uploading target files",
- command=["../rsync.sh", "-4", "--info=name", "--exclude=/kmods/", "--delete", "--size-only", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]),
- "-az", 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)],
+ command=["../rsync.sh", "--exclude=/kmods/", "--files-from=rsynclist", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1])] + rsync_bin_defopts +
+ ["-a", Interpolate("bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/", target=ts[0], subtarget=ts[1]),
+ Interpolate("%(kw:rsyncbinurl)s/%(kw:prefix)stargets/%(kw:target)s/%(kw:subtarget)s/", rsyncbinurl=rsync_bin_url, target=ts[0], subtarget=ts[1], prefix=GetVersionPrefix)],
+ env={'RSYNC_PASSWORD': rsync_bin_key},
+ haltOnFailure = True,
+ logEnviron = False,
+ ))
+
+ # delete files which don't exist locally
+ factory.addStep(ShellCommand(
+ name = "targetprune",
+ description = "Pruning target files",
+ command=["../rsync.sh", "--exclude=/kmods/", "--delete", "--existing", "--ignore-existing", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1])] + rsync_bin_defopts +
+ ["-a", Interpolate("bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/", target=ts[0], subtarget=ts[1]),
+ Interpolate("%(kw:rsyncbinurl)s/%(kw:prefix)stargets/%(kw:target)s/%(kw:subtarget)s/", rsyncbinurl=rsync_bin_url, target=ts[0], subtarget=ts[1], prefix=GetVersionPrefix)],
env={'RSYNC_PASSWORD': rsync_bin_key},
haltOnFailure = True,
logEnviron = False,
- locks = NetLockUl,
))
if enable_kmod_archive:
factory.addStep(ShellCommand(
name = "kmodupload",
description = "Uploading kmod archive",
- command=["../rsync.sh", "-4", "--info=name", "--delete", "--size-only", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]),
- "-az", WithProperties("bin/targets/%s/%s%%(libc)s/kmods/%%(kernelversion)s/" %(ts[0], ts[1])),
- WithProperties("%s/%%(prefix)stargets/%s/%s/kmods/%%(kernelversion)s/" %(rsync_bin_url, ts[0], ts[1]), prefix=GetVersionPrefix)],
+ command=["../rsync.sh", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1])] + rsync_bin_defopts +
+ ["-a", Interpolate("bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/kmods/%(prop:kernelversion)s/", target=ts[0], subtarget=ts[1]),
+ Interpolate("%(kw:rsyncbinurl)s/%(kw:prefix)stargets/%(kw:target)s/%(kw:subtarget)s/kmods/%(prop:kernelversion)s/", rsyncbinurl=rsync_bin_url, target=ts[0], subtarget=ts[1], prefix=GetVersionPrefix)],
env={'RSYNC_PASSWORD': rsync_bin_key},
haltOnFailure = True,
logEnviron = False,
- locks = NetLockUl,
))
if rsync_src_url is not None:
+ factory.addStep(ShellCommand(
+ name = "sourcelist",
+ description = "Finding source archives to upload",
+ command = "find dl/ -maxdepth 1 -type f -not -size 0 -not -name '.*' -newer .config -printf '%f\\n' > sourcelist",
+ haltOnFailure = True
+ ))
+
factory.addStep(ShellCommand(
name = "sourceupload",
description = "Uploading source archives",
- command=["../rsync.sh", "-4", "--info=name", "--size-only", "--delay-updates",
- WithProperties("--partial-dir=.~tmp~%s~%s~%%(slavename)s" %(ts[0], ts[1])), "-az", "dl/", "%s/" %(rsync_src_url)],
+ command=["../rsync.sh", "--files-from=sourcelist", "--size-only", "--delay-updates"] + rsync_src_defopts +
+ [Interpolate("--partial-dir=.~tmp~%(kw:target)s~%(kw:subtarget)s~%(prop:slavename)s", target=ts[0], subtarget=ts[1]), "-a", "dl/", "%s/" %(rsync_src_url)],
env={'RSYNC_PASSWORD': rsync_src_key},
haltOnFailure = True,
logEnviron = False,
- locks = NetLockUl,
))
if False:
factory.addStep(ShellCommand(
name = "packageupload",
description = "Uploading package files",
- command=["../rsync.sh", "-4", "--info=name", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-az", "bin/packages/", "%s/packages/" %(rsync_bin_url)],
+ command=["../rsync.sh", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-a"] + rsync_bin_defopts + ["bin/packages/", "%s/packages/" %(rsync_bin_url)],
env={'RSYNC_PASSWORD': rsync_bin_key},
haltOnFailure = False,
logEnviron = False,
- locks = NetLockUl,
))
# logs
factory.addStep(ShellCommand(
name = "upload",
description = "Uploading logs",
- command=["../rsync.sh", "-4", "-info=name", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-az", "logs/", "%s/logs/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
+ command=["../rsync.sh", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-az"] + rsync_bin_defopts + ["logs/", "%s/logs/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
env={'RSYNC_PASSWORD': rsync_bin_key},
haltOnFailure = False,
alwaysRun = True,
logEnviron = False,
- locks = NetLockUl,
))
factory.addStep(ShellCommand(
alwaysRun = True
))
+ factory.addStep(ShellCommand(
+ name = "ccachestat",
+ description = "Reporting ccache stats",
+ command=["ccache", "-s"],
+ env = MakeEnv(overrides={ 'PATH': ["${PATH}", "./staging_dir/host/bin"] }),
+ want_stderr = False,
+ haltOnFailure = False,
+ flunkOnFailure = False,
+ warnOnFailure = False,
+ alwaysRun = True,
+ ))
+
from buildbot.config import BuilderConfig
c['builders'].append(BuilderConfig(name=target, slavenames=slaveNames, factory=factory, nextBuild=GetNextBuild))
from buildbot.status import html
from buildbot.status.web import authz, auth
-if ini.has_option("status", "bind"):
- if ini.has_option("status", "user") and ini.has_option("status", "password"):
+if ini.has_option("phase1", "status_bind"):
+ if ini.has_option("phase1", "status_user") and ini.has_option("phase1", "status_password"):
authz_cfg=authz.Authz(
# 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"))]),
+ auth=auth.BasicAuth([(ini.get("phase1", "status_user"), ini.get("phase1", "status_password"))]),
gracefulShutdown = 'auth',
forceBuild = 'auth', # use this to test your slave once it is set up
forceAllBuilds = 'auth',
stopAllBuilds = 'auth',
cancelPendingBuild = 'auth',
)
- c['status'].append(html.WebStatus(http_port=ini.get("status", "bind"), authz=authz_cfg))
+ c['status'].append(html.WebStatus(http_port=ini.get("phase1", "status_bind"), authz=authz_cfg))
else:
- c['status'].append(html.WebStatus(http_port=ini.get("status", "bind")))
+ c['status'].append(html.WebStatus(http_port=ini.get("phase1", "status_bind")))
from buildbot.status import words
projects / buildbot.git / blobdiff