Merge remote-tracking branch 'lass/master'
This commit is contained in:
commit
eb0bd41a0d
@ -142,8 +142,7 @@ in {
|
|||||||
}
|
}
|
||||||
{
|
{
|
||||||
users.users.chat.openssh.authorizedKeys.keys = [
|
users.users.chat.openssh.authorizedKeys.keys = [
|
||||||
"ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAHF9tijlMoEevRZCG1AggukxWggfxPHUwg6Ye113ODG6PZ2m98oSmnsjixDy4GfIJjy+8HBbkwS6iH+fsNk86QtAgFNMjBl+9YvEzNRBzcyCqdOkZFvvZvV2oYA7I15il4ln62PDPKjEIS3YPhZPSwc6GhrlsFTnIG56NF/93IhF7R/FA== JuiceSSH"
|
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDiupmvj8gmiqIUTk9t4AOZ6bYvIpMMuNZULwIu/lbq8epK+FyvjRtCxqkLgFw0BfNYHzT9fxJ3kZY+nf/pnpI0j8TRwLAyPnfKuBfehrtzjdNbf1jCB9BQAaLoBHkLUFLJxskIC11nHx5KJVJvZBZZ6Odq1WIb4RZXjtEreQfvF8+YyFgHQ/epmQupKK6agHGkjtqvH+hz//dwDqHU9orj8MCWxNaa2wUgn+5laAvpLS15MQeCDIz8GJtJWToETY6bvldiLp2hIAJmgx8LIecV1h7YPR81Rk80gIk3f0PDfsLnnM6ibkI5p8NGh7nRKAdf+W90HpBIHKMRpRkMYvgL3ejVuKJZyzhYKUArA6egNRAN2d67eOpR/yKV5LjRxv+JBCOln5ynDbAmP4Hq98h+0K9Md7VavrRJzzPRTH3MPx+OKqsnRBRjhKsRFIUaO6/TBjZF4RCbbSSbvBW1u+qbTWX1MGUJNB5huL/OIBdHHcTb6GI3W4Svtgq4in2KI4COBhUJogm5UmaXRHtgqvn8byxutIsXMOTFjjdDK6r7mmOj1mzlu5wEHAV6FRsII92pf4WO2GYEUxz1ABu4HvRsVKlvYoEwwBhpXecTve6nogAiDvuxHjUX1eup3If3s4SvNirNPPUQuzNriYJ4JXiU6pGCJcBgxhl+NQ7ajxCdaw== JuiceSSH"
|
||||||
config.krebs.users.lass-uriel.pubkey
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
@ -13,8 +13,8 @@ in {
|
|||||||
config.krebs.buildbot.master = let
|
config.krebs.buildbot.master = let
|
||||||
stockholm-mirror-url = http://cgit.prism/stockholm ;
|
stockholm-mirror-url = http://cgit.prism/stockholm ;
|
||||||
in {
|
in {
|
||||||
slaves = {
|
workers = {
|
||||||
testslave = "lasspass";
|
testworker = "lasspass";
|
||||||
};
|
};
|
||||||
change_source.stockholm = ''
|
change_source.stockholm = ''
|
||||||
stockholm_repo = '${stockholm-mirror-url}'
|
stockholm_repo = '${stockholm-mirror-url}'
|
||||||
@ -36,7 +36,7 @@ in {
|
|||||||
};
|
};
|
||||||
builder_pre = ''
|
builder_pre = ''
|
||||||
# prepare grab_repo step for stockholm
|
# prepare grab_repo step for stockholm
|
||||||
grab_repo = steps.Git(repourl=stockholm_repo, mode='incremental')
|
grab_repo = steps.Git(repourl=stockholm_repo, mode='incremental', alwaysUseLatest=True)
|
||||||
|
|
||||||
# TODO: get nixpkgs/stockholm paths from krebs
|
# TODO: get nixpkgs/stockholm paths from krebs
|
||||||
env_lass = {
|
env_lass = {
|
||||||
@ -94,7 +94,7 @@ in {
|
|||||||
system={}".format(i)])
|
system={}".format(i)])
|
||||||
|
|
||||||
bu.append(util.BuilderConfig(name="build-all",
|
bu.append(util.BuilderConfig(name="build-all",
|
||||||
slavenames=slavenames,
|
workernames=workernames,
|
||||||
factory=f))
|
factory=f))
|
||||||
|
|
||||||
'';
|
'';
|
||||||
@ -152,7 +152,7 @@ in {
|
|||||||
make system=prism pkgs.{}".format(i)])
|
make system=prism pkgs.{}".format(i)])
|
||||||
|
|
||||||
bu.append(util.BuilderConfig(name="build-pkgs",
|
bu.append(util.BuilderConfig(name="build-pkgs",
|
||||||
slavenames=slavenames,
|
workernames=workernames,
|
||||||
factory=f))
|
factory=f))
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
@ -162,15 +162,15 @@ in {
|
|||||||
enable = true;
|
enable = true;
|
||||||
nick = "buildbot-lass";
|
nick = "buildbot-lass";
|
||||||
server = "ni.r";
|
server = "ni.r";
|
||||||
channels = [ { channels = "retiolum"; } ];
|
channels = [ { channel = "retiolum"; } ];
|
||||||
allowForce = true;
|
allowForce = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config.krebs.buildbot.slave = {
|
config.krebs.buildbot.worker = {
|
||||||
enable = true;
|
enable = true;
|
||||||
masterhost = "localhost";
|
masterhost = "localhost";
|
||||||
username = "testslave";
|
username = "testworker";
|
||||||
password = "lasspass";
|
password = "lasspass";
|
||||||
packages = with pkgs; [ gnumake jq nix populate ];
|
packages = with pkgs; [ gnumake jq nix populate ];
|
||||||
extraEnviron = {
|
extraEnviron = {
|
||||||
@ -190,8 +190,8 @@ in {
|
|||||||
options.lass.build-ssh-privkey = mkOption {
|
options.lass.build-ssh-privkey = mkOption {
|
||||||
type = types.secret-file;
|
type = types.secret-file;
|
||||||
default = {
|
default = {
|
||||||
path = "${config.users.users.buildbotSlave.home}/ssh.privkey";
|
path = "${config.users.users.buildbotworker.home}/ssh.privkey";
|
||||||
owner = { inherit (config.users.users.buildbotSlave ) name uid;};
|
owner = { inherit (config.users.users.buildbotworker ) name uid;};
|
||||||
source-path = toString <secrets> + "/build.ssh.key";
|
source-path = toString <secrets> + "/build.ssh.key";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -26,7 +26,7 @@ let
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
daemonConf = pkgs.writeText "daemon.conf" ''
|
daemonConf = pkgs.writeText "daemon.conf" ''
|
||||||
exit-idle-time=0
|
exit-idle-time=-1
|
||||||
flat-volumes = no
|
flat-volumes = no
|
||||||
default-fragments = 4
|
default-fragments = 4
|
||||||
default-fragment-size-msec = 25
|
default-fragment-size-msec = 25
|
||||||
|
Loading…
Reference in New Issue
Block a user