summaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-06-07 10:46:25 +0200
committerlassulus <lass@aidsballs.de>2016-06-07 10:46:25 +0200
commit2d5faaa69371d6d5a928da644c392b794723b3d4 (patch)
tree087f26b56008d35262ddf950e02a3e3755288c94 /shared
parent208e8f6c0b1c2c84f0f1dcbdf3fc489b926df190 (diff)
parent49ac020be07a85bf27fd78160a5b265b131e126e (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'shared')
-rw-r--r--shared/2configs/base.nix2
-rw-r--r--shared/2configs/shared-buildbot.nix47
2 files changed, 28 insertions, 21 deletions
diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index 7cabbd347..bbb089c2c 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -10,7 +10,7 @@ with config.krebs.lib;
krebs.build.source = {
nixpkgs = mkDefault {
url = https://github.com/NixOS/nixpkgs;
- rev = "40c586b7ce2c559374df435f46d673baf711c543";
+ rev = "63b9785"; # stable @ 2016-06-01
};
secrets = mkDefault "${getEnv "HOME"}/secrets/krebs/${config.krebs.build.host.name}";
stockholm = mkDefault "${getEnv "HOME"}/stockholm";
diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix
index 9804580db..5f3b35304 100644
--- a/shared/2configs/shared-buildbot.nix
+++ b/shared/2configs/shared-buildbot.nix
@@ -32,7 +32,11 @@
force-scheduler = ''
sched.append(schedulers.ForceScheduler(
name="force",
- builderNames=["full-tests","fast-tests","build-local"]))
+ builderNames=[
+ # "full-tests",
+ "fast-tests",
+ "build-local"
+ ]))
'';
fast-tests-scheduler = ''
# test everything real quick
@@ -57,7 +61,10 @@
fileIsImportant=shared_files,
treeStableTimer=60*60, # master was stable for the last hour
name="full-master",
- builderNames=["full-tests","build-local"]))
+ builderNames=[
+ # "full-tests",
+ "build-local"
+ ]))
'';
};
builder_pre = ''
@@ -135,24 +142,24 @@
slavenames=slavenames,
factory=f))
'';
- slow-tests = ''
- s = util.BuildFactory()
- s.addStep(grab_repo)
-
- # slave needs 2 files:
- # * cac.json
- # * retiolum
- s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/cac.json", slavedest="cac.json"))
- s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/retiolum-ci.rsa_key.priv", slavedest="retiolum.rsa_key.priv"))
- addShell(s, name="infest-cac-centos7",env=env,
- sigtermTime=60, # SIGTERM 1 minute before SIGKILL
- timeout=10800, # 3h
- command=nixshell + ["infest-cac-centos7"])
-
- bu.append(util.BuilderConfig(name="full-tests",
- slavenames=slavenames,
- factory=s))
- '';
+# slow-tests = ''
+# s = util.BuildFactory()
+# s.addStep(grab_repo)
+#
+# # slave needs 2 files:
+# # * cac.json
+# # * retiolum
+# s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/cac.json", slavedest="cac.json"))
+# s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/retiolum-ci.rsa_key.priv", slavedest="retiolum.rsa_key.priv"))
+# addShell(s, name="infest-cac-centos7",env=env,
+# sigtermTime=60, # SIGTERM 1 minute before SIGKILL
+# timeout=10800, # 3h
+# command=nixshell + ["infest-cac-centos7"])
+#
+# bu.append(util.BuilderConfig(name="full-tests",
+# slavenames=slavenames,
+# factory=s))
+# '';
};
enable = true;
web = {