From 603752e1e3fe96bdaa9f8e5ffceae6a99a145139 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 12 Feb 2016 22:15:18 +0100 Subject: s 2 buildbot: fix regex --- shared/2configs/shared-buildbot.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'shared/2configs/shared-buildbot.nix') diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix index af877f5d8..604cbc5b2 100644 --- a/shared/2configs/shared-buildbot.nix +++ b/shared/2configs/shared-buildbot.nix @@ -26,13 +26,12 @@ builderNames=["full-tests"])) ''; fast-tests-scheduler = '' - # test the master real quick + # test everything BUT the master real quick sched.append(schedulers.SingleBranchScheduler( ## all branches - change_filter=util.ChangeFilter(branch_re=".*"), - # change_filter=util.ChangeFilter(branch="master"), - treeStableTimer=10, #only test the latest push - name="fast-master-test", + change_filter=util.ChangeFilter(branch_re="(?!^master$)"), + # treeStableTimer=10, + name="fast-test-all-branches", builderNames=["fast-tests"])) ''; test-cac-infest-master = '' -- cgit v1.2.3 From ac31ea80288e2f9ae9eda10d28a912e23bc6647e Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 15 Feb 2016 14:02:44 +0100 Subject: s 2 buildbot: use the correct NIX_PATH" --- shared/2configs/shared-buildbot.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'shared/2configs/shared-buildbot.nix') diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix index 604cbc5b2..9327d2f95 100644 --- a/shared/2configs/shared-buildbot.nix +++ b/shared/2configs/shared-buildbot.nix @@ -23,13 +23,13 @@ force-scheduler = '' sched.append(schedulers.ForceScheduler( name="force", - builderNames=["full-tests"])) + builderNames=["full-tests","fast-tests"])) ''; fast-tests-scheduler = '' - # test everything BUT the master real quick + # test everything real quick sched.append(schedulers.SingleBranchScheduler( ## all branches - change_filter=util.ChangeFilter(branch_re="(?!^master$)"), + change_filter=util.ChangeFilter(branch_re=".*"), # treeStableTimer=10, name="fast-test-all-branches", builderNames=["fast-tests"])) @@ -132,7 +132,7 @@ }; irc = { enable = true; - nick = "shared-buildbot"; + nick = "wolfbot"; server = "cd.retiolum"; channels = [ "retiolum" ]; allowForce = true; @@ -146,6 +146,7 @@ password = "krebspass"; packages = with pkgs;[ git nix ]; # all nix commands will need a working nixpkgs installation - extraEnviron = { NIX_PATH="/var/src"; }; + extraEnviron = { + NIX_PATH="nixpkgs=/var/src/upstream-nixpkgs:nixos-config=./shared/1systems/wolf.nix"; }; }; } -- cgit v1.2.3 From 9a4071b66ff45e99a30e9a314eb43c6efc7e921f Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 15 Feb 2016 14:25:30 +0100 Subject: s 2 shared-buildbot: add TODO --- shared/2configs/shared-buildbot.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'shared/2configs/shared-buildbot.nix') diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix index 9327d2f95..19724ac01 100644 --- a/shared/2configs/shared-buildbot.nix +++ b/shared/2configs/shared-buildbot.nix @@ -1,18 +1,22 @@ { lib, config, pkgs, ... }: -# The buildbot config is seilf-contained and provides a way to test "shared" -# configuration (infrastructure to be used by every krebsminister). +# The buildbot config is self-contained and currently provides a way +# to test "shared" configuration (infrastructure to be used by every krebsminister). # You can add your own test, test steps as required. Deploy the config on a # shared host like wolf and everything should be fine. + +# TODO for all users schedule a build for fast tests { networking.firewall.allowedTCPPorts = [ 8010 9989 ]; - krebs.buildbot.master = { + krebs.buildbot.master = let + stockholm-mirror-url = http://cgit.wolf/stockholm-mirror ; + in { secrets = [ "retiolum-ci.rsa_key.priv" "cac.json" ]; slaves = { testslave = "krebspass"; }; change_source.stockholm = '' - stockholm_repo = 'http://cgit.wolf/stockholm-mirror' + stockholm_repo = '${stockholm-mirror-url}' cs.append(changes.GitPoller( stockholm_repo, workdir='stockholm-poller', branches=True, -- cgit v1.2.3 From 372f2d77f301719e396a6f943657325e2f8b2cf4 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 15 Feb 2016 16:57:15 +0100 Subject: shared-buildbot: isn't a function --- shared/2configs/shared-buildbot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shared/2configs/shared-buildbot.nix') diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix index af877f5d8..f6798bf99 100644 --- a/shared/2configs/shared-buildbot.nix +++ b/shared/2configs/shared-buildbot.nix @@ -61,7 +61,7 @@ # prepare nix-shell # the dependencies which are used by the test script deps = [ "gnumake", "jq","nix","rsync", - "(import {}).pkgs.test.infest-cac-centos7" ] + "(import ).pkgs.test.infest-cac-centos7" ] # TODO: --pure , prepare ENV in nix-shell command: # SSL_CERT_FILE,LOGNAME,NIX_REMOTE nixshell = ["nix-shell", -- cgit v1.2.3