From 64a69bd1537a2000208bd3bbb5f1be6be08220f6 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 18 Jan 2016 16:59:44 +0100 Subject: s 2 base: use current unstable --- shared/2configs/base.nix | 2 +- shared/2configs/buildbot-standalone.nix | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'shared/2configs') diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix index 4d509d7a6..5e6072661 100644 --- a/shared/2configs/base.nix +++ b/shared/2configs/base.nix @@ -18,7 +18,7 @@ with lib; krebs.build.source = { git.nixpkgs = { url = https://github.com/NixOS/nixpkgs; - rev = "6d31e9b81dcd4ab927bb3dc91b612dd5abfa2f80"; + rev = "d0e3cca"; target-path = "/var/src/nixpkgs"; }; dir.secrets = { diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix index 3275189a5..2ea19e8aa 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" ]; -- cgit v1.2.3 From 462921984914029b87a2c3dc7b7a9f6a658eb8fe Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 19 Jan 2016 22:39:43 +0100 Subject: s 2 buildbot: add show-trace --- shared/2configs/buildbot-standalone.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'shared/2configs') diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix index 2ea19e8aa..c614bd3c1 100644 --- a/shared/2configs/buildbot-standalone.nix +++ b/shared/2configs/buildbot-standalone.nix @@ -84,6 +84,7 @@ nix-instantiate --eval -A \ users.shared.test-all-krebs-modules.system \ -I stockholm=. \ + --show-trace \ -I secrets=. '' \ --argstr current-date lol \ --argstr current-user-name shared \ @@ -96,6 +97,7 @@ users.shared.test-minimal-deploy.system \ -I stockholm=. \ -I secrets=. '' \ + --show-trace \ --argstr current-date lol \ --argstr current-user-name shared \ --argstr current-host-name lol \ -- cgit v1.2.3