summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/3modules/makefu/default.nix24
-rw-r--r--makefu/1systems/darth.nix15
-rw-r--r--makefu/1systems/filepimp.nix27
-rw-r--r--shared/2configs/shared-buildbot.nix3
4 files changed, 59 insertions, 10 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index 1fcf07b1e..49273d8bd 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -23,7 +23,29 @@ with config.krebs.lib;
TG12MT+XQr6JUu4jPpzdhb6H/36V6ADCIkBjzWh0iSfWGiFDQFinD+YSWbA1NOTr
Qtd1I3Ov+He7uc2Z719mb0Og2kCGnCnPIwIDAQAB
-----END RSA PUBLIC KEY-----
- '';
+ '';
+ };
+ };
+ };
+ darth = {
+ cores = 4;
+ nets = {
+ retiolum = {
+ addrs4 = ["10.243.0.84"];
+ addrs6 = ["42:ff6b:5f0b:460d:2cee:4d05:73f7:5566/128"];
+ aliases = [
+ "darth.retiolum"
+ ];
+ tinc.pubkey = ''
+ -----BEGIN RSA PUBLIC KEY-----
+ MIIBCgKCAQEA1pWNU+FY9XpQxw6srUb5mvGFgqSyJQAelFoufZng6EFeTnAzQOdq
+ qT7IWN+o3kSbQQsC2tQUnRYFoPagsgFP610D+LGwmeJlNgAf23gBI9ar1agUAvYX
+ yzYBj7R9OgGXHm6ECKwsxUJoGxM4L0l6mk/rTMVFnzgYPbpVJk1o6NPmiZhW8xIi
+ 3BfxJUSt8rEQ1OudCirvdSr9uYv/WMR5B538wg4JeQK715yKEYbYi8bqOPnTvGD8
+ q5HRwXszWzCYYnqrdlmXzoCA1fT4vQdtov+63CvHT2RV7o42ruGZbHy7JIX9X3IE
+ u0nA8nZhZ5byhWGCpDyr6bTkvwJpltJypQIDAQAB
+ -----END RSA PUBLIC KEY-----
+ '';
};
};
};
diff --git a/makefu/1systems/darth.nix b/makefu/1systems/darth.nix
new file mode 100644
index 000000000..322960354
--- /dev/null
+++ b/makefu/1systems/darth.nix
@@ -0,0 +1,15 @@
+{ config, pkgs, ... }:
+{
+ imports =
+ [
+ ../2configs/fs/single-partition-ext4.nix
+ ../2configs/zsh-user.nix
+ ];
+ krebs = {
+ enable = true;
+ retiolum.enable = true;
+ build.host = config.krebs.hosts.darth;
+ };
+ # You want to change these :)
+ boot.loader.grub.device = "/dev/sda";
+}
diff --git a/makefu/1systems/filepimp.nix b/makefu/1systems/filepimp.nix
index f2c592ea9..2a78b45a4 100644
--- a/makefu/1systems/filepimp.nix
+++ b/makefu/1systems/filepimp.nix
@@ -3,11 +3,19 @@ let
byid = dev: "/dev/disk/by-id/" + dev;
part1 = disk: disk + "-part1";
rootDisk = byid "ata-SanDisk_SDSSDP064G_140237402890";
- jDisk0 = byid "ata-ST4000DM000-1F2168_Z303HVSG";
+ # N54L Chassis:
+ # ____________________
+ # |______FRONT_______|
+ # | [ ]|
+ # | [ d1 ** d3 d4 ]|
+ # |___[_____________]|
jDisk1 = byid "ata-ST4000DM000-1F2168_Z3040NEA";
+
+ # transfer to omo
+ # jDisk0 = byid "ata-ST4000DM000-1F2168_Z303HVSG";
jDisk2 = byid "ata-WDC_WD40EFRX-68WT0N0_WD-WCC4E0621363";
jDisk3 = byid "ata-TOSHIBA_MD04ACA400_156GK89OFSBA";
- allDisks = [ rootDisk jDisk0 jDisk1 jDisk2 jDisk3 ];
+ allDisks = [ rootDisk jDisk1 jDisk2 jDisk3 ];
in {
imports =
[ # Include the results of the hardware scan.
@@ -44,7 +52,11 @@ in {
in {
enable = true;
# todo combine creation when enabling the mount point
- disks = map toMedia [ "j0" "j1" "j2" ];
+ disks = map toMedia [
+ # "j0"
+ "j1"
+ "j2"
+ ];
parity = toMedia "par0";
};
# TODO: refactor, copy-paste from omo
@@ -58,8 +70,9 @@ in {
xfsmount = name: dev:
{ "/media/${name}" = { device = dev; fsType = "xfs"; }; };
in
- (xfsmount "j0" (part1 jDisk0))
- // (xfsmount "j1" (part1 jDisk1))
- // (xfsmount "j2" (part1 jDisk2))
- // (xfsmount "par0" (part1 jDisk3));
+ # (xfsmount "j0" (part1 jDisk0)) //
+ (xfsmount "j1" (part1 jDisk1)) //
+ (xfsmount "j2" (part1 jDisk2)) //
+ (xfsmount "par0" (part1 jDisk3))
+ ;
}
diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix
index b474af7b3..9804580db 100644
--- a/shared/2configs/shared-buildbot.nix
+++ b/shared/2configs/shared-buildbot.nix
@@ -144,7 +144,6 @@
# * retiolum
s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/cac.json", slavedest="cac.json"))
s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/retiolum-ci.rsa_key.priv", slavedest="retiolum.rsa_key.priv"))
-
addShell(s, name="infest-cac-centos7",env=env,
sigtermTime=60, # SIGTERM 1 minute before SIGKILL
timeout=10800, # 3h
@@ -173,7 +172,7 @@
masterhost = "localhost";
username = "testslave";
password = "krebspass";
- packages = with pkgs;[ git nix ];
+ packages = with pkgs;[ git nix gnumake jq rsync ];
# all nix commands will need a working nixpkgs installation
extraEnviron = {
NIX_PATH="nixpkgs=/var/src/nixpkgs:nixos-config=./shared/1systems/wolf.nix"; };