diff options
author | makefu <github@syntax-fehler.de> | 2015-12-22 19:36:19 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-12-22 19:36:22 +0100 |
commit | bf1b6482ce3535ef7e7b3f77879def12ff454c0c (patch) | |
tree | 213796230e6075084f43835df7a3db0360e66ffd | |
parent | c26ba8d7e674a02995ae613327208f4d9771546b (diff) |
mv makefu->krebs 3 buildbot
-rw-r--r-- | krebs/3modules/buildbot/master.nix (renamed from makefu/3modules/buildbot/master.nix) | 4 | ||||
-rw-r--r-- | krebs/3modules/buildbot/slave.nix (renamed from makefu/3modules/buildbot/slave.nix) | 4 | ||||
-rw-r--r-- | krebs/3modules/default.nix | 2 | ||||
-rw-r--r-- | makefu/3modules/default.nix | 2 | ||||
-rw-r--r-- | shared/1systems/wolf.nix | 2 | ||||
-rw-r--r-- | shared/2configs/buildbot-standalone.nix | 31 | ||||
-rw-r--r-- | shared/2configs/cac-ci.nix | 11 |
7 files changed, 38 insertions, 18 deletions
diff --git a/makefu/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix index 58e2f8175..2f73e44bc 100644 --- a/makefu/3modules/buildbot/master.nix +++ b/krebs/3modules/buildbot/master.nix @@ -143,7 +143,7 @@ let ${cfg.extraConfig} ''; - cfg = config.makefu.buildbot.master; + cfg = config.krebs.buildbot.master; api = { enable = mkEnableOption "Buildbot Master"; @@ -258,6 +258,6 @@ let }; in { - options.makefu.buildbot.master = api; + options.krebs.buildbot.master = api; config = mkIf cfg.enable imp; } diff --git a/makefu/3modules/buildbot/slave.nix b/krebs/3modules/buildbot/slave.nix index 69d0361bf..65291f63e 100644 --- a/makefu/3modules/buildbot/slave.nix +++ b/krebs/3modules/buildbot/slave.nix @@ -39,7 +39,7 @@ let s.setServiceParent(application) ''; default-packages = [ pkgs.git pkgs.bash ]; - cfg = config.makefu.buildbot.slave; + cfg = config.krebs.buildbot.slave; api = { enable = mkEnableOption "Buildbot Slave"; @@ -180,6 +180,6 @@ let }; in { - options.makefu.buildbot.slave = api; + options.krebs.buildbot.slave = api; config = mkIf cfg.enable imp; } diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 740ba67b8..cbc1291fa 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -9,6 +9,8 @@ let ./apt-cacher-ng.nix ./bepasty-server.nix ./build.nix + ./buildbot/master.nix + ./buildbot/slave.nix ./current.nix ./exim-retiolum.nix ./exim-smarthost.nix diff --git a/makefu/3modules/default.nix b/makefu/3modules/default.nix index ffbf54cc0..a8a1f69d0 100644 --- a/makefu/3modules/default.nix +++ b/makefu/3modules/default.nix @@ -2,8 +2,6 @@ _: { imports = [ - ./buildbot/master.nix - ./buildbot/slave.nix ]; } diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix index fba4bd9b9..f05356f0f 100644 --- a/shared/1systems/wolf.nix +++ b/shared/1systems/wolf.nix @@ -11,7 +11,7 @@ in ../2configs/collectd-base.nix ../2configs/shack-nix-cacher.nix ../2configs/shack-drivedroid.nix - ../2configs/cac-ci.nix + ../2configs/buildbot-standalone.nix ../2configs/graphite.nix ]; # use your own binary cache, fallback use cache.nixos.org (which is used by diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix new file mode 100644 index 000000000..adf44cada --- /dev/null +++ b/shared/2configs/buildbot-standalone.nix @@ -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>}"; }; + }; +} diff --git a/shared/2configs/cac-ci.nix b/shared/2configs/cac-ci.nix deleted file mode 100644 index 06cce2746..000000000 --- a/shared/2configs/cac-ci.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; -{ - environment.systemPackages = with pkgs;[ - get - cac - cacpanel - jq - ]; -} |