summaryrefslogtreecommitdiffstats
path: root/shared/2configs/buildbot-standalone.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-02-01 15:19:04 +0100
committerlassulus <lass@aidsballs.de>2016-02-01 15:19:04 +0100
commitb7e2a64c3205a36b850dd1990146e0aeab5dbf5e (patch)
tree1434c93427bee20fb515168c6a2705eb04aa2970 /shared/2configs/buildbot-standalone.nix
parent72dc2dd7fa54c77e08052efed21f68758fa533a2 (diff)
parentb38a821c31de84af6567073bd65ac76c5fc02b5d (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'shared/2configs/buildbot-standalone.nix')
-rw-r--r--shared/2configs/buildbot-standalone.nix11
1 files changed, 4 insertions, 7 deletions
diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix
index 3275189a5..c614bd3c1 100644
--- a/shared/2configs/buildbot-standalone.nix
+++ b/shared/2configs/buildbot-standalone.nix
@@ -1,11 +1,6 @@
{ 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 9989 ];
krebs.buildbot.master = {
secrets = [ "retiolum-ci.rsa_key.priv" "cac.json" ];
@@ -89,6 +84,7 @@ in {
nix-instantiate --eval -A \
users.shared.test-all-krebs-modules.system \
-I stockholm=. \
+ --show-trace \
-I secrets=. '<stockholm>' \
--argstr current-date lol \
--argstr current-user-name shared \
@@ -101,6 +97,7 @@ in {
users.shared.test-minimal-deploy.system \
-I stockholm=. \
-I secrets=. '<stockholm>' \
+ --show-trace \
--argstr current-date lol \
--argstr current-user-name shared \
--argstr current-host-name lol \