makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions1 Packages Projects Releases Wiki Activity

m 3 buildbot: add new slow factory to complete integration test

Browse source
This commit is contained in:
makefu 2015-12-23 00:06:27 +01:00
parent 1a184c98a2
commit f59080e76f
2 changed files with 35 additions and 20 deletions
krebs
3modules/buildbot
master.nix
5pkgs/krebs-ci
notes

47
krebs/3modules/buildbot/master.nix
View file

@ -59,27 +59,28 @@ let
###### The actual build
# couple of fast steps:
f = util.BuildFactory()
# some slow steps
s = util.BuildFactory()
## fetch repo
grab_repo = steps.Git(repourl=stockholm_repo, mode='incremental')
f.addStep(grab_repo)
s.addStep(grab_repo)
# the dependencies which are used by the test script
deps = [ "gnumake", "jq" ]
nixshell = ["nix-shell", "-p" ] + deps + [ "--run" ]
deps = [ "gnumake", "jq", "(import <stockholm> {}).pkgs.krebs-ci" ]
nixshell = ["nix-shell", "-I", ".", "-p" ] + deps + [ "--run" ]
def addShell(f,**kwargs):
f.addStep(steps.ShellCommand(**kwargs))
addShell(f,name="centos7-eval",env={"LOGNAME": "shared",
"get" : "krebs.deploy",
"filter" : "json"
},
command=nixshell + ["make -s eval system=test-centos7"])
addShell(f,name="centos7-eval",env={"LOGNAME": "shared"},
command=nixshell + ["make -s eval get=krebs.deploy filter=json system=test-centos7"])
addShell(f,name="wolf-eval",env={"LOGNAME": "shared",
"get" : "krebs.deploy",
"filter" : "json"
},
command=nixshell + ["make -s eval system=wolf"])
addShell(f,name="wolf-eval",env={"LOGNAME": "shared"},
command=nixshell + ["make -s eval get=krebs.deploy filter=json system=wolf"])
addShell(f,name="eval-cross-check",env={"LOGNAME": "shared"},
command=nixshell + ["! make eval get=krebs.deploy filter=json system=test-failing"])
c['builders'] = []
c['builders'].append(
@ -87,11 +88,20 @@ let
slavenames=slavenames,
factory=f))
# TODO slow build
# slave needs 2 files:
# * cac.json
# * retiolum
for file in ["cac.json", "retiolum.rsa_key.priv"]:
s.addStep(steps.FileDownload(mastersrc="${cfg.workDir}/{}".format(file),
slavedest=file))
addShell(s,name="complete-build-centos7",env={"LOGNAME": "shared"},
command=nix-shell + ["krebs-ci"])
c['builders'].append(
util.BuilderConfig(name="full-tests",
slavenames=slavenames,
factory=f))
factory=s))
####### Status of Builds
c['status'] = []
@ -119,8 +129,8 @@ let
# TODO: multiple channels
channels=["${cfg.irc.channel}"],
notify_events={
#'success': 1,
#'failure': 1,
'success': 1,
'failure': 1,
'exception': 1,
'successToFailure': 1,
'failureToSuccess': 1,
@ -221,6 +231,7 @@ let
path = [ pkgs.git ];
serviceConfig = let
workdir="${lib.shell.escape cfg.workDir}";
secretsdir="${lib.shell.escape (toString <secrets>)}";
# TODO: check if git is the only dep
in {
PermissionsStartOnly = true;
@ -236,6 +247,10 @@ let
fi
# always override the master.cfg
cp ${buildbot-master-config} ${workdir}/master.cfg
# copy secrets
cp ${secretsdir}/cac.json ${workdir}
cp ${secretsdir}/retiolum-ci.rsa_key.priv \
${workdir}/retiolum.rsa_key.priv
# sanity
${buildbot}/bin/buildbot checkconfig ${workdir}

8
krebs/5pkgs/krebs-ci/notes
View file

@ -19,10 +19,10 @@ fi
krebs_secrets=$(mktemp -d)
sec_file=$krebs_secrets/cac_config
krebs_ssh=$krebs_secrets/tempssh
cac_resources_cache=$krebs_secrets/res_cache.json
cac_servers_cache=$krebs_secrets/servers_cache.json
cac_tasks_cache=$krebs_secrets/tasks_cache.json
cac_templates_cache=$krebs_secrets/templates_cache.json
export cac_resources_cache=$krebs_secrets/res_cache.json
export cac_servers_cache=$krebs_secrets/servers_cache.json
export cac_tasks_cache=$krebs_secrets/tasks_cache.json
export cac_templates_cache=$krebs_secrets/templates_cache.json
# we need to receive this key from buildmaster to speed up tinc bootstrap
TRAP="rm -r $krebs_secrets;exit"
trap "$TRAP" INT TERM EXIT