summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2016-08-03 21:37:51 +0200
committerHolger Levsen <holger@layer-acht.org>2016-08-03 21:39:53 +0200
commitfa3ed47dd9da01e3e37b20457946d7e06e11ccb4 (patch)
tree75b9e799a4bddede9604abff49d5cd6730b19fca /bin
parent447c763759bbf21536e70f126657b97b96242ad1 (diff)
downloadjenkins.debian.net-fa3ed47dd9da01e3e37b20457946d7e06e11ccb4.tar.xz
reproducible/openwrt|lede: ensure tmpdirs are removed after failed runs
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_lede.sh6
-rwxr-xr-xbin/reproducible_openwrt.sh6
-rw-r--r--bin/reproducible_openwrt_common.sh19
3 files changed, 21 insertions, 10 deletions
diff --git a/bin/reproducible_lede.sh b/bin/reproducible_lede.sh
index 57b8d2bd..97671514 100755
--- a/bin/reproducible_lede.sh
+++ b/bin/reproducible_lede.sh
@@ -26,7 +26,7 @@ case $1 in
case $1 in
openwrt_build |\
openwrt_get_banner |\
- openwrt_cleanup_tmpdirs) ;; # this is the allowed list
+ node_cleanup_tmpdirs) ;; # this is the allowed list
*)
echo "Unsupported remote node function $@"
exit 1
@@ -52,7 +52,7 @@ START=$(date +'%s')
TMPBUILDDIR=$(mktemp --tmpdir=/srv/workspace/chroots/ -d -t rbuild-lede-build-${DATE}-XXXXXXXX) # used to build on tmpfs
TMPDIR=$(mktemp --tmpdir=/srv/reproducible-results -d -t rbuild-lede-results-XXXXXXXX) # accessable in schroots, used to compare results
BANNER_HTML=$(mktemp --tmpdir=$TMPDIR)
-trap cleanup_tmpdirs INT TERM EXIT
+trap master_cleanup_tmpdirs INT TERM EXIT
cd $TMPBUILDDIR
@@ -250,5 +250,5 @@ irc_message reproducible-builds "$REPRODUCIBLE_URL/lede/ has been updated. ($GOO
echo "============================================================================="
# remove everything, we don't need it anymore...
-cleanup_tmpdirs
+master_cleanup_tmpdirs
trap - INT TERM EXIT
diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh
index dbc48c14..07f86796 100755
--- a/bin/reproducible_openwrt.sh
+++ b/bin/reproducible_openwrt.sh
@@ -26,7 +26,7 @@ case $1 in
case $1 in
openwrt_build |\
openwrt_get_banner |\
- openwrt_cleanup_tmpdirs) ;; # this is the allowed list
+ node_cleanup_tmpdirs) ;; # this is the allowed list
*)
echo "Unsupported remote node function $@"
exit 1
@@ -52,7 +52,7 @@ START=$(date +'%s')
TMPBUILDDIR=$(mktemp --tmpdir=/srv/workspace/chroots/ -d -t rbuild-openwrt-build-${DATE}-XXXXXXXX) # used to build on tmpfs
TMPDIR=$(mktemp --tmpdir=/srv/reproducible-results -d -t rbuild-openwrt-results-XXXXXXXX) # accessable in schroots, used to compare results
BANNER_HTML=$(mktemp --tmpdir=$TMPDIR)
-trap cleanup_tmpdirs INT TERM EXIT
+trap master_cleanup_tmpdirs INT TERM EXIT
cd $TMPBUILDDIR
@@ -241,5 +241,5 @@ irc_message reproducible-builds "$REPRODUCIBLE_URL/openwrt/ has been updated. ($
echo "============================================================================="
# remove everything, we don't need it anymore...
-cleanup_tmpdirs
+master_cleanup_tmpdirs
trap - INT TERM EXIT
diff --git a/bin/reproducible_openwrt_common.sh b/bin/reproducible_openwrt_common.sh
index 7a4a037f..2041e989 100644
--- a/bin/reproducible_openwrt_common.sh
+++ b/bin/reproducible_openwrt_common.sh
@@ -9,8 +9,16 @@
GENERIC_NODE1=profitbricks-build3-amd64.debian.net
GENERIC_NODE2=profitbricks-build4-amd64.debian.net
+# run on jenkins master
+master_cleanup_tmpdirs() {
+ ssh $GENERIC_NODE1 reproducible_$TYPE node node_cleanup_tmpdirs $TMPDIR || true
+ ssh $GENERIC_NODE2 reproducible_$TYPE node node_cleanup_tmpdirs $TMPDIR || true
+ # cleanup local dirs
+ cleanup_tmpdirs
+}
+
# only called direct on a remote build node
-openwrt_cleanup_tmpdirs() {
+node_cleanup_tmpdirs() {
export TMPDIR=$1
export TMPBUILDDIR=$TMPDIR/build
cleanup_tmpdirs
@@ -28,7 +36,9 @@ cleanup_tmpdirs() {
fi
rm -rf $TMPDIR
rm -rf $TMPBUILDDIR
- rm -f $BANNER_HTML
+ if [ -f $BANNER_HTML ] ; then
+ rm -f $BANNER_HTML
+ fi
}
create_results_dirs() {
@@ -220,6 +230,7 @@ openwrt_build() {
exit 1
fi
mkdir -p $TMPBUILDDIR
+ trap cleanup_tmpdirs INT TERM EXIT
# we have also to set the TMP
@@ -269,7 +280,7 @@ build_two_times() {
# rsync back logs and images
rsync -a $GENERIC_NODE1:$TMPDIR/$RUN/ $TMPDIR/$RUN/
- ssh $GENERIC_NODE1 reproducible_$TYPE node openwrt_cleanup_tmpdirs $TMPDIR
+ ssh $GENERIC_NODE1 reproducible_$TYPE node node_cleanup_tmpdirs $TMPDIR
## second run
RUN=b2
@@ -277,5 +288,5 @@ build_two_times() {
# rsync back logs and images
rsync -a $GENERIC_NODE2:$TMPDIR/$RUN/ $TMPDIR/$RUN/
- ssh $GENERIC_NODE2 reproducible_$TYPE node openwrt_cleanup_tmpdirs $TMPDIR
+ ssh $GENERIC_NODE2 reproducible_$TYPE node node_cleanup_tmpdirs $TMPDIR
}