From e312a5f9616ac65102b63919d55bd72264a5e3a6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 28 Jul 2017 13:37:39 +0200 Subject: krebs ci: add --force-populate --- krebs/3modules/ci.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'krebs') diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix index 542a9252..6e4db6ed 100644 --- a/krebs/3modules/ci.nix +++ b/krebs/3modules/ci.nix @@ -116,8 +116,12 @@ in "dummy_secrets": "true", }, command=[ - "nix-shell", "--run", - "test --user={} --system={} --target=$LOGNAME@${config.krebs.build.host.name}$HOME/{}".format(user, host, user) + "nix-shell", "--run", " ".join(["test", + "--user={}".format(user), + "--system={}".format(host), + "--force-populate", + "--target=$LOGNAME@${config.krebs.build.host.name}$HOME/{}".format(user), + ]) ] ) -- cgit v1.2.3 From b3d2040b1eb692c1add4a74774a216a0d2ae49cd Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 28 Jul 2017 15:09:33 +0200 Subject: krebs: shared-buildbot -> buildbot-krebs --- krebs/1systems/hotdog/config.nix | 2 +- krebs/1systems/puyak/config.nix | 2 +- krebs/1systems/wolf/config.nix | 2 +- krebs/2configs/buildbot-krebs.nix | 18 ++++++++++++++++++ krebs/2configs/shared-buildbot.nix | 18 ------------------ 5 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 krebs/2configs/buildbot-krebs.nix delete mode 100644 krebs/2configs/shared-buildbot.nix (limited to 'krebs') diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix index 26f392da..ab3db0f8 100644 --- a/krebs/1systems/hotdog/config.nix +++ b/krebs/1systems/hotdog/config.nix @@ -9,7 +9,7 @@ - + ]; krebs.build.host = config.krebs.hosts.hotdog; diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index e781f746..8454ba23 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -7,7 +7,7 @@ - + ]; diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index e883a176..a0113fce 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -12,7 +12,7 @@ in - + diff --git a/krebs/2configs/buildbot-krebs.nix b/krebs/2configs/buildbot-krebs.nix new file mode 100644 index 00000000..7f243b50 --- /dev/null +++ b/krebs/2configs/buildbot-krebs.nix @@ -0,0 +1,18 @@ +{ lib, config, pkgs, ... }: +{ + imports = [ + + ]; + + 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" + ]; + }; +} diff --git a/krebs/2configs/shared-buildbot.nix b/krebs/2configs/shared-buildbot.nix deleted file mode 100644 index 7f243b50..00000000 --- a/krebs/2configs/shared-buildbot.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, config, pkgs, ... }: -{ - imports = [ - - ]; - - 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" - ]; - }; -} -- cgit v1.2.3 From cc8cc1bb63517072d442ce5d11a5d610b1a70dd7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 28 Jul 2017 15:36:02 +0200 Subject: krebs hotdog: build all managed hosts (+ tests) --- krebs/1systems/hotdog/config.nix | 2 +- krebs/2configs/buildbot-all.nix | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 krebs/2configs/buildbot-all.nix (limited to 'krebs') diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix index ab3db0f8..c056b4ea 100644 --- a/krebs/1systems/hotdog/config.nix +++ b/krebs/1systems/hotdog/config.nix @@ -9,7 +9,7 @@ - + ]; krebs.build.host = config.krebs.hosts.hotdog; diff --git a/krebs/2configs/buildbot-all.nix b/krebs/2configs/buildbot-all.nix new file mode 100644 index 00000000..fe982c87 --- /dev/null +++ b/krebs/2configs/buildbot-all.nix @@ -0,0 +1,11 @@ +{ lib, config, pkgs, ... }: +{ + imports = [ + + ]; + krebs.ci.users.lass.all = true; + krebs.ci.users.makefu.all = true; + krebs.ci.users.nin.all = true; + krebs.ci.users.tv.all = true; +} + -- cgit v1.2.3 From 568798cc1ede5346f05272e4bec07794d6443c08 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 28 Jul 2017 18:18:31 +0200 Subject: cgit.prism.r: rip --- krebs/3modules/lass/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'krebs') diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index c554391f..224c6f83 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -97,7 +97,6 @@ with import ; aliases = [ "prism.r" "build.prism.r" - "cgit.prism.r" "cache.prism.r" "paste.r" "p.r" -- cgit v1.2.3 From f83fc4ba4b2ac2f6300e115133d6db1e871b7ca3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 28 Jul 2017 18:41:46 +0200 Subject: krebs fetchWallpaper: implement cond-file robuster --- krebs/3modules/fetchWallpaper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/3modules/fetchWallpaper.nix b/krebs/3modules/fetchWallpaper.nix index cdb9fe70..8d4933cb 100644 --- a/krebs/3modules/fetchWallpaper.nix +++ b/krebs/3modules/fetchWallpaper.nix @@ -51,7 +51,7 @@ let mkdir -p ${cfg.stateDir} chmod o+rx ${cfg.stateDir} cd ${cfg.stateDir} - (curl --max-time ${toString cfg.maxTime} -s -o wallpaper.tmp -z wallpaper ${shell.escape cfg.url} && mv wallpaper.tmp wallpaper) || : + (curl --max-time ${toString cfg.maxTime} -s -o wallpaper.tmp -z wallpaper.tmp ${shell.escape cfg.url} && cp wallpaper.tmp wallpaper) || : feh --no-fehbg --bg-scale ${shell.escape cfg.stateDir}/wallpaper ''; -- cgit v1.2.3 From 32d8c202b0ec037dcf78ebf6ecad730cfb9c5272 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 28 Jul 2017 20:20:40 +0200 Subject: icarus: set correct ipv6 --- krebs/3modules/lass/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 224c6f83..f0722e9b 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -254,7 +254,7 @@ with import ; nets = rec { retiolum = { ip4.addr = "10.243.133.114"; - ip6.addr = "42:0:0:0:0:0:1ca0:1205"; + ip6.addr = "42:0:0:0:0:0:01ca:1205"; aliases = [ "icarus.r" "cgit.icarus.r" -- cgit v1.2.3