[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible: make the location of the .json outputs distro-specific

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository jenkins.debian.net.

commit a678ef1d43c24a50630cad27dcf0eaca56449c9c
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Fri Apr 6 19:10:32 2018 +0200

    reproducible: make the location of the .json outputs distro-specific
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 bin/reproducible.ini       | 5 ++---
 bin/reproducible_common.py | 6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bin/reproducible.ini b/bin/reproducible.ini
index 633835b..7d42c0b 100644
--- a/bin/reproducible.ini
+++ b/bin/reproducible.ini
@@ -5,11 +5,10 @@ tempdir = /tmp/reproducible
 base_url = https://tests.reproducible-builds.org
 jenkins_url = https://jenkins.debian.net
 # the following are relative to basedir
-# FIXME - jsons should really be distribution-specific
-json_out = reproducible.json
-tracker.json_out = reproducible-tracker.json
 css = static/style.css
 # the following are relative to distro_root
+json_out = reproducible.json
+tracker.json_out = reproducible-tracker.json
 diffoscope_html = dbd
 diffoscope_txt = dbdtxt
 buildlogs = logs
diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index 7f15199..e5b7ce0 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -97,12 +97,11 @@ TEMPLATE_PATH = conf_distro['templates']
 PKGSET_DEF_PATH = '/srv/reproducible-results'
 TEMP_PATH = conf_distro['tempdir']
 
-REPRODUCIBLE_JSON = os.path.join(BASE, conf_distro['json_out'])
-REPRODUCIBLE_TRACKER_JSON = os.path.join(BASE, conf_distro['tracker.json_out'])
 REPRODUCIBLE_STYLES = os.path.join(BASE, conf_distro['css'])
 
 DEBIAN_URI = '/' + conf_distro['distro_root']
 DEBIAN_BASE = os.path.join(BASE, conf_distro['distro_root'])
+
 DBD_URI = os.path.join(DEBIAN_URI, conf_distro['diffoscope_html'])
 DBDTXT_URI = os.path.join(DEBIAN_URI, conf_distro['diffoscope_txt'])
 LOGS_URI = os.path.join(DEBIAN_URI, conf_distro['buildlogs'])
@@ -124,6 +123,9 @@ RBUILD_PATH = BASE + RBUILD_URI
 HISTORY_PATH = BASE + HISTORY_URI
 BUILDINFO_PATH = BASE + BUILDINFO_URI
 
+REPRODUCIBLE_JSON = os.path.join(DEBIAN_BASE, conf_distro['json_out'])
+REPRODUCIBLE_TRACKER_JSON = os.path.join(DEBIAN_BASE, conf_distro['tracker.json_out'])
+
 REPRODUCIBLE_URL = conf_distro['base_url']
 DEBIAN_URL = urljoin(REPRODUCIBLE_URL, conf_distro['distro_root'])
 DEBIAN_DASHBOARD_URI = os.path.join(DEBIAN_URI, conf_distro['landing_page'])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git