reproducible debian: update urls to include tests.r-b.org/debian directory

10 files changed, 23 insertions, 20 deletions

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index ca21c5b6..b48c644a 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -43,7 +43,7 @@ handle_race_condition() {
 save_artifacts() {
 		local random=$(head /dev/urandom | tr -cd '[:alnum:]'| head -c5)
 		local ARTIFACTS="artifacts/r00t-me/${SRCPACKAGE}_${SUITE}_tmp-${random}"
-		local URL="$REPRODUCIBLE_URL/$ARTIFACTS/"
+		local URL="$DEBIAN_URL/$ARTIFACTS/"
 		local HEADER="$BASE/$ARTIFACTS/.HEADER.html"
 		mkdir -p $BASE/$ARTIFACTS
 		cp -r $TMPDIR/* $BASE/$ARTIFACTS/
diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index e2e90f0e..58f77731 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -70,6 +70,7 @@ HISTORY_PATH = BASE + HISTORY_URI
 BUILDINFO_PATH = BASE + BUILDINFO_URI
 
 REPRODUCIBLE_URL = 'https://tests.reproducible-builds.org'
+DEBIAN_URL = 'https://tests.reproducible-builds.org/debian'
 JENKINS_URL = 'https://jenkins.debian.net'
 
 parser = argparse.ArgumentParser()
@@ -120,6 +121,7 @@ log.debug("REPRODUCIBLE_DB:\t" + REPRODUCIBLE_DB)
 log.debug("REPRODUCIBLE_JSON:\t" + REPRODUCIBLE_JSON)
 log.debug("JENKINS_URL:\t\t" + JENKINS_URL)
 log.debug("REPRODUCIBLE_URL:\t" + REPRODUCIBLE_URL)
+log.debug("DEBIAN_URL:\t" + DEBIAN_URL)
 
 if args.ignore_missing_files:
     log.warning("Missing files will be ignored!")
@@ -224,7 +226,7 @@ html_head_page = Template((tab*2).join(("""
     </ul></li>
   </ul>
 $project_links
-</header><div class="mainbody">""" % REPRODUCIBLE_URL ).splitlines(True)))
+</header><div class="mainbody">""" % DEBIAN_URL ).splitlines(True)))
 
 html_foot_page_style_note = Template((tab*2).join("""
 <p style="font-size:0.9em;">
@@ -271,10 +273,10 @@ filter_query = ''
 for issue in filtered_issues:
     if filter_query == '':
         filter_query = 'n.issues LIKE "%' + issue + '%"'
-        filter_html = '<a href="' + REPRODUCIBLE_URL + ISSUES_URI + '/$suite/' + issue + '_issue.html">' + issue + '</a>'
+        filter_html = '<a href="' + DEBIAN_URL + ISSUES_URI + '/$suite/' + issue + '_issue.html">' + issue + '</a>'
     else:
         filter_query += ' OR n.issues LIKE "%' + issue + '%"'
-        filter_html += ' or <a href="' + REPRODUCIBLE_URL + ISSUES_URI + '/$suite/' + issue + '_issue.html">' + issue + '</a>'
+        filter_html += ' or <a href="' + DEBIAN_URL + ISSUES_URI + '/$suite/' + issue + '_issue.html">' + issue + '</a>'
 
 
 @atexit.register
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index c2d0f237..f92301e1 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -36,6 +36,7 @@ fi
 
 # common variables
 REPRODUCIBLE_URL=https://tests.reproducible-builds.org
+DEBIAN_URL=https://tests.reproducible-builds.org/debian
 REPRODUCIBLE_DOT_ORG_URL=https://reproducible-builds.org
 # shop trailing slash
 JENKINS_URL=${JENKINS_URL:0:-1}
@@ -565,7 +566,7 @@ publish_page() {
 	fi
 	cp $PAGE $BASE/$TARGET
 	rm $PAGE
-	echo "Enjoy $REPRODUCIBLE_URL/$TARGET"
+	echo "Enjoy $DEBIAN_URL/$TARGET"
 }
 
 link_packages() {
diff --git a/bin/reproducible_html_breakages.py b/bin/reproducible_html_breakages.py
index f7993927..7bfc03dd 100755
--- a/bin/reproducible_html_breakages.py
+++ b/bin/reproducible_html_breakages.py
@@ -327,6 +327,6 @@ if __name__ == '__main__':
         html += 'detected. <i>Enjoy!</i></p>'
     title = 'Breakage on the Debian pages of tests.reproducible-builds.org'
     destfile = BASE + '/index_breakages.html'
-    desturl = REPRODUCIBLE_URL + '/index_breakages.html'
+    desturl = DEBIAN_URL + '/index_breakages.html'
     write_html_page(title, html, destfile, style_note=True)
     log.info('Breackages page created at ' + desturl)
diff --git a/bin/reproducible_html_dd_list.py b/bin/reproducible_html_dd_list.py
index 1491a7bd..ae077d47 100755
--- a/bin/reproducible_html_dd_list.py
+++ b/bin/reproducible_html_dd_list.py
@@ -74,4 +74,4 @@ for suite in SUITES:
         title = 'Maintainers of unreproducible packages in ' + suite
         destfile = BASE + '/' + suite + '/index_dd-list.html'
         write_html_page(title, html, destfile, suite, arch, style_note=True)
-        log.info('%s/%s/index_dd-list.html published', REPRODUCIBLE_URL, suite)
+        log.info('%s/%s/index_dd-list.html published', DEBIAN_URL, suite)
diff --git a/bin/reproducible_html_indexes.py b/bin/reproducible_html_indexes.py
index e4af0353..7dd01aea 100755
--- a/bin/reproducible_html_indexes.py
+++ b/bin/reproducible_html_indexes.py
@@ -523,11 +523,11 @@ def build_page(page, suite=None, arch=None):
             footnote = True if footnote1 else footnote
     if gpage:
         destfile = BASE + '/index_' + page + '.html'
-        desturl = REPRODUCIBLE_URL + '/index_' + page + '.html'
+        desturl = DEBIAN_URL + '/index_' + page + '.html'
         suite = defaultsuite  # used for the links generated by write_html_page
     else:
         destfile = BASE + '/' + suite + '/' + arch + '/index_' + page + '.html'
-        desturl = REPRODUCIBLE_URL + '/' + suite + '/' + arch + '/index_' + \
+        desturl = DEBIAN_URL + '/' + suite + '/' + arch + '/index_' + \
                   page + '.html'
     write_html_page(title=title, body=html, destfile=destfile, suite=suite, arch=arch, style_note=True)
     log.info('"' + title + '" now available at ' + desturl)
diff --git a/bin/reproducible_html_live_status.py b/bin/reproducible_html_live_status.py
index 137312b3..7ffe5217 100755
--- a/bin/reproducible_html_live_status.py
+++ b/bin/reproducible_html_live_status.py
@@ -51,7 +51,7 @@ def generate_schedule(arch):
         html += '</code></td><td>'+convert_into_status_html(str(row[4]))+'</td><td>'+duration+'</td><td>' + avg_duration + '</td></tr>\n'
     html += '</table></p>\n'
     destfile = BASE + '/index_' + arch + '_scheduled.html'
-    desturl = REPRODUCIBLE_URL + '/index_' + arch + '_scheduled.html'
+    desturl = DEBIAN_URL + '/index_' + arch + '_scheduled.html'
     write_html_page(title=title, body=html, destfile=destfile, arch=arch, style_note=True, refresh_every=60)
     log.info("Page generated at " + desturl)
 
@@ -121,7 +121,7 @@ def generate_oldies(arch):
             html += '</code></td><td>'+convert_into_status_html(str(row[3]))+'</td><td>' + row[4] + '</td></tr>\n'
         html += '</table></p>\n'
     destfile = BASE + '/index_' + arch + '_oldies.html'
-    desturl = REPRODUCIBLE_URL + '/index_' + arch + '_oldies.html'
+    desturl = DEBIAN_URL + '/index_' + arch + '_oldies.html'
     write_html_page(title=title, body=html, destfile=destfile, arch=arch, style_note=True, refresh_every=60)
     log.info("Page generated at " + desturl)
 
diff --git a/bin/reproducible_html_notes.py b/bin/reproducible_html_notes.py
index 94b95b46..9cb00517 100755
--- a/bin/reproducible_html_notes.py
+++ b/bin/reproducible_html_notes.py
@@ -263,7 +263,7 @@ def gen_html_issue(issue, suite):
         if suite_links != '':
             suite_links += ' / '
         if i != suite:
-            suite_links += '<a href="' + REPRODUCIBLE_URL + ISSUES_URI + '/' + i + '/' + issue + '_issue.html">' + i + '</a>'
+            suite_links += '<a href="' + DEBIAN_URL + ISSUES_URI + '/' + i + '/' + issue + '_issue.html">' + i + '</a>'
         else:
             suite_links += '<em>' + i + '</em>'
     # check for url:
@@ -361,7 +361,7 @@ def iterate_over_notes(notes):
         write_html_page(title=title, body=html, destfile=destfile,
                         noheader=True)
 
-        desturl = REPRODUCIBLE_URL + NOTES_URI + '/' + package + '_note.html'
+        desturl = DEBIAN_URL + NOTES_URI + '/' + package + '_note.html'
         log.debug("Note created: " + desturl)
         i = i + 1
     log.info('Created ' + str(i) + ' note pages.')
@@ -381,7 +381,7 @@ def iterate_over_issues(issues):
             write_html_page(title=title, body=html, destfile=destfile,
                             style_note=True)
 
-            desturl = REPRODUCIBLE_URL + ISSUES_URI + '/' + suite + '/' + issue + '_issue.html'
+            desturl = DEBIAN_URL + ISSUES_URI + '/' + suite + '/' + issue + '_issue.html'
             log.debug("Issue created: " + desturl)
             i = i + 1
         log.info('Created ' + str(i) + ' issue pages for ' + suite)
@@ -418,7 +418,7 @@ def index_issues(issues):
     html += tab*2 + '<p>' + NOTESGIT_DESCRIPTION + '</p>'
     title = 'Known issues related to reproducible builds'
     destfile = BASE + '/index_issues.html'
-    desturl = REPRODUCIBLE_URL + '/index_issues.html'
+    desturl = DEBIAN_URL + '/index_issues.html'
     write_html_page(title=title, body=html, destfile=destfile)
     log.info('Issues index now available at ' + desturl)
 
diff --git a/bin/reproducible_html_packages.py b/bin/reproducible_html_packages.py
index 7c55a266..78461b2a 100755
--- a/bin/reproducible_html_packages.py
+++ b/bin/reproducible_html_packages.py
@@ -50,7 +50,7 @@ ${project_links}
         Your browser does not support iframes.
         Use a different one or follow the links above.
     </p>
-</iframe>""" % REPRODUCIBLE_URL ).splitlines(True)))
+</iframe>""" % DEBIAN_URL ).splitlines(True)))
 
 
 def sizeof_fmt(num):
@@ -111,7 +111,7 @@ def link_diffs(package, eversion, suite, arch, status):
         html += '</li>\n'
     else:
         if status == 'unreproducible' and not args.ignore_missing_files:
-            log.critical(REPRODUCIBLE_URL + '/' + suite + '/' + arch + '/' + package +
+            log.critical(DEBIAN_URL + '/' + suite + '/' + arch + '/' + package +
                          ' is unreproducible, but without diffoscope output.')
     return html, dbd_url
 
@@ -151,7 +151,7 @@ def gen_extra_links(package, version, suite, arch, status):
             default_view = url
         links += link_buildlogs(package, eversion, suite, arch) + '</li>\n'
     elif status not in ('untested', 'blacklisted') and not args.ignore_missing_files:
-        log.critical(REPRODUCIBLE_URL  + '/' + suite + '/' + arch + '/' + package +
+        log.critical(DEBIAN_URL  + '/' + suite + '/' + arch + '/' + package +
                      ' didn\'t produce a buildlog, even though it has been built.')
     default_view = '/untested.html' if not default_view else default_view
     return (links, default_view)
@@ -283,7 +283,7 @@ def gen_packages_html(packages, no_clean=False):
                     project_links=project_links,
                     default_view=default_view)
                 destfile = RB_PKG_PATH + '/' + suite + '/' + arch + '/' + pkg + '.html'
-                desturl = REPRODUCIBLE_URL + RB_PKG_URI + '/' + suite + \
+                desturl = DEBIAN_URL + RB_PKG_URI + '/' + suite + \
                           '/' + arch + '/' + pkg + '.html'
                 title = pkg + ' - reproducible build results'
                 write_html_page(title=title, body=html, destfile=destfile,
diff --git a/bin/reproducible_json.py b/bin/reproducible_json.py
index ec2bddb0..4258249c 100755
--- a/bin/reproducible_json.py
+++ b/bin/reproducible_json.py
@@ -119,5 +119,5 @@ with open(tmpfile, 'w') as fd:
 os.rename(tmpfile, REPRODUCIBLE_TRACKER_JSON)
 os.chmod(REPRODUCIBLE_TRACKER_JSON, 0o644)
 
-log.info(REPRODUCIBLE_URL + '/reproducible.json and /reproducible-tracker.json have been updated.')
+log.info(DEBIAN_URL + '/reproducible.json and /reproducible-tracker.json have been updated.')