From c402e612df6ffe1622379a93ea6cc7bd7a2df760 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 29 Jul 2017 01:11:30 +0200 Subject: krebs build-krebs: build only ourself and test-all --- krebs/2configs/buildbot-all.nix | 6 +++++- krebs/2configs/buildbot-krebs.nix | 5 +---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'krebs/2configs') diff --git a/krebs/2configs/buildbot-all.nix b/krebs/2configs/buildbot-all.nix index fe982c870..59f948218 100644 --- a/krebs/2configs/buildbot-all.nix +++ b/krebs/2configs/buildbot-all.nix @@ -1,8 +1,12 @@ { lib, config, pkgs, ... }: { imports = [ - + ]; + + networking.firewall.allowedTCPPorts = [ 80 8010 9989 ]; + krebs.ci.enable = true; + krebs.ci.users.krebs.all = true; krebs.ci.users.lass.all = true; krebs.ci.users.makefu.all = true; krebs.ci.users.nin.all = true; diff --git a/krebs/2configs/buildbot-krebs.nix b/krebs/2configs/buildbot-krebs.nix index 7f243b506..6ffd72689 100644 --- a/krebs/2configs/buildbot-krebs.nix +++ b/krebs/2configs/buildbot-krebs.nix @@ -7,12 +7,9 @@ networking.firewall.allowedTCPPorts = [ 80 8010 9989 ]; krebs.ci.enable = true; krebs.ci.users.krebs ={ - all = true; hosts = [ - "test-arch" - "test-centos6" - "test-centos7" "test-all-krebs-modules" + config.networking.hostName ]; }; } -- cgit v1.3.1 From 751780e400ba357262963a111d4b4799102cdb2e Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 29 Jul 2017 02:19:28 +0200 Subject: krebs buildbot-krebs: just build own host --- krebs/2configs/buildbot-krebs.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'krebs/2configs') diff --git a/krebs/2configs/buildbot-krebs.nix b/krebs/2configs/buildbot-krebs.nix index 6ffd72689..1acfbe506 100644 --- a/krebs/2configs/buildbot-krebs.nix +++ b/krebs/2configs/buildbot-krebs.nix @@ -6,10 +6,7 @@ networking.firewall.allowedTCPPorts = [ 80 8010 9989 ]; krebs.ci.enable = true; - krebs.ci.users.krebs ={ - hosts = [ - "test-all-krebs-modules" - config.networking.hostName - ]; - }; + krebs.ci.users.krebs.hosts = [ + config.networking.hostName + ]; } -- cgit v1.3.1 From 31053501a729cc6b2a0fb9ae02264473e9105328 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 29 Jul 2017 19:41:59 +0200 Subject: krebs: use prism binary cache on all hosts --- krebs/1systems/puyak/config.nix | 1 + krebs/1systems/wolf/config.nix | 3 +-- krebs/2configs/binary-cache/prism.nix | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 krebs/2configs/binary-cache/prism.nix (limited to 'krebs/2configs') diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index a1df11901..deede4493 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -9,6 +9,7 @@ + ]; krebs.build.host = config.krebs.hosts.puyak; diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index a0113fce8..ec9c78db5 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -13,6 +13,7 @@ in + @@ -44,11 +45,9 @@ in nix = { # use the up to date prism cache binaryCaches = [ - "http://cache.prism.r" "https://cache.nixos.org/" ]; binaryCachePublicKeys = [ - "cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU=" "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ]; }; diff --git a/krebs/2configs/binary-cache/prism.nix b/krebs/2configs/binary-cache/prism.nix new file mode 100644 index 000000000..4813eeb0f --- /dev/null +++ b/krebs/2configs/binary-cache/prism.nix @@ -0,0 +1,12 @@ +{ config, ... }: + +{ + nix = { + binaryCaches = [ + "http://cache.prism.r" + ]; + binaryCachePublicKeys = [ + "cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU=" + ]; + }; +} -- cgit v1.3.1 From 35784d80d241163c02eb4dc56f2aa45acd3510c1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 30 Jul 2017 19:05:55 +0200 Subject: krebs buildbot: add treeStableTimer as option --- krebs/2configs/buildbot-all.nix | 1 + krebs/2configs/buildbot-krebs.nix | 1 + krebs/3modules/ci.nix | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'krebs/2configs') diff --git a/krebs/2configs/buildbot-all.nix b/krebs/2configs/buildbot-all.nix index 59f948218..acd806d6e 100644 --- a/krebs/2configs/buildbot-all.nix +++ b/krebs/2configs/buildbot-all.nix @@ -6,6 +6,7 @@ networking.firewall.allowedTCPPorts = [ 80 8010 9989 ]; krebs.ci.enable = true; + krebs.ci.treeStableTimer = 1; krebs.ci.users.krebs.all = true; krebs.ci.users.lass.all = true; krebs.ci.users.makefu.all = true; diff --git a/krebs/2configs/buildbot-krebs.nix b/krebs/2configs/buildbot-krebs.nix index 1acfbe506..40ca3c66d 100644 --- a/krebs/2configs/buildbot-krebs.nix +++ b/krebs/2configs/buildbot-krebs.nix @@ -6,6 +6,7 @@ networking.firewall.allowedTCPPorts = [ 80 8010 9989 ]; krebs.ci.enable = true; + krebs.ci.treeStableTimer = 120; krebs.ci.users.krebs.hosts = [ config.networking.hostName ]; diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix index 1f8dc71e0..f64c28d25 100644 --- a/krebs/3modules/ci.nix +++ b/krebs/3modules/ci.nix @@ -8,6 +8,11 @@ in { options.krebs.ci = { enable = mkEnableOption "krebs continous integration"; + treeStableTimer = mkOption { + type = types.int; + default = 10; + description = "how long to wait until we test changes (in minutes)"; + }; users = mkOption { type = with types; attrsOf (submodule { options = { @@ -69,7 +74,7 @@ in sched.append( schedulers.SingleBranchScheduler( change_filter=util.ChangeFilter(branch_re=".*"), - treeStableTimer=10, + treeStableTimer=${toString cfg.treeStableTimer}*60, name="build-all-branches", builderNames=[ "build-hosts" -- cgit v1.3.1