diff options
author | lassulus <lass@aidsballs.de> | 2015-12-30 17:16:05 +0100 |
---|---|---|
committer | lassulus <lass@aidsballs.de> | 2015-12-30 17:16:05 +0100 |
commit | 9b890750e24f43182ebf1732871a60d9e0c74c89 (patch) | |
tree | 4b3edf06c425b74d6209a3ea08d6ef1b48c2f15a /shared | |
parent | f16742895c26b0f3df71ca8503afc5f4cb97a9ae (diff) | |
parent | c625c7d422d5bfe6b4cdbafc6dd9eb0253673776 (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'shared')
-rw-r--r-- | shared/1systems/test-minimal-deploy.nix | 13 | ||||
-rw-r--r-- | shared/2configs/buildbot-standalone.nix | 11 |
2 files changed, 24 insertions, 0 deletions
diff --git a/shared/1systems/test-minimal-deploy.nix b/shared/1systems/test-minimal-deploy.nix new file mode 100644 index 000000000..ddd96f6b5 --- /dev/null +++ b/shared/1systems/test-minimal-deploy.nix @@ -0,0 +1,13 @@ +{ config, pkgs, lib, ... }: +{ + krebs = { + enable = true; + build.user = config.krebs.users.shared; + build.host = config.krebs.hosts.test-all-krebs-modules; + }; + # just get the system running + boot.loader.grub.devices = ["/dev/sda"]; + fileSystems."/" = { + device = "/dev/lol"; + }; +} diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix index c62f8920c..6ffd7fe8a 100644 --- a/shared/2configs/buildbot-standalone.nix +++ b/shared/2configs/buildbot-standalone.nix @@ -94,6 +94,17 @@ in { --argstr current-host-name lol \ --strict --json"]) + addShell(f,name="instantiate-test-minimal-deploy",env=env, + command=nixshell + \ + ["nix-instantiate --eval -A \ + users.shared.test-minimal-deploy.system \ + -I stockholm=. \ + -I secrets=. '<stockholm>' \ + --argstr current-date lol \ + --argstr current-user-name shared \ + --argstr current-host-name lol \ + --strict --json"]) + bu.append(util.BuilderConfig(name="fast-tests", slavenames=slavenames, factory=f)) |