diff options
| author | Holger Levsen <holger@layer-acht.org> | 2017-04-27 15:17:22 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2017-04-27 15:17:22 +0200 |
| commit | 83b5b0b7db5c6038f5ff3ac6f5648b1ea2b5072a (patch) | |
| tree | ad32f35f07dfc5d66a5833c3613807e0a0309392 | |
| parent | 7774df5869cf1fa6ac649ed5576b17aa64b0314e (diff) | |
| download | jenkins.debian.net-83b5b0b7db5c6038f5ff3ac6f5648b1ea2b5072a.tar.xz | |
reproducible Debian: correctly link to new build logs
Signed-off-by: Holger Levsen <holger@layer-acht.org>
| -rwxr-xr-x | bin/reproducible_build_service.sh | 1 | ||||
| -rwxr-xr-x | bin/reproducible_html_live_status.py | 6 | ||||
| -rwxr-xr-x | bin/reproducible_worker.sh | 2 |
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 |