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

Merge branch 'master' of gum.krebsco.de:stockholm

Browse source
This commit is contained in:
makefu 2015-12-23 11:20:42 +01:00
parent 14ddb767eb f59080e76f
commit b8ac3e2b8d
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -95,8 +95,13 @@ let
s.addStep(steps.FileDownload(mastersrc="${cfg.workDir}/{}".format(file), s.addStep(steps.FileDownload(mastersrc="${cfg.workDir}/{}".format(file),
slavedest=file)) slavedest=file))
<<<<<<< HEAD
addShell(s,name="infest-cac-centos7",env={"LOGNAME": "shared"}, addShell(s,name="infest-cac-centos7",env={"LOGNAME": "shared"},
command=nixshell + ["infest-cac-centos7"]) command=nixshell + ["infest-cac-centos7"])
=======
addShell(s,name="complete-build-centos7",env={"LOGNAME": "shared"},
command=nix-shell + ["krebs-ci"])
>>>>>>> f59080e76f950a5a8e33d1edd4314ffaa14187fc
c['builders'].append( c['builders'].append(
util.BuilderConfig(name="full-tests", util.BuilderConfig(name="full-tests",