From c1957eb83f64d3910c7680d3f4048d7da1b486f5 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 3 Aug 2016 08:19:47 +0200 Subject: l 2 buildbot: use make for fast-tests --- lass/2configs/buildbot-standalone.nix | 41 ++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 10 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 766fd715e..1db3ffd1f 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -66,6 +66,11 @@ in { "NIX_REMOTE": "daemon", "dummy_secrets": "true", } + env_shared = { + "LOGNAME": "shared", + "NIX_REMOTE": "daemon", + "dummy_secrets": "true", + } # prepare nix-shell # the dependencies which are used by the test script @@ -114,19 +119,35 @@ in { fast-tests = '' f = util.BuildFactory() f.addStep(grab_repo) - for i in [ "prism", "mors", "echelon" ]: - addShell(f,name="populate-{}".format(i),env=env_lass, + for i in [ "mors", "uriel", "shodan", "helios", "cloudkrebs", "echelon", "dishfire", "prism" ]: + addShell(f,name="build-{}".format(i),env=env_lass, + command=nixshell + \ + ["make \ + test \ + ssh=${sshWrapper} \ + target=build@localhost${config.users.users.build.home}/testbuild \ + method=eval \ + system={}".format(i)]) + + for i in [ "x", "wry", "vbob", "wbob", "shoney" ]: + addShell(f,name="build-{}".format(i),env=env_makefu, command=nixshell + \ - ["{}(make system={} populate debug=true)".format("!" if "failing" in i else "",i)]) + ["make \ + test \ + ssh=${sshWrapper} \ + target=build@localhost${config.users.users.build.home}/testbuild \ + method=eval \ + system={}".format(i)]) - addShell(f,name="build-test-minimal",env=env_lass, + for i in [ "test-minimal-deploy" ]: + addShell(f,name="build-{}".format(i),env=env_shared, command=nixshell + \ - ["nix-instantiate \ - --show-trace --eval --strict --json \ - -I nixos-config=./shared/1systems/test-minimal-deploy.nix \ - -I secrets=. \ - -A config.system.build.toplevel"] - ) + ["make \ + test \ + ssh=${sshWrapper} \ + target=build@localhost${config.users.users.build.home}/testbuild \ + method=eval \ + system={}".format(i)]) bu.append(util.BuilderConfig(name="fast-tests", slavenames=slavenames, -- cgit v1.2.3 From 3602962200eadaa4f6748bf00cc6b92e188ce964 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 4 Aug 2016 23:59:12 +0200 Subject: l 2 buildbotMaster: don't use ssh anymore --- lass/2configs/buildbot-standalone.nix | 37 ++++++++++++++++------------------- 1 file changed, 17 insertions(+), 20 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 1db3ffd1f..90a990339 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -8,9 +8,6 @@ let ControlPath /tmp/%u_sshmux_%r@%h:%p ControlPersist 4h ''; - sshWrapper = pkgs.writeDash "ssh-wrapper" '' - ${pkgs.openssh}/bin/ssh -F ${sshHostConfig} -i ${shell.escape config.lass.build-ssh-privkey.path} "$@" - ''; in { config.krebs.buildbot.master = let @@ -74,7 +71,7 @@ in { # prepare nix-shell # the dependencies which are used by the test script - deps = [ "gnumake", "jq", "nix", "(import ).pkgs.populate" ] + deps = [ "gnumake", "jq", "nix", "(import ).pkgs.populate", "openssh" ] # TODO: --pure , prepare ENV in nix-shell command: # SSL_CERT_FILE,LOGNAME,NIX_REMOTE nixshell = ["nix-shell", @@ -93,20 +90,20 @@ in { for i in [ "mors", "uriel", "shodan", "helios", "cloudkrebs", "echelon", "dishfire", "prism" ]: addShell(f,name="build-{}".format(i),env=env_lass, command=nixshell + \ - ["make \ + ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \ + make \ test \ - ssh=${sshWrapper} \ - target=build@localhost${config.users.users.build.home}/testbuild \ + target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \ method=build \ system={}".format(i)]) for i in [ "x", "wry", "vbob", "wbob", "shoney" ]: addShell(f,name="build-{}".format(i),env=env_makefu, command=nixshell + \ - ["make \ + ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \ + make \ test \ - ssh=${sshWrapper} \ - target=build@localhost${config.users.users.build.home}/testbuild \ + target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \ method=build \ system={}".format(i)]) @@ -122,30 +119,30 @@ in { for i in [ "mors", "uriel", "shodan", "helios", "cloudkrebs", "echelon", "dishfire", "prism" ]: addShell(f,name="build-{}".format(i),env=env_lass, command=nixshell + \ - ["make \ + ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \ + make \ test \ - ssh=${sshWrapper} \ - target=build@localhost${config.users.users.build.home}/testbuild \ + target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \ method=eval \ system={}".format(i)]) for i in [ "x", "wry", "vbob", "wbob", "shoney" ]: addShell(f,name="build-{}".format(i),env=env_makefu, command=nixshell + \ - ["make \ + ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \ + make \ test \ - ssh=${sshWrapper} \ - target=build@localhost${config.users.users.build.home}/testbuild \ + target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \ method=eval \ system={}".format(i)]) - for i in [ "test-minimal-deploy" ]: + for i in [ "test-minimal-deploy", "test-all-krebs-modules", "wolf" ]: addShell(f,name="build-{}".format(i),env=env_shared, command=nixshell + \ - ["make \ + ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \ + make \ test \ - ssh=${sshWrapper} \ - target=build@localhost${config.users.users.build.home}/testbuild \ + target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \ method=eval \ system={}".format(i)]) -- cgit v1.2.3 From ececc8718df233cbfa516caf87d498391db4ee75 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 5 Aug 2016 00:00:27 +0200 Subject: l 2 baseX: add mainUser to video group --- lass/2configs/baseX.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs') diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 6d26ff89a..dce7dae40 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -16,7 +16,7 @@ in { systemWide = true; }; - users.extraUsers.mainUser.extraGroups = [ "audio" ]; + users.extraUsers.mainUser.extraGroups = [ "audio" "video" ]; time.timeZone = "Europe/Berlin"; -- cgit v1.2.3 From 25ab30726a4b6bea9fb907a40c55765b56731ac2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 5 Aug 2016 00:00:43 +0200 Subject: l 2: mkForce NIX_PATH to /var/src --- lass/2configs/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lass/2configs') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 622ef1185..dbb2a853a 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -44,6 +44,11 @@ with config.krebs.lib; }; }; } + { + environment.variables = { + NIX_PATH = mkForce "secrets=/var/src/stockholm/null:/var/src"; + }; + } ]; networking.hostName = config.krebs.build.host.name; -- cgit v1.2.3 From f0925c5c44780a623137d82a1f923de628b2f868 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 5 Aug 2016 17:49:40 +0200 Subject: l 2 nixpkgs: c6ca9c8 -> a75c0d9 --- lass/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs') diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index b758bc24a..576447542 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/lassulus/nixpkgs; - ref = "c6ca9c8c8b7eb8f8e68868e36fb90e162adf080f"; + ref = "a75c0d9342ecb86dedd11f61a4e6f59ecc42d151"; }; } -- cgit v1.2.3