mv makefu->krebs 3 buildbot

This commit is contained in:
makefu 2015-12-22 19:36:19 +01:00
parent c26ba8d7e6
commit bf1b6482ce
7 changed files with 38 additions and 18 deletions

View File

@ -143,7 +143,7 @@ let
${cfg.extraConfig} ${cfg.extraConfig}
''; '';
cfg = config.makefu.buildbot.master; cfg = config.krebs.buildbot.master;
api = { api = {
enable = mkEnableOption "Buildbot Master"; enable = mkEnableOption "Buildbot Master";
@ -258,6 +258,6 @@ let
}; };
in in
{ {
options.makefu.buildbot.master = api; options.krebs.buildbot.master = api;
config = mkIf cfg.enable imp; config = mkIf cfg.enable imp;
} }

View File

@ -39,7 +39,7 @@ let
s.setServiceParent(application) s.setServiceParent(application)
''; '';
default-packages = [ pkgs.git pkgs.bash ]; default-packages = [ pkgs.git pkgs.bash ];
cfg = config.makefu.buildbot.slave; cfg = config.krebs.buildbot.slave;
api = { api = {
enable = mkEnableOption "Buildbot Slave"; enable = mkEnableOption "Buildbot Slave";
@ -180,6 +180,6 @@ let
}; };
in in
{ {
options.makefu.buildbot.slave = api; options.krebs.buildbot.slave = api;
config = mkIf cfg.enable imp; config = mkIf cfg.enable imp;
} }

View File

@ -9,6 +9,8 @@ let
./apt-cacher-ng.nix ./apt-cacher-ng.nix
./bepasty-server.nix ./bepasty-server.nix
./build.nix ./build.nix
./buildbot/master.nix
./buildbot/slave.nix
./current.nix ./current.nix
./exim-retiolum.nix ./exim-retiolum.nix
./exim-smarthost.nix ./exim-smarthost.nix

View File

@ -2,8 +2,6 @@ _:
{ {
imports = [ imports = [
./buildbot/master.nix
./buildbot/slave.nix
]; ];
} }

View File

@ -11,7 +11,7 @@ in
../2configs/collectd-base.nix ../2configs/collectd-base.nix
../2configs/shack-nix-cacher.nix ../2configs/shack-nix-cacher.nix
../2configs/shack-drivedroid.nix ../2configs/shack-drivedroid.nix
../2configs/cac-ci.nix ../2configs/buildbot-standalone.nix
../2configs/graphite.nix ../2configs/graphite.nix
]; ];
# use your own binary cache, fallback use cache.nixos.org (which is used by # use your own binary cache, fallback use cache.nixos.org (which is used by

View File

@ -0,0 +1,31 @@
{ lib, config, pkgs, ... }:
let
pkgs-unst = import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz) {};
in {
nixpkgs.config.packageOverrides = pkgs: {
buildbot = pkgs-unst.buildbot;
buildbot-slave = pkgs-unst.buildbot-slave;
};
networking.firewall.allowedTCPPorts = [ 8010 ];
krebs.buildbot.master = {
enable = true;
irc = {
enable = true;
server = "cd.retiolum";
channel = "retiolum";
allowForce = true;
};
extraConfig = ''
c['buildbotURL'] = "http://${config.krebs.build.host.name}:8010/"
'';
};
krebs.buildbot.slave = {
enable = true;
masterhost = "localhost";
username = "testslave";
password = "krebspass";
packages = with pkgs;[ git nix ];
extraEnviron = { NIX_PATH="nixpkgs=${toString <nixpkgs>}"; };
};
}

View File

@ -1,11 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
{
environment.systemPackages = with pkgs;[
get
cac
cacpanel
jq
];
}