From d98578e3e190463a341a94f2cc778ef886f9252d Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 8 Feb 2016 01:07:03 +0100 Subject: rm krebs.build.target --- shared/1systems/wolf.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'shared') diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix index bcfbd6810..9a514428a 100644 --- a/shared/1systems/wolf.nix +++ b/shared/1systems/wolf.nix @@ -45,7 +45,6 @@ in # uninteresting stuff ##################### krebs.build.host = config.krebs.hosts.wolf; - krebs.build.target = "wolf"; boot.kernel.sysctl = { # Enable IPv6 Privacy Extensions -- cgit v1.2.3 From 0cf6d065f43c66efadd0a364c3414e6ecdae0004 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 11 Feb 2016 03:47:26 +0100 Subject: *: turn 5pkgs into a(n optional) module --- shared/5pkgs/default.nix | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 shared/5pkgs/default.nix (limited to 'shared') diff --git a/shared/5pkgs/default.nix b/shared/5pkgs/default.nix deleted file mode 100644 index fdcfbb209..000000000 --- a/shared/5pkgs/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -# TODO don't require 5pkgs -_: - -{ -} -- cgit v1.2.3 From cb9ff724b6420c9ef54ec0b620710c3632ce5be7 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 11 Feb 2016 21:03:30 +0100 Subject: s 2 buildbot: poll stockholm-mirror --- shared/2configs/shared-buildbot.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'shared') diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix index 50b279036..af877f5d8 100644 --- a/shared/2configs/shared-buildbot.nix +++ b/shared/2configs/shared-buildbot.nix @@ -12,10 +12,10 @@ testslave = "krebspass"; }; change_source.stockholm = '' - stockholm_repo = 'http://cgit.gum/stockholm' + stockholm_repo = 'http://cgit.wolf/stockholm-mirror' cs.append(changes.GitPoller( stockholm_repo, - workdir='stockholm-poller', branch='master', + workdir='stockholm-poller', branches=True, project='stockholm', pollinterval=120)) ''; @@ -28,7 +28,9 @@ fast-tests-scheduler = '' # test the master real quick sched.append(schedulers.SingleBranchScheduler( - change_filter=util.ChangeFilter(branch="master"), + ## 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", builderNames=["fast-tests"])) @@ -52,7 +54,6 @@ }; builder_pre = '' # prepare grab_repo step for stockholm - stockholm_repo = "http://cgit.gum.retiolum/stockholm" grab_repo = steps.Git(repourl=stockholm_repo, mode='incremental') env = {"LOGNAME": "shared", "NIX_REMOTE": "daemon"} @@ -78,8 +79,11 @@ f.addStep(grab_repo) for i in [ "test-centos7", "wolf", "test-failing" ]: addShell(f,name="populate-{}".format(i),env=env, - command=nixshell + ["set -o pipefail;{}( nix-instantiate --arg configuration shared/1systems/{}.nix --eval --readonly-mode --show-trace -A config.krebs.build.populate --strict | jq -r .)".format("!" if "failing" in i else "",i)]) + command=nixshell + \ + ["{}( make system={} eval.config.krebs.build.populate \ + | jq -er .)".format("!" if "failing" in i else "",i)]) + # XXX we must prepare ./retiolum.rsa_key.priv for secrets to work addShell(f,name="instantiate-test-all-modules",env=env, command=nixshell + \ ["touch retiolum.rsa_key.priv; \ -- cgit v1.2.3 From e8a0058f8cd654247eb0b08326dd34c3ac9cff6a Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 11 Feb 2016 23:38:12 +0100 Subject: s 2 base: bump revision --- shared/2configs/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shared') diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix index dd698ba97..715397ed5 100644 --- a/shared/2configs/base.nix +++ b/shared/2configs/base.nix @@ -18,7 +18,7 @@ with lib; krebs.build.source = { upstream-nixpkgs = mkDefault { url = https://github.com/NixOS/nixpkgs; - rev = "d0e3cca"; + rev = "77f8f35d57618c1ba456d968524f2fb2c3448295"; # for urlwatch-minidb }; secrets = mkDefault "${getEnv "HOME"}/secrets/krebs/${config.krebs.build.host.name}"; stockholm = mkDefault "${getEnv "HOME"}/stockholm"; -- cgit v1.2.3 From 673853e092c211e26a08030f87f9c868c6442a71 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 14 Feb 2016 16:43:44 +0100 Subject: RIP specialArgs.lib --- shared/2configs/base.nix | 2 +- shared/2configs/cgit-mirror.nix | 2 +- shared/2configs/collectd-base.nix | 2 +- shared/2configs/graphite.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'shared') diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix index 715397ed5..679764bc6 100644 --- a/shared/2configs/base.nix +++ b/shared/2configs/base.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with lib; +with config.krebs.lib; { krebs.enable = true; krebs.retiolum = { diff --git a/shared/2configs/cgit-mirror.nix b/shared/2configs/cgit-mirror.nix index 4ff1902f9..d30f1444f 100644 --- a/shared/2configs/cgit-mirror.nix +++ b/shared/2configs/cgit-mirror.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with lib; +with config.krebs.lib; let rules = with git; singleton { user = [ git-sync ]; diff --git a/shared/2configs/collectd-base.nix b/shared/2configs/collectd-base.nix index 3b792bf23..9c63dcd20 100644 --- a/shared/2configs/collectd-base.nix +++ b/shared/2configs/collectd-base.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: # TODO: krebs.collectd.plugins -with lib; +with config.krebs.lib; let connect-time-cfg = with pkgs; writeText "collectd-connect-time.conf" '' LoadPlugin python diff --git a/shared/2configs/graphite.nix b/shared/2configs/graphite.nix index 707ec6e9a..37c6b09fd 100644 --- a/shared/2configs/graphite.nix +++ b/shared/2configs/graphite.nix @@ -5,7 +5,7 @@ # TODO: krebs.graphite.minimal.enable # TODO: configure firewall -with lib; +with config.krebs.lib; { imports = [ ]; -- cgit v1.2.3 From 8f520b19b623919fa6319029a955d43fd051773c Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 15 Feb 2016 16:27:11 +0100 Subject: don't try to mimic nixpkgs --- shared/1systems/test-all-krebs-modules.nix | 3 +++ shared/1systems/test-arch.nix | 1 + shared/1systems/test-centos6.nix | 1 + shared/1systems/test-centos7.nix | 1 + shared/1systems/test-failing.nix | 3 +++ shared/1systems/test-minimal-deploy.nix | 3 +++ shared/1systems/wolf.nix | 1 + shared/2configs/base.nix | 4 +--- shared/default.nix | 7 +++++++ 9 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 shared/default.nix (limited to 'shared') diff --git a/shared/1systems/test-all-krebs-modules.nix b/shared/1systems/test-all-krebs-modules.nix index b98004dfe..e1021c7e0 100644 --- a/shared/1systems/test-all-krebs-modules.nix +++ b/shared/1systems/test-all-krebs-modules.nix @@ -2,6 +2,9 @@ let en = { enable = true;}; in { + imports = [ + ../. + ]; krebs = { enable = true; build.user = config.krebs.users.shared; diff --git a/shared/1systems/test-arch.nix b/shared/1systems/test-arch.nix index ece209490..14fc0384b 100644 --- a/shared/1systems/test-arch.nix +++ b/shared/1systems/test-arch.nix @@ -2,6 +2,7 @@ { imports = [ + ../. ../2configs/base.nix { boot.loader.grub = { diff --git a/shared/1systems/test-centos6.nix b/shared/1systems/test-centos6.nix index a8b5f9b9c..8add0b7c1 100644 --- a/shared/1systems/test-centos6.nix +++ b/shared/1systems/test-centos6.nix @@ -7,6 +7,7 @@ let gw = "168.235.148.1"; in { imports = [ + ../. ../2configs/base.nix ../2configs/os-templates/CAC-CentOS-6.5-64bit.nix { diff --git a/shared/1systems/test-centos7.nix b/shared/1systems/test-centos7.nix index 48cecc877..65daff509 100644 --- a/shared/1systems/test-centos7.nix +++ b/shared/1systems/test-centos7.nix @@ -5,6 +5,7 @@ let in { imports = [ + ../. ../2configs/base.nix ../2configs/os-templates/CAC-CentOS-7-64bit.nix ../2configs/temp/networking.nix diff --git a/shared/1systems/test-failing.nix b/shared/1systems/test-failing.nix index 81a9e48d6..fe1c2cb65 100644 --- a/shared/1systems/test-failing.nix +++ b/shared/1systems/test-failing.nix @@ -1,6 +1,9 @@ { config, pkgs, ... }: { + imports = [ + ../. + ]; programs.ssh.startAgent = true; programs.ssh.startAgent = false; } diff --git a/shared/1systems/test-minimal-deploy.nix b/shared/1systems/test-minimal-deploy.nix index 309e28950..bec2b38d5 100644 --- a/shared/1systems/test-minimal-deploy.nix +++ b/shared/1systems/test-minimal-deploy.nix @@ -1,5 +1,8 @@ { config, pkgs, lib, ... }: { + imports = [ + ../. + ]; krebs = { enable = true; build.user = config.krebs.users.shared; diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix index 9a514428a..317591433 100644 --- a/shared/1systems/wolf.nix +++ b/shared/1systems/wolf.nix @@ -6,6 +6,7 @@ let in { imports = [ + ../. ../2configs/base.nix ../2configs/collectd-base.nix diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix index 679764bc6..9f998b554 100644 --- a/shared/2configs/base.nix +++ b/shared/2configs/base.nix @@ -16,7 +16,7 @@ with config.krebs.lib; # TODO rename shared user to "krebs" krebs.build.user = mkDefault config.krebs.users.shared; krebs.build.source = { - upstream-nixpkgs = mkDefault { + nixpkgs = mkDefault { url = https://github.com/NixOS/nixpkgs; rev = "77f8f35d57618c1ba456d968524f2fb2c3448295"; # for urlwatch-minidb }; @@ -24,8 +24,6 @@ with config.krebs.lib; stockholm = mkDefault "${getEnv "HOME"}/stockholm"; nixos-config = "symlink:stockholm/${config.krebs.build.user.name}/1systems/${config.krebs.build.host.name}.nix"; - nixpkgs = symlink:stockholm/nixpkgs; - stockholm-user = "symlink:stockholm/${config.krebs.build.user.name}"; }; networking.hostName = config.krebs.build.host.name; diff --git a/shared/default.nix b/shared/default.nix new file mode 100644 index 000000000..69b4abaac --- /dev/null +++ b/shared/default.nix @@ -0,0 +1,7 @@ +_: +{ + imports = [ + ../krebs + ./3modules + ]; +} -- cgit v1.2.3