Merge remote-tracking branch 'gum/master'
This commit is contained in:
commit
7da2e2a22d
@ -7,6 +7,7 @@ let
|
|||||||
"test-arch"
|
"test-arch"
|
||||||
"test-centos6"
|
"test-centos6"
|
||||||
"test-centos7"
|
"test-centos7"
|
||||||
|
"test-all-krebs-modules"
|
||||||
] (name: {
|
] (name: {
|
||||||
inherit name;
|
inherit name;
|
||||||
cores = 1;
|
cores = 1;
|
||||||
|
@ -81,9 +81,10 @@ while true;do
|
|||||||
if ! wait_login_cac $id;then
|
if ! wait_login_cac $id;then
|
||||||
echo "unable to boot a working system within time frame, retrying..." >&2
|
echo "unable to boot a working system within time frame, retrying..." >&2
|
||||||
echo "Cleaning up old image,last status: $(cac update;cac getserver $id | jq -r .status)"
|
echo "Cleaning up old image,last status: $(cac update;cac getserver $id | jq -r .status)"
|
||||||
eval "$(clear_defer)"
|
eval "$(clear_defer | sed 's/;exit//')"
|
||||||
else
|
else
|
||||||
echo "got a working system" >&2
|
echo "got a working system" >&2
|
||||||
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
clear_defer >/dev/null
|
clear_defer >/dev/null
|
||||||
|
45
shared/1systems/test-all-krebs-modules.nix
Normal file
45
shared/1systems/test-all-krebs-modules.nix
Normal file
@ -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";
|
||||||
|
};
|
||||||
|
}
|
@ -8,12 +8,9 @@ in {
|
|||||||
};
|
};
|
||||||
networking.firewall.allowedTCPPorts = [ 8010 9989 ];
|
networking.firewall.allowedTCPPorts = [ 8010 9989 ];
|
||||||
krebs.buildbot.master = {
|
krebs.buildbot.master = {
|
||||||
secrets = [
|
secrets = [ "retiolum-ci.rsa_key.priv" "cac.json" ];
|
||||||
"cac.json"
|
|
||||||
];
|
|
||||||
slaves = {
|
slaves = {
|
||||||
testslave = "krebspass";
|
testslave = "krebspass";
|
||||||
omo = "krebspass";
|
|
||||||
};
|
};
|
||||||
change_source.stockholm = ''
|
change_source.stockholm = ''
|
||||||
stockholm_repo = 'http://cgit.gum/stockholm'
|
stockholm_repo = 'http://cgit.gum/stockholm'
|
||||||
@ -76,15 +73,27 @@ in {
|
|||||||
fast-tests = ''
|
fast-tests = ''
|
||||||
f = util.BuildFactory()
|
f = util.BuildFactory()
|
||||||
f.addStep(grab_repo)
|
f.addStep(grab_repo)
|
||||||
addShell(f,name="centos7-eval",env=env,
|
addShell(f,name="deploy-eval-centos7",env=env,
|
||||||
command=nixshell + ["make -s eval get=krebs.deploy filter=json system=test-centos7"])
|
command=nixshell + ["make -s eval get=krebs.deploy filter=json system=test-centos7"])
|
||||||
|
|
||||||
addShell(f,name="wolf-eval",env=env,
|
addShell(f,name="deploy-eval-wolf",env=env,
|
||||||
command=nixshell + ["make -s eval get=krebs.deploy filter=json system=wolf"])
|
command=nixshell + ["make -s eval get=krebs.deploy filter=json system=wolf"])
|
||||||
|
|
||||||
addShell(f,name="eval-cross-check",env=env,
|
addShell(f,name="deploy-eval-cross-check",env=env,
|
||||||
command=nixshell + ["! make eval get=krebs.deploy filter=json system=test-failing"])
|
command=nixshell + ["! make eval get=krebs.deploy filter=json system=test-failing"])
|
||||||
|
|
||||||
|
addShell(f,name="instantiate-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=. '<stockholm>' \
|
||||||
|
--argstr current-date lol \
|
||||||
|
--argstr current-user-name shared \
|
||||||
|
--argstr current-host-name lol \
|
||||||
|
--strict --json"])
|
||||||
|
|
||||||
bu.append(util.BuilderConfig(name="fast-tests",
|
bu.append(util.BuilderConfig(name="fast-tests",
|
||||||
slavenames=slavenames,
|
slavenames=slavenames,
|
||||||
factory=f))
|
factory=f))
|
||||||
@ -101,7 +110,7 @@ in {
|
|||||||
|
|
||||||
addShell(s, name="infest-cac-centos7",env=env,
|
addShell(s, name="infest-cac-centos7",env=env,
|
||||||
sigtermTime=60, # SIGTERM 1 minute before SIGKILL
|
sigtermTime=60, # SIGTERM 1 minute before SIGKILL
|
||||||
timeout=5400, # 1.5h timeout
|
timeout=7200, # 2h
|
||||||
command=nixshell + ["infest-cac-centos7"])
|
command=nixshell + ["infest-cac-centos7"])
|
||||||
|
|
||||||
bu.append(util.BuilderConfig(name="full-tests",
|
bu.append(util.BuilderConfig(name="full-tests",
|
||||||
@ -128,6 +137,7 @@ in {
|
|||||||
username = "testslave";
|
username = "testslave";
|
||||||
password = "krebspass";
|
password = "krebspass";
|
||||||
packages = with pkgs;[ git nix ];
|
packages = with pkgs;[ git nix ];
|
||||||
|
# all nix commands will need a working nixpkgs installation
|
||||||
extraEnviron = { NIX_PATH="nixpkgs=${toString <nixpkgs>}"; };
|
extraEnviron = { NIX_PATH="nixpkgs=${toString <nixpkgs>}"; };
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user