bin/reproducible_common.sh

@@ -719,9 +719,9 @@ handle_remote_error() {
 }
 
 #
-# create the png (and query the db to populate a csv file...)
+# create the png (and query the db to populate a csv file...) for Debian
 #
-create_png_from_table() {
+create_debian_png_from_table() {
 	echo "Checking whether to update $2..."
 	# $1 = id of the stats table
 	# $2 = image file name

bin/reproducible_html_dashboard.sh

@@ -497,7 +497,7 @@ create_suite_arch_stats_page() {
 	for i in 0 2 ; do
 		# recreate png once a day
 		if [ ! -f $DEBIAN_BASE/$SUITE/$ARCH/${TABLE[$i]}.png ] || [ $DUMMY_FILE -nt $DEBIAN_BASE/$SUITE/$ARCH/${TABLE[$i]}.png ] ; then
-			create_png_from_table $i $SUITE/$ARCH/${TABLE[$i]}.png
+			create_debian_png_from_table $i $SUITE/$ARCH/${TABLE[$i]}.png
 		fi
 	done
 	write_page "</p>"
@@ -522,7 +522,7 @@ write_global_graph() {
 	write_page " <a href=\"/debian/${TABLE[$i]}.png\"><img src=\"/debian/${TABLE[$i]}.png\" class="halfview" alt=\"${MAINLABEL[$i]}\"></a>"
 	# redo pngs once a day
 	if [ ! -f $DEBIAN_BASE/${TABLE[$i]}.png ] || [ $DUMMY_FILE -nt $DEBIAN_BASE/${TABLE[$i]}.png ] ; then
-		create_png_from_table $i ${TABLE[$i]}.png
+		create_debian_png_from_table $i ${TABLE[$i]}.png
 	fi
 }
 
@@ -683,7 +683,7 @@ create_performance_page() {
 		MAINLABEL[1]="Amount of packages built each day on '$ARCH'"
 		write_page " <a href=\"/debian/${TABLE[1]}_$ARCH.png\"><img src=\"/debian/${TABLE[1]}_$ARCH.png\" class=\"overview\" alt=\"${MAINLABEL[1]}\"></a>"
 		if [ ! -f $DEBIAN_BASE/${TABLE[1]}_$ARCH.png ] || [ $DUMMY_FILE -nt $DEBIAN_BASE/${TABLE[1]}_$ARCH.png ] ; then
-				create_png_from_table 1 ${TABLE[1]}_$ARCH.png
+				create_debian_png_from_table 1 ${TABLE[1]}_$ARCH.png
 		fi
 	done
 	write_page "<p style=\"clear:both;\">"

job-cfg/g-i-installation.yaml

@@ -118,25 +118,22 @@
     my_time: ''
     my_desktop: ''
     my_trigger: ''
-    my_trigdesc: ''
     my_title_extra: ''
     jobs:
       - '{name}_{my_dist}_{my_ver}_{my_profile}':
          my_title: '{my_distname} ({my_ver}) {my_profile}{my_title_extra}'
-         my_description: 'Do a fully automated installation of a {my_distname} {my_verdesc} {my_profile} profile - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/{my_dist}_{my_ver}_{my_profile}_preseed.cfg">this preseed.cfg</a>) using the {my_ver} image.{my_trigdesc}'
+         my_description: 'Do a fully automated installation of a {my_distname} {my_verdesc} {my_profile} profile - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/{my_dist}_{my_ver}_{my_profile}_preseed.cfg">this preseed.cfg</a>) using the {my_ver} image.'
 
 - job-group:
     name: '{name}_debian_{my_ver}_desktops_group'
     my_optdesc: ''
     my_trigger: ''
     my_time: ''
-    my_trigdesc: ''
-    my_optdesc2: ''
     my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
     jobs:
       - '{name}_debian_{my_ver}_{my_desktop}':
           my_title: 'Debian ({my_verdesc}) {my_desktop} desktop install{my_optdesc}'
-          my_description: 'Do a fully automated installation of Debian {my_desktop} desktop{my_optdesc}{my_optdesc2} - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian_{my_ver}_{my_desktop}_preseed.cfg">this preseed.cfg</a>){my_instdesc}.{my_trigdesc}'
+          my_description: 'Do a fully automated installation of Debian {my_desktop} desktop{my_optdesc} - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian_{my_ver}_{my_desktop}_preseed.cfg">this preseed.cfg</a>){my_instdesc}.'
           my_disksize: 10
 
 
@@ -233,16 +230,14 @@
                 my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org debian-hurd@lists.debian.org'
                 my_instdesc: ''
           my_ver:
-            - jessie:
-                my_inst_url: 'http://ftp.debian-ports.org/debian-cd/hurd-i386/debian-hurd-2015/debian-hurd-2015-i386-NETINST-1.iso'
-                my_trigdesc: '<br />This job is only triggered manually.'
-                my_verdesc: jessie
-                my_time: '42 16 31 12 4'
-                my_optdesc2: ' on <a href="https://lists.debian.org/debian-devel-announce/2015/04/msg00012.html">Debian GNU/hurd 2015 Jessie release</a>'
-            - sid_daily:
-                my_inst_url: 'http://people.debian.org/~sthibault/hurd-i386/installer/cdimage/daily/debian-sid-hurd-i386-NETINST-1.iso'
+            - stretch:
+                my_inst_url: 'https://cdimage.debian.org/cdimage/ports//9.0/hurd-i386/iso-cd/debian-hurd-2017-i386-NETINST-1.iso'
+                my_verdesc: 'stretch netinst'
+                my_time: '42 16 31 12 *'
+            - buster:
+                    my_inst_url: 'https://cdimage.debian.org/cdimage/ports//10.0/hurd-i386/current/debian-sid-hurd-i386-NETINST-1.iso'
                 my_time: '42 10 */2 * *'
-                my_verdesc: 'sid daily build CD'
+                my_verdesc: 'buster netinst'
 
       - '{name}_debian_sid_daily_rescue_translations_group'