From 6c092cd20ca256b1cefa92aa779380cdb71c1313 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 11 Nov 2016 01:34:18 +0100
Subject: buildbot: 0.8.4 -> 0.9.0rc2

---
 shared/2configs/shared-buildbot.nix | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'shared')

diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix
index 22144e9ec..dbf79e177 100644
--- a/shared/2configs/shared-buildbot.nix
+++ b/shared/2configs/shared-buildbot.nix
@@ -11,14 +11,13 @@
   # /nix/store should be cleaned up automatically as well
   nix.gc.automatic = true;
   nix.gc.dates = "05:23";
-
   networking.firewall.allowedTCPPorts = [ 8010 9989 ];
   krebs.buildbot.master = let
     stockholm-mirror-url = http://cgit.wolf/stockholm-mirror ;
   in {
     secrets = [ "retiolum-ci.rsa_key.priv" "cac.json" ];
-    slaves = {
-      testslave =  "krebspass";
+    workers = {
+      testworker =  "krebspass";
     };
     change_source.stockholm = ''
   stockholm_repo = '${stockholm-mirror-url}'
@@ -109,7 +108,7 @@
                             system={}".format(i)])
 
         bu.append(util.BuilderConfig(name="fast-tests",
-              slavenames=slavenames,
+              workernames=workernames,
               factory=f))
 
             '';
@@ -130,25 +129,25 @@
                       system={}".format(i)])
 
   bu.append(util.BuilderConfig(name="build-local",
-        slavenames=slavenames,
+        workernames=workernames,
         factory=f))
       '';
 #      slow-tests = ''
 #  s = util.BuildFactory()
 #  s.addStep(grab_repo)
 #
-#  # slave needs 2 files:
+#  # worker 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"))
+#  s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/cac.json", workerdest="cac.json"))
+#  s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/retiolum-ci.rsa_key.priv", workerdest="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,
+#        workernames=workernames,
 #        factory=s))
 #      '';
     };
@@ -160,15 +159,15 @@
       enable = true;
       nick = "wolfbot";
       server = "cd.retiolum";
-      channels = [ "retiolum" ];
+      channels = [ { channel = "retiolum"; } ];
       allowForce = true;
     };
   };
 
-  krebs.buildbot.slave = {
+  krebs.buildbot.worker = {
     enable = true;
     masterhost = "localhost";
-    username = "testslave";
+    username = "testworker";
     password = "krebspass";
     packages = with pkgs; [ gnumake jq nix populate ];
     # all nix commands will need a working nixpkgs installation
-- 
cgit v1.2.3


From 17ad1c0953ced88332f232abc385ed624f47d5dc Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 15 Nov 2016 23:13:15 +0100
Subject: s 1 test-all-krebs-modules: buildbot.slave -> worker

---
 shared/1systems/test-all-krebs-modules.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'shared')

diff --git a/shared/1systems/test-all-krebs-modules.nix b/shared/1systems/test-all-krebs-modules.nix
index 60d5f3252..0bfcff685 100644
--- a/shared/1systems/test-all-krebs-modules.nix
+++ b/shared/1systems/test-all-krebs-modules.nix
@@ -16,7 +16,7 @@ in {
     # FIXME fast-tests / instantiate-test-all-modules fails at wolfbot
     # http://wolf:8010/builders/fast-tests/builds/442
     #buildbot.master.enable = true;
-    buildbot.slave = {
+    buildbot.worker = {
       enable = true;
       username = "lol";
       password = "wut";
-- 
cgit v1.2.3


From 5de3acd2a0e35dcfb25ab893f5299e47a715427f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 15 Nov 2016 23:26:03 +0100
Subject: s 2 buildbot: use AnyBranchSheduler

---
 shared/2configs/shared-buildbot.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'shared')

diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix
index 95495acf9..cf08882a9 100644
--- a/shared/2configs/shared-buildbot.nix
+++ b/shared/2configs/shared-buildbot.nix
@@ -39,9 +39,7 @@
         '';
         fast-tests-scheduler = ''
   # test everything real quick
-  sched.append(schedulers.SingleBranchScheduler(
-                              ## all branches
-                              change_filter=util.ChangeFilter(branch_re=".*"),
+  sched.append(schedulers.AnyBranchScheduler(
                               treeStableTimer=10,
                               name="fast-all-branches",
                               builderNames=["fast-tests"]))
@@ -118,15 +116,6 @@
   f = util.BuildFactory()
   f.addStep(grab_repo)
 
-  for i in [ "test-all-krebs-modules", "wolf" ]:
-    addShell(f,name="build-{}".format(i),env=env,
-            command=nixshell + \
-                ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
-                  make \
-                      test \
-                      target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
-                      method=build \
-                      system={}".format(i)])
 
   bu.append(util.BuilderConfig(name="build-local",
         workernames=workernames,
-- 
cgit v1.2.3