diff options
| -rwxr-xr-x | bin/jenkins_node_definitions.sh | 2 | ||||
| -rwxr-xr-x | bin/reproducible_html_dashboard.sh | 2 | ||||
| -rwxr-xr-x | bin/reproducible_html_nodes_info.sh (renamed from bin/reproducible_nodes_info.sh) | 1 | ||||
| -rw-r--r-- | job-cfg/reproducible.yaml | 6 |
4 files changed, 5 insertions, 6 deletions
diff --git a/bin/jenkins_node_definitions.sh b/bin/jenkins_node_definitions.sh index 9b4eaf0b..46848fbb 100755 --- a/bin/jenkins_node_definitions.sh +++ b/bin/jenkins_node_definitions.sh @@ -5,7 +5,7 @@ # define Debian build nodes in use for tests.reproducible-builds.org/debian/ # FIXME: this is used differently in two places, -# - bin/reproducible_nodes_info.sh +# - bin/reproducible_html_nodes_info.sh # where it *must* only contain the Debian nodes as it's used # to generate the variations… and # - bin/reproducible_cleanup_nodes.sh where it would be diff --git a/bin/reproducible_html_dashboard.sh b/bin/reproducible_html_dashboard.sh index 4dc7b5d5..3855a8c7 100755 --- a/bin/reproducible_html_dashboard.sh +++ b/bin/reproducible_html_dashboard.sh @@ -676,7 +676,7 @@ create_performance_page() { write_page "</p><p style=\"clear:both;\">" done # the end - write_page "Daily <a href=\"https://jenkins.debian.net/view/reproducible/job/reproducible_nodes_info/lastBuild/console\">individual build node performance stats</a> are available as well as oldest results for" + write_page "Daily <a href=\"https://jenkins.debian.net/view/reproducible/job/reproducible_html_nodes_info/lastBuild/console\">individual build node performance stats</a> are available as well as oldest results for" for ARCH in ${ARCHS} ; do write_page " <a href=\"/debian/index_${ARCH}_oldies.html\">$ARCH</a>" done diff --git a/bin/reproducible_nodes_info.sh b/bin/reproducible_html_nodes_info.sh index 8a9d5ec2..6f30ed76 100755 --- a/bin/reproducible_nodes_info.sh +++ b/bin/reproducible_html_nodes_info.sh @@ -26,7 +26,6 @@ echo "$(date -u) - starting to write $PAGE page." write_page_header $VIEW "Nodes health overview" DISCLAIMER="<p>This page is still under development. Please provide feedback, which other information (be it from munin or elsewhere) should be displayed and how this page should be split further, eg, the graphs could all be on another page and/or we should split this page into four for the four architectures being tested…</p>" write_page $DISCLAIMER -# FIXME: Also either $0 and its job needs to be renamed to include 'html' or the code needs to be moved elsewhere write_page "<p style=\"clear:both;\">" for ARCH in ${ARCHS} ; do write_page "<h3>$ARCH nodes</h3>" diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index f1096c58..cc51a268 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -450,12 +450,12 @@ my_description: 'Generate an HTML page showing the live status of all builds happening or scheduled by humans.' my_timed: 'H/6 * * * *' my_shellext: ".py" + - 'html_nodes_info': + my_description: 'Collect various information from build nodes used for reproducible builds and generate static HTML pages with various information about nodes.' + my_timed: '0 0 * * *' - 'create_meta_pkg_sets': my_description: 'Create meta package sets for later consumption when generating HTML stats.' my_timed: '0 6 * * H/3' - - 'nodes_info': - my_description: 'Collect various information from build nodes used for reproducible builds.' - my_timed: '0 0 * * *' - 'json': my_description: 'Generate https://reproducible.debian.net/userContent/reproducible.json for consumption by tracker.debian.org.' my_timed: '1 * * * *' |