summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@debian.org>2017-09-08 10:47:31 +0200
committerHolger Levsen <holger@layer-acht.org>2017-09-09 14:26:20 +0200
commitab0508b05f65b0e254e1e9b669c11566e29ff830 (patch)
tree44ab5b8cf54811d9a4e53f7ac679ccc13b921a1b /bin
parent71e7314d0ee46fbc807b630f6c823c9b587c10c0 (diff)
downloadjenkins.debian.net-ab0508b05f65b0e254e1e9b669c11566e29ff830.tar.xz
reproducible debian: _build.sh: don't exec abort.sh anymore
the job is not run by jenkins anymore, so no point in calling abort.sh, futhremore `exec`ing doesn't run the cleanup part in some cases, causing stale temporary directories to be left behind. Signed-off-by: Mattia Rizzolo <mattia@debian.org> Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_build.sh7
1 files changed, 1 insertions, 6 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 07483e28..96e876e5 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 2014-2017 Holger Levsen <holger@layer-acht.org>
-# © 2015-2016 Mattia Rizzolo <mattia@mapreri.org>
+# © 2015-2017 Mattia Rizzolo <mattia@mapreri.org>
# released under the GPLv=2
DEBUG=false
@@ -69,7 +69,6 @@ handle_race_condition() {
# cleanup
cd
rm -r $TMPDIR || true
- exec /srv/jenkins/bin/abort.sh
exit 0
}
@@ -333,7 +332,6 @@ handle_env_changes() {
MESSAGE="$(date -u ) - ${BUILD_URL}console.log encountered a problem: $1"
echo -e "$MESSAGE" | tee -a /var/log/jenkins/reproducible-env-changes.log
# no need to slow down
- exec /srv/jenkins/bin/abort.sh
exit 0
}
@@ -343,7 +341,6 @@ handle_remote_error() {
echo "$(date -u ) - $MESSAGE" | tee -a /var/log/jenkins/reproducible-remote-error.log
echo "Sleeping 5m before aborting the job."
sleep 5m
- exec /srv/jenkins/bin/abort.sh
exit 0
}
@@ -354,7 +351,6 @@ handle_enospace() {
echo "$MESSAGE" | mail -s "$JOB on $1 ran into diskspace problems" qa-jenkins-scm@lists.alioth.debian.org
echo "Sleeping 60m before aborting the job."
sleep 60m
- exec /srv/jenkins/bin/abort.sh
exit 0
}
@@ -736,7 +732,6 @@ check_node_is_up() {
echo "$(date -u) - $NODE seems to be down, sleeping ${SLEEPTIME}min before aborting this job."
unregister_build
sleep ${SLEEPTIME}.1337m
- exec /srv/jenkins/bin/abort.sh
fi
set -e
}