From dcc27dc3cd9e6682c1b24a3fa0d8cc4ac5472659 Mon Sep 17 00:00:00 2001
From: Mattia Rizzolo <mattia@mapreri.org>
Date: Fri, 27 Feb 2015 00:17:08 +0100
Subject: reproducible: move debbindiff files under a suite/arch-named
 directory, e.g. /dbd/sid/amd64

---
 bin/reproducible_build.sh         | 10 +++++-----
 bin/reproducible_html_packages.py |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'bin')

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 8e6164e3..ce4da14f 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -15,7 +15,7 @@ common_init "$@"
 ARCH="amd64"
 
 create_results_dirs() {
-	mkdir -p /var/lib/jenkins/userContent/dbd/
+	mkdir -p /var/lib/jenkins/userContent/dbd/${SUITE}/${ARCH}
 	mkdir -p /var/lib/jenkins/userContent/rbuild/${SUITE}/${ARCH}
 	mkdir -p /var/lib/jenkins/userContent/buildinfo/${SUITE}/${ARCH}
 }
@@ -26,7 +26,7 @@ cleanup_all() {
 
 cleanup_userContent() {
 	rm -f /var/lib/jenkins/userContent/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_*.rbuild.log > /dev/null 2>&1
-	rm -f /var/lib/jenkins/userContent/dbd/${SRCPACKAGE}_*.debbindiff.html > /dev/null 2>&1
+	rm -f /var/lib/jenkins/userContent/dbd/${SUITE}/${ARCH}/${SRCPACKAGE}_*.debbindiff.html > /dev/null 2>&1
 	rm -f /var/lib/jenkins/userContent/buildinfo/${SUITE}/${ARCH}/${SRCPACKAGE}_*.buildinfo > /dev/null 2>&1
 }
 
@@ -75,12 +75,12 @@ call_debbindiff() {
 	rm -f $DBDCHROOT_READLOCK
 	echo | tee -a ${RBUILDLOG}
 	if [ $RESULT -eq 124 ] ; then
-		echo "$(date) - debbindiff was killed after running into timeout... maybe there is still $REPRODUCIBLE_URL/dbd/${LOGFILE}" | tee -a ${RBUILDLOG}
+		echo "$(date) - debbindiff was killed after running into timeout... maybe there is still $REPRODUCIBLE_URL/dbd/${SUITE}/${ARCH}/${LOGFILE}" | tee -a ${RBUILDLOG}
 		if [ ! -s ./${LOGFILE} ] ; then
 			echo "$(date) - debbindiff produced no output and was killed after running into timeout..." >> ${LOGFILE}
 		fi
 	elif [ $RESULT -eq 1 ] ; then
-		DEBBINDIFFOUT="debbindiff found issues, please investigate $REPRODUCIBLE_URL/dbd/${LOGFILE}"
+		DEBBINDIFFOUT="debbindiff found issues, please investigate $REPRODUCIBLE_URL/dbd/${SUITE}/${ARCH}/${LOGFILE}"
 	elif [ $RESULT -eq 2 ] ; then
 		DEBBINDIFFOUT="debbindiff had trouble comparing the two builds. Please investigate $REPRODUCIBLE_URL/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log"
 	fi
@@ -99,7 +99,7 @@ call_debbindiff() {
 		cp b1/${BUILDINFO} /var/lib/jenkins/userContent/buildinfo/${SUITE}/${ARCH}/ > /dev/null 2>&1 || true
 		if [ -f ./${LOGFILE} ] ; then
 			echo -n ", $DEBBINDIFFOUT" | tee -a ${RBUILDLOG}
-			mv ./${LOGFILE} /var/lib/jenkins/userContent/dbd/
+			mv ./${LOGFILE} /var/lib/jenkins/userContent/dbd/${SUITE}/${ARCH}/
 		else
 			echo -n ", debbindiff produced no output (which is strange)"
 		fi
diff --git a/bin/reproducible_html_packages.py b/bin/reproducible_html_packages.py
index cbedc10f..346d567d 100755
--- a/bin/reproducible_html_packages.py
+++ b/bin/reproducible_html_packages.py
@@ -84,7 +84,8 @@ def gen_extra_links(package, version, suite, arch):
              eversion + '.rbuild.log'
     buildinfo = BUILDINFO_PATH + '/' + suite + '/' + arch + '/' + package + \
                 '_' + eversion + '_amd64.buildinfo'
-    dbd = DBD_PATH + '/' + package + '_' + eversion + '.debbindiff.html'
+    dbd = DBD_PATH + '/' + suite + '/' + arch + '/' + package + '_' + \
+          eversion + '.debbindiff.html'
 
     links = ''
     default_view = False
@@ -96,7 +97,8 @@ def gen_extra_links(package, version, suite, arch):
     else:
         log.debug('notes not detected at ' + notes)
     if os.access(dbd, os.R_OK):
-        url = DBD_URI + '/' + package + '_' + eversion + '.debbindiff.html'
+        url = DBD_URI + '/' + suite + '/' + arch + '/' +  package + '_' + \
+              eversion + '.debbindiff.html'
         links += '<a href="' + url + '" target="main">debbindiff</a>\n'
         if not default_view:
             default_view = url
-- 
cgit v1.2.3-54-g00ecf