From dbc540a11d16abe4365192c137c5872bcb0b7d86 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 28 Jul 2017 21:39:15 +0200 Subject: tv: RIP caxi harder --- krebs/3modules/tv/default.nix | 41 ----------------------------------------- 1 file changed, 41 deletions(-) (limited to 'krebs') diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 6e5f522dc..ae12d2447 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -31,47 +31,6 @@ with import ; ssh.privkey.path = ; ssh.pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDP9JS2Nyjx4Pn+/4MrFi1EvBBYVKkGm2Q4lhgaAiSuiGLol53OSsL2KIo01mbcSSBWow9QpQpn8KDoRnT2aMLDrdTFqL20ztDLOXmtrSsz3flgCjmW4f6uOaoZF0RNjAybd1coqwSJ7EINugwoqOsg1zzN2qeIGKYFvqFIKibYFAnQ8hcksmkvPdIO5O8CbdIiP9sZSrSDp0ZyLK2T0PML2jensVZOeqSPulQDFqLsbmavpVLkpDjdzzPRwbZWNB4++YeipbYNOkX4GR1EB4wMZ93IbBV7kpJtib2Zb2AnUf7UW37hxWBjILdstj9ClwNOQggn8kD9ub7YxBzH1dz0Xd8a0mPOAWIDJz9MypXgFRc3vdvPB/W1I4Se0CLbgOkORun9CkgijKr9oEY8JNt8HFd6viZcAaQxOyIm6PNHZTnHfdSc7bIBS2n3e3IZBv0fTd77knGLXg402aTuu2bm/kxsKivxsILXIaGbeXe4ceN3Fynr3FzSM2bUkzHb0mAHu1BQ9YaX0xzCwjVueA5nzGls7ODSFkXsiBfg2FvMN/sTLFca6tnwyqcnD6nujoiS5+BxjDWPgnZYqCaW3B/IkpTsRMsX6QrfhOFcsP8qlJ2Cp82orWoDK/D0vZ9pdzAc6PFGga0RofuJKY2yiq+SRZ7/e9E6VncIVCYZ1OfN0Q=="; }; - caxi = { - cores = 2; - extraZones = { - "krebsco.de" = '' - caxi 60 IN A ${config.krebs.hosts.caxi.nets.internet.ip4.addr} - ''; - }; - nets = { - internet = { - ip4 = { - addr = "104.233.124.70"; - prefix = "104.233.124.0/24"; - }; - aliases = [ - "caxi.i" - "caxi.krebsco.de" - ]; - ssh.port = 11423; - }; - retiolum = { - via = config.krebs.hosts.caxi.nets.internet; - ip4.addr = "10.243.113.226"; - ip6.addr = "42:4522:25f8:36bb:8ccb:150:231a:2af6"; - aliases = [ - "caxi.r" - ]; - tinc.pubkey = '' - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAxNh1xhvCFzjUOmBq+F6NjUdntKh/7qo7LrsXjPVn92r1hGTVHJO1 - E+XP5dabZ/mFWySY8GvG7XlZ27wsjkvHEyb16IhOqYrnaONf9LifAWQ3qBlHtp1T - eZeP6wcXLhR/pOPy0pT6EABmDHbOzErjYv4pdrXHuxlM10Ljtpp3mClNeXY9eby+ - HekEE8LY8/zWqJ90lMaxPhLh1VqEvTVTnem5e1F8HDzNvRWa0kWUYG33zPQMyKgR - BCvp1DR7Y2LwDmGKnhzBm4JTcP+fcs+z/eGie/CEIgFM0BFJaTBAYZOtUlhBSe0y - UYE2W9CJkPN2Uepf53nPnshjKC64fgTr7wIDAQAB - -----END RSA PUBLIC KEY----- - ''; - }; - }; - ssh.privkey.path = ; - ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKdJ4xGi+qn4IfMZJ3Kv7AGZGbhlR+GrkD87z2tcyRZy"; - }; cd = { cores = 2; extraZones = { -- cgit v1.2.3 From 28a4bb28643e91366a6fae94b7a2b1df9f521ca2 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 28 Jul 2017 21:40:33 +0200 Subject: tv: add managed flags --- krebs/3modules/tv/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'krebs') diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index ae12d2447..60827d589 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -9,6 +9,7 @@ with import ; hosts = mapAttrs (_: setAttr "owner" config.krebs.users.tv) { alnus = { cores = 2; + managed = true; nets = { retiolum = { ip4.addr = "10.243.21.1"; @@ -39,6 +40,7 @@ with import ; cd 60 IN A ${config.krebs.hosts.cd.nets.internet.ip4.addr} ''; }; + managed = true; nets = { internet = { ip4.addr = "45.62.237.203"; @@ -141,6 +143,7 @@ with import ; }; mu = { cores = 2; + managed = true; nets = { retiolum = { ip4.addr = "10.243.20.1"; @@ -210,6 +213,7 @@ with import ; }; nomic = { cores = 2; + managed = true; nets = { gg23 = { ip4.addr = "10.23.1.110"; @@ -265,6 +269,7 @@ with import ; }; wu = { cores = 4; + managed = true; nets = { gg23 = { ip4.addr = "10.23.1.37"; @@ -302,6 +307,7 @@ with import ; pubkey = "xu-1:pYRENvaxZqGeImwLA9qHmRwHV4jfKaYx4u1VcZ31x0s="; }; cores = 4; + managed = true; nets = { gg23 = { ip4.addr = "10.23.1.38"; @@ -336,6 +342,7 @@ with import ; }; zu = { cores = 4; + managed = true; nets = { gg23 = { ip4.addr = "10.23.1.39"; -- cgit v1.2.3 From 4b21495fc773f7d7fd4c30e917cd805bdd46751e Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 29 Jul 2017 01:04:29 +0200 Subject: l: add host skynet --- krebs/3modules/lass/default.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'krebs') diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index f0722e9ba..27009981b 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -301,6 +301,32 @@ with import ; ssh.privkey.path = ; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5Ovdcsljr5dOl7+2sQNKpGpdX0SlOIuCZKEiWEp8g"; }; + skynet = { + cores = 2; + nets = rec { + retiolum = { + ip4.addr = "10.243.133.116"; + ip6.addr = "42:0:0:0:0:0:0:1101"; + aliases = [ + "skynet.r" + "cgit.skynet.r" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEArNpBoTs7MoaZq2edGJLYUjmoLa5ZtXhOFBHjS1KtQ3hMtWkcqpYX + Ic457utOSGxTE+90yXXez2DD9llJMMyd+O06lHJ7CxtbJGBNr3jwoUZVCdBuuo5B + p9XfhXU9l9fUsbc1+a/cDjPBhQv8Uqmc6tOX+52H1aqZsa4W50c9Dv5vjsHgxCB0 + yiUd2MrKptCQTdmMM9Mf0XWKPPOuwpHpxaomlrpUz07LisFVGGHCflOvj5PAy8Da + NC+AfNgR/76yfuYWcv4NPo9acjD9AIftS2c0tD3szyHBCGaYK/atKzIoBbFbOtMb + mwG3B0X3UdphkqGDGsvT+66Kcv2jnKwL0wIDAQAB + -----END RSA PUBLIC KEY----- + ''; + }; + }; + secure = true; + ssh.privkey.path = ; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEB/MmASvx3i09DY1xFVM5jOhZRZA8rMRqtf8bCIkC+t"; + }; iso = { cores = 1; managed = false; -- cgit v1.2.3 From 957806683b8590446d003b9ee098339f96ccadc9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 29 Jul 2017 01:04:44 +0200 Subject: krebs hotdog: repo-sync more often --- krebs/1systems/hotdog/config.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'krebs') diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix index c056b4eaf..3eb7b9aa1 100644 --- a/krebs/1systems/hotdog/config.nix +++ b/krebs/1systems/hotdog/config.nix @@ -16,4 +16,9 @@ boot.isContainer = true; networking.useDHCP = false; + krebs.repo-sync.repos.stockholm.timerConfig = { + OnBootSec = "5min"; + OnUnitInactiveSec = "2min"; + RandomizedDelaySec = "2min"; + }; } -- cgit v1.2.3 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') 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.2.3 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') 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.2.3 From 426022f656fff789148dc988a585858f8212b252 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 29 Jul 2017 02:20:03 +0200 Subject: krebs ci: set default of build all hosts to false --- krebs/3modules/ci.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix index 6e4db6edd..31517a23d 100644 --- a/krebs/3modules/ci.nix +++ b/krebs/3modules/ci.nix @@ -13,7 +13,7 @@ in options = { all = mkOption { type = bool; - default = true; + default = false; }; hosts = mkOption { type = listOf str; -- cgit v1.2.3 From f0470d32957d7c83145bf26ea50350095fe7eb53 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 29 Jul 2017 11:51:29 +0200 Subject: krebs ci: don't automatically garbage collect --- krebs/3modules/ci.nix | 3 --- 1 file changed, 3 deletions(-) (limited to 'krebs') diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix index 31517a23d..1f8dc71e0 100644 --- a/krebs/3modules/ci.nix +++ b/krebs/3modules/ci.nix @@ -48,9 +48,6 @@ in }; }; - nix.gc.automatic = true; - nix.gc.dates = "05:23"; - krebs.buildbot.master = { slaves = { testslave = "lasspass"; -- cgit v1.2.3 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') 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.2.3 From c97358f18ab4e2852c62c220e972203b7cd94b5a Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 30 Jul 2017 17:19:52 +0200 Subject: krebs nixpkgs: 72c9ed7 -> 0590ecb --- krebs/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/source.nix b/krebs/source.nix index 1995d2b36..db30e1e35 100644 --- a/krebs/source.nix +++ b/krebs/source.nix @@ -14,6 +14,6 @@ in stockholm.file = toString ; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "72c9ed78d0b1d9d5f531805ddf5bf06bfd447614"; # nixos-17.03 @ 2017-06-17 + ref = "0590ecbe9e6b9a076065be29370701da758c61f1"; # nixos-17.03 @ 2017-07-30 }; } -- cgit v1.2.3 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') 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.2.3 From f4e176347d718569a6d6ceab70c08d479af7999c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 30 Jul 2017 23:59:53 +0200 Subject: krebs pkgs: remove broken buildbot references --- krebs/5pkgs/default.nix | 5 ----- 1 file changed, 5 deletions(-) (limited to 'krebs') diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 39e89a4b6..af4cbb3ba 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -15,11 +15,6 @@ foldl' mergeAttrs {} { ReaktorPlugins = self.callPackage ./simple/Reaktor/plugins.nix {}; - buildbot-full = self.callPackage ./simple/buildbot { - plugins = with self.buildbot-plugins; [ www console-view waterfall-view ]; - }; - buildbot-worker = self.callPackage ./simple/buildbot/worker.nix {}; - # https://github.com/proot-me/PRoot/issues/106 proot = self.writeDashBin "proot" '' export PROOT_NO_SECCOMP=1 -- cgit v1.2.3 From af1073f52ac5346ab102ea493b4941c2e895a647 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 31 Jul 2017 12:25:53 +0200 Subject: krebs ci: raise timeout to 90001 --- krebs/3modules/ci.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix index f64c28d25..71e7d4aeb 100644 --- a/krebs/3modules/ci.nix +++ b/krebs/3modules/ci.nix @@ -124,7 +124,8 @@ in "--force-populate", "--target=$LOGNAME@${config.krebs.build.host.name}$HOME/{}".format(user), ]) - ] + ], + timeout=90001 ) ${let -- cgit v1.2.3