diff options
| -rw-r--r-- | lass/2configs/buildbot-standalone.nix | 41 | ||||
| -rw-r--r-- | tv/1systems/alnus.nix | 2 | ||||
| -rw-r--r-- | tv/1systems/mu.nix | 3 | ||||
| -rw-r--r-- | tv/1systems/wu.nix | 2 | ||||
| -rw-r--r-- | tv/1systems/xu.nix | 2 | ||||
| -rw-r--r-- | tv/1systems/zu.nix | 2 |
6 files changed, 31 insertions, 21 deletions
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 766fd715..1db3ffd1 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, diff --git a/tv/1systems/alnus.nix b/tv/1systems/alnus.nix index a9646b58..d3de8bdf 100644 --- a/tv/1systems/alnus.nix +++ b/tv/1systems/alnus.nix @@ -69,8 +69,6 @@ with config.krebs.lib; nixpkgs.config = { allowUnfree = true; - chromium.enablePepperFlash = true; - firefox.enableAdobeFlash = true; }; services.xserver = { diff --git a/tv/1systems/mu.nix b/tv/1systems/mu.nix index e7908e29..55f18326 100644 --- a/tv/1systems/mu.nix +++ b/tv/1systems/mu.nix @@ -59,9 +59,6 @@ with config.krebs.lib; swapDevices =[ ]; - nixpkgs.config.firefox.enableAdobeFlash = true; - nixpkgs.config.chromium.enablePepperFlash = true; - nixpkgs.config.allowUnfree = true; hardware.opengl.driSupport32Bit = true; diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index a2e113e1..c2a624a9 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -142,8 +142,6 @@ with config.krebs.lib; }; }; - nixpkgs.config.chromium.enablePepperFlash = true; - krebs.nixpkgs.allowUnfreePredicate = pkg: hasPrefix "nvidia-x11-" pkg.name; hardware.bumblebee.enable = true; hardware.bumblebee.group = "video"; diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix index fec0a02c..642593fc 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -153,8 +153,6 @@ with config.krebs.lib; }; }; - nixpkgs.config.chromium.enablePepperFlash = true; - environment.systemPackages = with pkgs; [ ethtool tinc_pre diff --git a/tv/1systems/zu.nix b/tv/1systems/zu.nix index c0d51436..0503021d 100644 --- a/tv/1systems/zu.nix +++ b/tv/1systems/zu.nix @@ -159,8 +159,6 @@ with config.krebs.lib; }; }; - nixpkgs.config.chromium.enablePepperFlash = true; - environment.systemPackages = with pkgs; [ ethtool tinc_pre |