summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/reproducible_build_service.sh1
-rwxr-xr-xbin/reproducible_html_live_status.py6
-rwxr-xr-xbin/reproducible_worker.sh2
3 files changed, 2 insertions, 7 deletions
diff --git a/bin/reproducible_build_service.sh b/bin/reproducible_build_service.sh
index c1ba605e..832808e5 100755
--- a/bin/reproducible_build_service.sh
+++ b/bin/reproducible_build_service.sh
@@ -257,7 +257,6 @@ while true ; do
done
# FIXME: TODO left for _service.sh:
-# * link to console.log in rbuild.log is broken
# * logs should auto display in browser like with jenkins… (long-polling, meta-refresh, something)
# - there's an NPH solution pointed out by Xtaran
# * enabling the service in update_jdn
diff --git a/bin/reproducible_html_live_status.py b/bin/reproducible_html_live_status.py
index b9a26824..6e56b9de 100755
--- a/bin/reproducible_html_live_status.py
+++ b/bin/reproducible_html_live_status.py
@@ -155,11 +155,7 @@ def generate_live_status_table(arch):
html += '<td><code>' + link_package(pkg, suite, arch) + '</code></td>'
html += '<td>' + str(row[4]) + '</td><td>' + str(row[5]) + '</td>'
html += '<td>' + convert_into_status_html(str(row[6])) + '</td><td>' + duration + '</td><td>' + avg_duration + '</td>'
- # we temporarily have two types of builders…
- if arch in ('i386'):
- html += '<td><a href="https://jenkins.debian.net/userContent/reproducible/debian/build_service/' + str(row[9]) + '/console">' + str(row[9]) + '</a></td>'
- else:
- html += '<td><a href="https://jenkins.debian.net/job/reproducible_builder_' + str(row[9]) + '/console">' + str(row[9]) + '</a></td>'
+ html += '<td><a href="https://jenkins.debian.net/userContent/reproducible/debian/build_service/' + str(row[9]) + '/console">' + str(row[9]) + '</a></td>'
html += '</tr>\n'
html += '</table></p>\n'
return html
diff --git a/bin/reproducible_worker.sh b/bin/reproducible_worker.sh
index 62006f79..a33000e6 100755
--- a/bin/reproducible_worker.sh
+++ b/bin/reproducible_worker.sh
@@ -52,7 +52,7 @@ while true ; do
#
# prepare variables for export
#
- export BUILD_URL=https://jenkins.debian.net/userContent/build_service/$WORKER_NAME/
+ export BUILD_URL=https://jenkins.debian.net/userContent/build_service/$WORKER_NAME/$BUILD_ID
export BUILD_ID=$BUILD_ID
export JOB_NAME="reproducible_builder_$WORKER_NAME"
export