summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2015-06-16 23:59:06 +0000
committerHolger Levsen <holger@layer-acht.org>2015-07-05 14:01:20 +0200
commit201d61faf1e8669e7e62179ad1c2bb918523de8b (patch)
tree797a78d8075532f23f1fd882301eccc6054b1e78
parent29d32cd8a042582ee9389b6607bb0e99d61453ea (diff)
downloadjenkins.debian.net-201d61faf1e8669e7e62179ad1c2bb918523de8b.tar.xz
reproducible: builds: be verbose while creating/deleting directories/files instead of > /dev/null. Also handle the .gz versions by appending {,.gz} to gzippable files. Those output will end up in the jenkins log only, so it won't clutter stuff under rb.d.n
-rwxr-xr-xbin/reproducible_build.sh22
1 files changed, 12 insertions, 10 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index d307bd35..eba6798f 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -20,11 +20,12 @@ ARCH="amd64"
/bin/sleep $(echo "scale=1 ; $(shuf -i 1-120 -n 1)/10" | bc )
create_results_dirs() {
- mkdir -p $BASE/dbd/${SUITE}/${ARCH}
- mkdir -p $BASE/logs/${SUITE}/${ARCH}
- mkdir -p $BASE/logdiffs/${SUITE}/${ARCH}
- mkdir -p $BASE/rbuild/${SUITE}/${ARCH}
- mkdir -p $BASE/buildinfo/${SUITE}/${ARCH}
+ mkdir -vp $BASE/dbd/${SUITE}/${ARCH}
+ mkdir -vp $BASE/dbdtxt/${SUITE}/${ARCH}
+ mkdir -vp $BASE/logs/${SUITE}/${ARCH}
+ mkdir -vp $BASE/logdiffs/${SUITE}/${ARCH}
+ mkdir -vp $BASE/rbuild/${SUITE}/${ARCH}
+ mkdir -vp $BASE/buildinfo/${SUITE}/${ARCH}
}
handle_race_condition() {
@@ -105,11 +106,12 @@ cleanup_all() {
}
cleanup_userContent() {
- rm -f $BASE/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_*.rbuild.log > /dev/null 2>&1
- rm -f $BASE/logs/${SUITE}/${ARCH}/${SRCPACKAGE}_*.build?.log > /dev/null 2>&1
- rm -f $BASE/dbd/${SUITE}/${ARCH}/${SRCPACKAGE}_*.debbindiff.html > /dev/null 2>&1
- rm -f $BASE/buildinfo/${SUITE}/${ARCH}/${SRCPACKAGE}_*.buildinfo > /dev/null 2>&1
- rm -f $BASE/logdiffs/${SUITE}/${ARCH}/${SRCPACKAGE}_*.diff > /dev/null 2>&1
+ rm -vf $BASE/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_*.rbuild.log{,.gz}
+ rm -vf $BASE/logs/${SUITE}/${ARCH}/${SRCPACKAGE}_*.build?.log{,.gz}
+ rm -vf $BASE/dbd/${SUITE}/${ARCH}/${SRCPACKAGE}_*.debbindiff.html
+ rm -vf $BASE/dbdtxt/${SUITE}/${ARCH}/${SRCPACKAGE}_*.debbindiff.txt{,.gz}
+ rm -vf $BASE/buildinfo/${SUITE}/${ARCH}/${SRCPACKAGE}_*.buildinfo
+ rm -vf $BASE/logdiffs/${SUITE}/${ARCH}/${SRCPACKAGE}_*.diff{,.gz}
}
update_db_and_html() {