summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-12-30 11:05:40 +0100
committerlassulus <lass@aidsballs.de>2015-12-30 11:05:40 +0100
commit7da2e2a22d4649337dde2a717a80a40500b775be (patch)
tree7628c1cc9c6df2ad0ed15f75633e24fefc799a01 /krebs
parent83555272fdcb6ab5ce968b08a90199c8aaeb460b (diff)
parent1798dbaf47fea7793545be2bc78ac5f1c8e27e18 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/shared/default.nix1
-rwxr-xr-xkrebs/5pkgs/test/infest-cac-centos7/notes3
2 files changed, 3 insertions, 1 deletions
diff --git a/krebs/3modules/shared/default.nix b/krebs/3modules/shared/default.nix
index b332676c6..518e46587 100644
--- a/krebs/3modules/shared/default.nix
+++ b/krebs/3modules/shared/default.nix
@@ -7,6 +7,7 @@ let
"test-arch"
"test-centos6"
"test-centos7"
+ "test-all-krebs-modules"
] (name: {
inherit name;
cores = 1;
diff --git a/krebs/5pkgs/test/infest-cac-centos7/notes b/krebs/5pkgs/test/infest-cac-centos7/notes
index 3f4fcd859..eee0bfc34 100755
--- a/krebs/5pkgs/test/infest-cac-centos7/notes
+++ b/krebs/5pkgs/test/infest-cac-centos7/notes
@@ -81,9 +81,10 @@ while true;do
if ! wait_login_cac $id;then
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)"
- eval "$(clear_defer)"
+ eval "$(clear_defer | sed 's/;exit//')"
else
echo "got a working system" >&2
+ break
fi
done
clear_defer >/dev/null