summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_cleanup_nodes.sh2
-rwxr-xr-xbin/reproducible_slay.sh3
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/reproducible_cleanup_nodes.sh b/bin/reproducible_cleanup_nodes.sh
index c6dd7d26..a3efbcd8 100755
--- a/bin/reproducible_cleanup_nodes.sh
+++ b/bin/reproducible_cleanup_nodes.sh
@@ -41,7 +41,7 @@ for NODE in $BUILD_NODES ; do
# jenkins_master_wrapper.sh needs NODE_NAME and JOB_NAME
export NODE_NAME=$NODE
echo "$(date -u) - Killing build processes on $NODE now:"
- /srv/jenkins/bin/jenkins_master_wrapper.sh /srv/jenkins/bin/reproducible_slay.sh
+ /srv/jenkins/bin/jenkins_master_wrapper.sh /srv/jenkins/bin/reproducible_slay.sh || true
echo "$(date -u) - done killing processes on $NODE."
done
diff --git a/bin/reproducible_slay.sh b/bin/reproducible_slay.sh
index 81fe5528..a6fceae2 100755
--- a/bin/reproducible_slay.sh
+++ b/bin/reproducible_slay.sh
@@ -3,10 +3,11 @@
# Copyright 2015 Holger Levsen <holger@layer-acht.org>
# released under the GPLv=2
-set -e
+set +e
# usually called by /srv/jenkins/bin/reproducible_cleanup_nodes.sh
# this script just kills everyone…
+sudo killall timeout # all builds are done using timeout
sudo slay 1111
sudo slay 2222
pgrep -u 1111,2222