From e7aacb1fe972b465242e051a8ab0faf6ead2c19f Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 22 Dec 2015 16:30:01 +0100 Subject: s 1 test-centos7: prepare for ci --- shared/1systems/test-centos7.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'shared/1systems') diff --git a/shared/1systems/test-centos7.nix b/shared/1systems/test-centos7.nix index 077a5d6..48cecc8 100644 --- a/shared/1systems/test-centos7.nix +++ b/shared/1systems/test-centos7.nix @@ -7,7 +7,8 @@ in { imports = [ ../2configs/base.nix ../2configs/os-templates/CAC-CentOS-7-64bit.nix - ../2configs/os-templates/temp-networking.nix + ../2configs/temp/networking.nix + ../2configs/temp/dirs.nix ]; sound.enable = false; -- cgit v1.3.1 From e93e886777776f30d2ad3ea114ce06525ebf20ef Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 22 Dec 2015 18:53:53 +0100 Subject: m 2 base: build user defaults to shared --- shared/1systems/wolf.nix | 2 -- shared/2configs/base.nix | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'shared/1systems') diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix index 2c51ac8..fba4bd9 100644 --- a/shared/1systems/wolf.nix +++ b/shared/1systems/wolf.nix @@ -33,8 +33,6 @@ in # uninteresting stuff ##################### krebs.build.host = config.krebs.hosts.wolf; - # TODO rename shared user to "krebs" - krebs.build.user = config.krebs.users.shared; krebs.build.target = "wolf"; boot.kernel.sysctl = { diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix index c36061e..0ce3365 100644 --- a/shared/2configs/base.nix +++ b/shared/2configs/base.nix @@ -14,7 +14,7 @@ with lib; }; # TODO rename shared user to "krebs" - krebs.build.user = config.krebs.users.shared; + krebs.build.user = mkDefault config.krebs.users.shared; krebs.build.source = { git.nixpkgs = { url = https://github.com/NixOS/nixpkgs; -- cgit v1.3.1 From 7143ab375b378dc7ce947a0fbaba5ae25c9afb3a Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 22 Dec 2015 19:36:19 +0100 Subject: mv makefu->krebs 3 buildbot --- shared/1systems/wolf.nix | 2 +- shared/2configs/buildbot-standalone.nix | 31 +++++++++++++++++++++++++++++++ shared/2configs/cac-ci.nix | 11 ----------- 3 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 shared/2configs/buildbot-standalone.nix delete mode 100644 shared/2configs/cac-ci.nix (limited to 'shared/1systems') diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix index fba4bd9..f05356f 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 0000000..adf44ca --- /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 }"; }; + }; +} diff --git a/shared/2configs/cac-ci.nix b/shared/2configs/cac-ci.nix deleted file mode 100644 index 06cce27..0000000 --- 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 - ]; -} -- cgit v1.3.1 From 04e9eeb9c937dc6f231e8b1564171c465a3ef361 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 22 Dec 2015 22:00:30 +0100 Subject: s 1 test-failing: add for CI --- shared/1systems/test-failing.nix | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 shared/1systems/test-failing.nix (limited to 'shared/1systems') diff --git a/shared/1systems/test-failing.nix b/shared/1systems/test-failing.nix new file mode 100644 index 0000000..81a9e48 --- /dev/null +++ b/shared/1systems/test-failing.nix @@ -0,0 +1,6 @@ +{ config, pkgs, ... }: + +{ + programs.ssh.startAgent = true; + programs.ssh.startAgent = false; +} -- cgit v1.3.1 From c653bd451d8a63c878eb50426f1a7c72f0f03aff Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 30 Dec 2015 02:45:47 +0100 Subject: s 1 test-all-krebs-modules: init --- shared/1systems/test-all-krebs-modules.nix | 45 ++++++++++++++++++++++++++++++ shared/2configs/buildbot-standalone.nix | 17 ++++++++--- 2 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 shared/1systems/test-all-krebs-modules.nix (limited to 'shared/1systems') diff --git a/shared/1systems/test-all-krebs-modules.nix b/shared/1systems/test-all-krebs-modules.nix new file mode 100644 index 0000000..b98004d --- /dev/null +++ b/shared/1systems/test-all-krebs-modules.nix @@ -0,0 +1,45 @@ +{ config, pkgs, lib, ... }: +let + en = { enable = true;}; +in { + krebs = { + enable = true; + build.user = config.krebs.users.shared; + build.host = config.krebs.hosts.test-all-krebs-modules; + Reaktor.enable = true; + apt-cacher-ng.enable = true; + backup.enable = true; + bepasty.enable = true; + buildbot.master.enable = true; + buildbot.slave = { + enable = true; + username = "lol"; + password = "wut"; + }; + exim-retiolum.enable = true; + exim-smarthost = { + enable = true; + system-aliases = [ { from = "dick"; to = "butt"; } ]; + }; + go.enable = true; + iptables = { + enable = true; + tables = {}; + }; + nginx.enable = true; + realwallpaper.enable = true; + retiolum.enable = true; + retiolum-bootstrap.enable = true; + tinc_graphs.enable = true; + urlwatch.enable = true; + fetchWallpaper = { + enable = true; + url ="localhost"; + }; + }; + # just get the system running + boot.loader.grub.devices = ["/dev/sda"]; + fileSystems."/" = { + device = "/dev/lol"; + }; +} diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix index 28d1eef..22e9861 100644 --- a/shared/2configs/buildbot-standalone.nix +++ b/shared/2configs/buildbot-standalone.nix @@ -8,12 +8,9 @@ in { }; networking.firewall.allowedTCPPorts = [ 8010 9989 ]; krebs.buildbot.master = { - secrets = [ - "cac.json" - ]; + secrets = [ "retiolum-ci.rsa_key.priv" "cac.json" ]; slaves = { testslave = "krebspass"; - omo = "krebspass"; }; change_source.stockholm = '' stockholm_repo = 'http://cgit.gum/stockholm' @@ -85,6 +82,18 @@ in { addShell(f,name="eval-cross-check",env=env, command=nixshell + ["! make eval get=krebs.deploy filter=json system=test-failing"]) + addShell(f,name="instaniate-test-all-modules",env=env, + command=nixshell + \ + ["touch retiolum.rsa_key.priv; \ + nix-instantiate --eval -A \ + users.shared.test-all-krebs-modules.system \ + -I stockholm=. \ + -I secrets=. '' \ + --argstr current-date lol \ + --argstr current-user-name shared \ + --argstr current-host-name lol \ + --strict --json"]) + bu.append(util.BuilderConfig(name="fast-tests", slavenames=slavenames, factory=f)) -- cgit v1.3.1 From c8dd7f377075545dd1431a9f1b699260abe27c57 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 30 Dec 2015 14:47:40 +0100 Subject: s 1 minimal-deploy: init test --- shared/1systems/test-minimal-deploy.nix | 13 +++++++++++++ shared/2configs/buildbot-standalone.nix | 11 +++++++++++ 2 files changed, 24 insertions(+) create mode 100644 shared/1systems/test-minimal-deploy.nix (limited to 'shared/1systems') diff --git a/shared/1systems/test-minimal-deploy.nix b/shared/1systems/test-minimal-deploy.nix new file mode 100644 index 0000000..ddd96f6 --- /dev/null +++ b/shared/1systems/test-minimal-deploy.nix @@ -0,0 +1,13 @@ +{ config, pkgs, lib, ... }: +{ + krebs = { + enable = true; + build.user = config.krebs.users.shared; + build.host = config.krebs.hosts.test-all-krebs-modules; + }; + # just get the system running + boot.loader.grub.devices = ["/dev/sda"]; + fileSystems."/" = { + device = "/dev/lol"; + }; +} diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix index c62f892..6ffd7fe 100644 --- a/shared/2configs/buildbot-standalone.nix +++ b/shared/2configs/buildbot-standalone.nix @@ -94,6 +94,17 @@ in { --argstr current-host-name lol \ --strict --json"]) + addShell(f,name="instantiate-test-minimal-deploy",env=env, + command=nixshell + \ + ["nix-instantiate --eval -A \ + users.shared.test-minimal-deploy.system \ + -I stockholm=. \ + -I secrets=. '' \ + --argstr current-date lol \ + --argstr current-user-name shared \ + --argstr current-host-name lol \ + --strict --json"]) + bu.append(util.BuilderConfig(name="fast-tests", slavenames=slavenames, factory=f)) -- cgit v1.3.1 [cgit] Unable to lock slot /tmp/cgit/ff000000.lock: No such file or directory (2)