diff options
| author | makefu <github@syntax-fehler.de> | 2015-12-23 11:20:42 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-12-23 11:20:42 +0100 |
| commit | b8ac3e2b8dbb4835081370ca409fd8042f5b8359 (patch) | |
| tree | 81c8b40bdce601730f6ab095509baf64b6488953 /krebs/3modules | |
| parent | 14ddb767eb10dbe43d3112c4b4674f6c1d4ff32a (diff) | |
| parent | f59080e76f950a5a8e33d1edd4314ffaa14187fc (diff) | |
Merge branch 'master' of gum.krebsco.de:stockholm
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/buildbot/master.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix index 483ba18e7..19aecead1 100644 --- a/krebs/3modules/buildbot/master.nix +++ b/krebs/3modules/buildbot/master.nix @@ -95,8 +95,13 @@ 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", |