* Clean up administration.
svn path=/configurations/trunk/tud/; revision=29130
Eelco Dolstra committed
Sep 9, 2011 at 14:18 UTC
e17fe24f0f952e8379f88b709c4947a2dd192a3c
3 files changed
+12
-81
build-machines-hps.nix
deleted
-14
@@ -1,14 +0,0 @@
1
-# Configuration for the HPS build machines.
2
-
3
-{ config, pkgs, ... }:
4
-
5
-{
6
- require = [ ./build-machines-common.nix ];
7
-
8
- nixpkgs.system = "x86_64-linux";
9
-
10
- boot.initrd.kernelModules = ["3w_xxxx"];
11
- boot.kernelModules = ["kvm-intel"];
12
-
13
- nix.maxJobs = 2;
14
-}
machines.nix
+9
-65
@@ -1,7 +1,7 @@
1
lib: with lib;
2
3
[
4
- {
4
+ { # Web frontend.
5
hostName = "cartman";
6
ipAddress = "192.168.1.5";
7
system = "i686-linux";
@@ -9,7 +9,7 @@ lib: with lib;
9
maxJobs = 2;
10
}
11
12
- {
12
+ { # 8-core NixOS build machine.
13
hostName = "kenny";
14
ipAddress = "192.168.1.19";
15
ethernetAddress = "00:22:19:55:cc:0d";
@@ -19,7 +19,7 @@ lib: with lib;
19
buildUser = "buildfarm";
20
}
21
22
- {
22
+ { # 8-core NixOS build machine.
23
hostName = "stan";
24
ipAddress = "192.168.1.20";
25
ethernetAddress = "00:22:19:55:bf:2e";
@@ -29,7 +29,7 @@ lib: with lib;
29
buildUser = "buildfarm";
30
}
31
32
- {
32
+ { # 8-core NixOS build machine.
33
hostName = "kyle";
34
ipAddress = "192.168.1.21";
35
ethernetAddress = "00:22:19:55:c1:18";
@@ -39,7 +39,7 @@ lib: with lib;
39
buildUser = "buildfarm";
40
}
41
42
- {
42
+ { # Windows XP build machine.
43
hostName = "garrison";
44
ipAddress = "192.168.1.11";
45
ethernetAddress = "00:19:d1:10:37:54";
@@ -49,16 +49,6 @@ lib: with lib;
49
buildUser = "nix";
50
}
51
52
- {
53
- hostName = "terrance";
54
- ipAddress = "192.168.1.12";
55
- ethernetAddress = "00:19:d1:10:37:49";
56
- system = "i686-openbsd";
57
- aliases = ["openbsd-1"];
58
- maxJobs = 2;
59
- buildUser = "buildfarm";
60
- }
61
-
52
{
53
hostName = "phillip";
54
ipAddress = "192.168.1.13";
@@ -69,47 +59,7 @@ lib: with lib;
59
buildUser = "buildfarm";
60
}
61
72
- {
73
- hostName = "jimmy";
74
- ipAddress = "192.168.1.14";
75
- ethernetAddress = "00:16:76:9a:32:1d";
76
- system = "i686-linux";
77
- aliases = ["linux32-1" "linux32" "linux"];
78
- maxJobs = 2;
79
- #buildUser = "buildfarm";
80
- }
81
-
82
- {
83
- hostName = "timmy";
84
- ipAddress = "192.168.1.15";
85
- ethernetAddress = "00:19:d1:1d:c4:9a";
86
- system = "i686-linux";
87
- aliases = ["linux32-2"];
88
- maxJobs = 2;
89
- #buildUser = "buildfarm";
90
- }
91
-
92
- {
93
- hostName = "token";
94
- ipAddress = "192.168.1.16";
95
- ethernetAddress = "00:16:cb:a6:13:28";
96
- system = "i686-darwin";
97
- aliases = ["mac86-1" "mac"];
98
- maxJobs = 2;
99
- buildUser = "nix";
100
- }
101
-
102
- {
103
- hostName = "black";
104
- ipAddress = "192.168.1.17";
105
- ethernetAddress = "00:16:cb:a6:13:d7";
106
- system = "i686-darwin";
107
- aliases = ["mac86-2"];
108
- maxJobs = 2;
109
- buildUser = "nix";
110
- }
111
-
112
- {
62
+ { # 64-bit Mac OS X build machine.
63
hostName = "butters";
64
ipAddress = "192.168.1.23";
65
ethernetAddress = "00:24:36:f3:cd:c0";
@@ -119,25 +69,19 @@ lib: with lib;
69
buildUser = "nix";
70
}
71
122
- {
72
+ { # Old Hydra server.
73
hostName = "hydra";
74
ipAddress = "192.168.1.18";
75
ethernetAddress = "00:22:19:55:bf:24";
76
}
77
128
- {
129
- hostName = "chef";
130
- ipAddress = "192.168.1.22";
131
- ethernetAddress = "00:26:b9:35:bb:ca";
132
- }
133
-
134
- {
78
+ { # Xen machine.
79
hostName = "mrhankey";
80
ipAddress = "192.168.1.24";
81
ethernetAddress = "00:1D:09:0E:09:E5";
82
}
83
140
- {
84
+ { # New Hydra server.
85
hostName = "lucifer";
86
ipAddress = "192.168.1.25";
87
ethernetAddress = "84:2B:2B:0B:98:F0";
network.nix
+3
-2
@@ -1,12 +1,13 @@
1
{
2
- jimmy = import ./build-machines-hps.nix;
3
- timmy = import ./build-machines-hps.nix;
2
kenny = import ./build-machines-dell-1950.nix;
3
kyle = import ./build-machines-dell-1950.nix;
4
stan = import ./stan.nix;
5
cartman = import ./cartman.nix;
6
hydra = import ./hydra.nix;
7
lucifer = import ./lucifer.nix;
8
+ wendy = import ./wendy.nix;
9
+ ike = import ./build-machines-dell-r815.nix;
10
+ shelley = import ./build-machines-dell-r815.nix;
11
#mrkitty = import ./mrkitty.nix;
12
#mrhankey = import ./mrhankey.nix;
13
}