reproducible: move buildinfo files under a suite/arch-named directory, e.g. /buildinfo/sid/amd64

3 files changed, 11 insertions, 9 deletions

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 0c28a0ea..8e6164e3 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -17,7 +17,7 @@ ARCH="amd64"
 create_results_dirs() {
 	mkdir -p /var/lib/jenkins/userContent/dbd/
 	mkdir -p /var/lib/jenkins/userContent/rbuild/${SUITE}/${ARCH}
-	mkdir -p /var/lib/jenkins/userContent/buildinfo/
+	mkdir -p /var/lib/jenkins/userContent/buildinfo/${SUITE}/${ARCH}
 }
 
 cleanup_all() {
@@ -27,7 +27,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/buildinfo/${SRCPACKAGE}_*.buildinfo > /dev/null 2>&1
+	rm -f /var/lib/jenkins/userContent/buildinfo/${SUITE}/${ARCH}/${SRCPACKAGE}_*.buildinfo > /dev/null 2>&1
 }
 
 calculate_build_duration() {
@@ -85,7 +85,7 @@ call_debbindiff() {
 		DEBBINDIFFOUT="debbindiff had trouble comparing the two builds. Please investigate $REPRODUCIBLE_URL/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log"
 	fi
 	if [ $RESULT -eq 0 ] && [ ! -f ./${LOGFILE} ] && [ -f b1/${BUILDINFO} ] ; then
-		cp b1/${BUILDINFO} /var/lib/jenkins/userContent/buildinfo/ > /dev/null 2>&1
+		cp b1/${BUILDINFO} /var/lib/jenkins/userContent/buildinfo/${SUITE}/${ARCH}/ > /dev/null 2>&1
 		figlet ${SRCPACKAGE}
 		echo
 		echo "debbindiff found no differences in the changes files, and a .buildinfo file also exist." | tee -a ${RBUILDLOG}
@@ -96,7 +96,7 @@ call_debbindiff() {
 	else
 		echo | tee -a ${RBUILDLOG}
 		echo -n "$(date) - ${SRCPACKAGE}/${SUITE} failed to build reproducibly " | tee -a ${RBUILDLOG}
-		cp b1/${BUILDINFO} /var/lib/jenkins/userContent/buildinfo/ > /dev/null 2>&1 || true
+		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/
diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index dd0321e9..31902a9a 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -362,8 +362,8 @@ def pkg_has_buildinfo(package, version=False, suite='sid', arch='amd64'):
                 'WHERE s.name="{}" AND s.suite="{}" AND s.architecture="{}"'
         query = query.format(package, suite, arch)
         version = str(query_db(query)[0][0])
-    buildinfo = BUILDINFO_PATH + '/' + package + '_' + \
-                strip_epoch(version) + '_amd64.buildinfo'
+    buildinfo = BUILDINFO_PATH + '/' + suite + '/' + suite + '/' + package + \
+                '_' + strip_epoch(version) + '_amd64.buildinfo'
     if os.access(buildinfo, os.R_OK):
         return True
     else:
diff --git a/bin/reproducible_html_packages.py b/bin/reproducible_html_packages.py
index cb8cecf7..cbedc10f 100755
--- a/bin/reproducible_html_packages.py
+++ b/bin/reproducible_html_packages.py
@@ -82,7 +82,8 @@ def gen_extra_links(package, version, suite, arch):
     notes = NOTES_PATH + '/' + package + '_note.html'
     rbuild = RBUILD_PATH + '/' + suite + '/' + arch + '/' + package + '_' + \
              eversion + '.rbuild.log'
-    buildinfo = BUILDINFO_PATH + '/' + package + '_' + eversion + '_amd64.buildinfo'
+    buildinfo = BUILDINFO_PATH + '/' + suite + '/' + arch + '/' + package + \
+                '_' + eversion + '_amd64.buildinfo'
     dbd = DBD_PATH + '/' + package + '_' + eversion + '.debbindiff.html'
 
     links = ''
@@ -101,8 +102,9 @@ def gen_extra_links(package, version, suite, arch):
             default_view = url
     else:
         log.debug('debbindiff not detetected at ' + dbd)
-    if pkg_has_buildinfo(package, version):
-        url = BUILDINFO_URI + '/' + package + '_' + eversion + '_amd64.buildinfo'
+    if pkg_has_buildinfo(package, version, suite):
+        url = BUILDINFO_URI + '/' + suite + '/' + arch + '/' + package + \
+              '_' + eversion + '_amd64.buildinfo'
         links += '<a href="' + url + '" target="main">buildinfo</a>\n'
         if not default_view:
             default_view = url