diff options
| author | makefu <github@syntax-fehler.de> | 2015-12-23 16:06:41 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-12-23 16:06:41 +0100 |
| commit | 9a386718714d70f7100b5de297dfd0869d98e47b (patch) | |
| tree | 29b8e76ba7b132b24d155afb46e39de501b63b34 /krebs/3modules | |
| parent | 0082c89eadadd5b4f0210b4010fe604d6748435d (diff) | |
k 3 buildbot: fix merge fuckup
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/buildbot/master.nix | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix index 19aecead1..483ba18e7 100644 --- a/krebs/3modules/buildbot/master.nix +++ b/krebs/3modules/buildbot/master.nix @@ -95,13 +95,8 @@ let s.addStep(steps.FileDownload(mastersrc="${cfg.workDir}/{}".format(file), slavedest=file)) -<<<<<<< HEAD addShell(s,name="infest-cac-centos7",env={"LOGNAME": "shared"}, command=nixshell + ["infest-cac-centos7"]) -======= - addShell(s,name="complete-build-centos7",env={"LOGNAME": "shared"}, - command=nix-shell + ["krebs-ci"]) ->>>>>>> f59080e76f950a5a8e33d1edd4314ffaa14187fc c['builders'].append( util.BuilderConfig(name="full-tests", |