summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2016-08-02 15:20:21 +0200
committerHolger Levsen <holger@layer-acht.org>2016-08-02 16:24:25 +0200
commit4793e76429c8522c64e5bfe9e6896b96ca964635 (patch)
treef165344f7be07b14f00f5a99a731433510605891
parent6b30663410f3f1093194e37a3bdd0ed57648fcd8 (diff)
downloadjenkins.debian.net-4793e76429c8522c64e5bfe9e6896b96ca964635.tar.xz
reproducible/openwrt|lede: add date to the tempbuilddir
Add a date to the TMPBUILDDIR. Will reduce the possibility of TMPBUILDIR clashes when using the same directory across multiple nodes. Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xbin/reproducible_lede.sh6
-rwxr-xr-xbin/reproducible_openwrt.sh6
2 files changed, 6 insertions, 6 deletions
diff --git a/bin/reproducible_lede.sh b/bin/reproducible_lede.sh
index 77ea110a..6b639ff3 100755
--- a/bin/reproducible_lede.sh
+++ b/bin/reproducible_lede.sh
@@ -43,11 +43,11 @@ esac
#
# main
#
-TMPBUILDDIR=$(mktemp --tmpdir=/srv/workspace/chroots/ -d -t rbuild-lede-build-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)
DATE=$(date -u +'%Y-%m-%d')
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
cd $TMPBUILDDIR
diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh
index b1da7060..c8e38d56 100755
--- a/bin/reproducible_openwrt.sh
+++ b/bin/reproducible_openwrt.sh
@@ -43,11 +43,11 @@ esac
#
# main
#
-TMPBUILDDIR=$(mktemp --tmpdir=/srv/workspace/chroots/ -d -t rbuild-openwrt-build-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)
DATE=$(date -u +'%Y-%m-%d')
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
cd $TMPBUILDDIR