bin/reproducible_html_nodes_info.sh

@@ -105,30 +105,24 @@ for ARCH in ${ARCHS} ; do
 						;;
 			esac
 		done
-		# schroot setup
+		# diffoscope schroot setup
 		for SUITE in ${SUITES} ; do
+			URL="https://jenkins.debian.net/view/reproducible/view/Debian_setup_${ARCH}/job/reproducible_setup_schroot_${SUITE}_diffoscope_${ARCH}_${JENKINS_NODENAME}"
+			BADGE="$URL/badge/icon"
 			case $JENKINS_NODENAME in
 				profitbricks3)
 					if [ "$SUITE" = "unstable" ]; then
-						URL="https://jenkins.debian.net/view/reproducible/view/Debian_setup_${ARCH}/job/reproducible_setup_schroot_${SUITE}_diffoscope_${ARCH}_${JENKINS_NODENAME}"
-						BADGE="$URL/badge/icon"
 						write_page "<td><a href='$URL'><img src='$BADGE' /></a></td>"
 					else
 						write_page "<td></td>"
 					fi
 					;;
-				profitbricks4)	write_page "<td></td>" ;;
-				profitbricks7)	write_page "<td></td>" ;;
-				*)		URL="https://jenkins.debian.net/view/reproducible/view/Debian_setup_${ARCH}/job/reproducible_setup_schroot_${SUITE}_${ARCH}_${JENKINS_NODENAME}"
-						BADGE="$URL/badge/icon"
-						write_page "<td><a href='$URL'><img src='$BADGE' /></a>"
-						if [ "$JENKINS_NODENAME" = "jenkins" -a "$SUITE" != "experimental" ]; then
-							URL="https://jenkins.debian.net/view/reproducible/view/Debian_setup_${ARCH}/job/reproducible_setup_schroot_${SUITE}_diffoscope_${ARCH}_${JENKINS_NODENAME}"
-							BADGE="$URL/badge/icon"
-							write_page "<a href='$URL'><img src='$BADGE' /></a>"
+				jenkins)
+					if [ "$SUITE" != "experimental" ]; then
+						write_page "<td><a href='$URL'><img src='$BADGE' /></a></td>"
 					fi
-						write_page "</td>"
 					;;
+				*) write_page "<td></td>" ;;
 			esac
 		done
 		write_page "</tr>"

job-cfg/reproducible.yaml

@@ -263,7 +263,7 @@
         - '{name}_{my_task}_{my_arch}_{my_hname}':
             my_task:
                 - 'maintenance':
-                    my_description: 'Do some maintenance: check for old files and directories, do backups, update pbuilder and schroots, etc.'
+                    my_description: 'Do some maintenance: check for old files and directories, do backups, update chroots, etc.'
                     my_timed: '5 0,2,4,6,8,10,12,14,16,18,20,22 * * *'
             my_shell: '/srv/jenkins/bin/reproducible_maintenance.sh'
             my_hname:
@@ -283,7 +283,7 @@
         - '{name}_{my_task}_{my_arch}_{my_hname}':
             my_task:
                 - 'maintenance':
-                    my_description: 'Do some maintenance: check for old files and directories, do backups, update pbuilder and schroots, etc.'
+                    my_description: 'Do some maintenance: check for old files and directories, do backups, update chroots, etc.'
                     my_timed: '5 0,2,4,6,8,10,12,14,16,18,20,22 * * *'
             my_hname:
                 - 'bbx15':          { my_arch: 'armhf' }
@@ -406,22 +406,6 @@
                 - 'setup_pbuilder_experimental':
                     my_description: 'Setup pbuilder for reproducible builds of packages from experimental as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example'
                     my_timed: '33 7 * * *'
-                - 'setup_schroot_unstable':
-                    my_description: 'Setup unstable schroot for fetching source packages for the builder jobs.'
-                    my_timed: '20 1 * * *'
-                    my_disabled: true
-                - 'setup_schroot_stretch':
-                    my_description: 'Setup stretch schroot for fetching source packages for the builder jobs.'
-                    my_timed: '0 1 * * *'
-                    my_disabled: true
-                - 'setup_schroot_buster':
-                    my_description: 'Setup buster schroot for fetching source packages for the builder jobs.'
-                    my_timed: '0 2 * * *'
-                    my_disabled: true
-                - 'setup_schroot_experimental':
-                    my_description: 'Setup experimental schroot for fetching source packages for the builder jobs.'
-                    my_timed: '40 1 * * *'
-                    my_disabled: true
             my_hname:
                 - 'bbx15':          { my_arch: 'armhf' }
                 - 'bpi0':           { my_arch: 'armhf' }
@@ -488,19 +472,6 @@
                     my_timed: '23 0 * * *'
                     my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-buster-diffoscope buster diffoscope locales-all'
                     my_disabled: false
-                - 'unstable':
-                    my_timed: '42 1 * * *'
-                    my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-{my_distro} {my_distro}'
-                    my_disabled: true
-                - 'stretch':
-                    my_timed: '42 1 * * *'
-                    my_disabled: true
-                - 'buster':
-                    my_timed: '42 2 * * *'
-                    my_disabled: true
-                - 'experimental':
-                    my_timed: '33 1 * * *'
-                    my_disabled: true
             my_description: 'Setup {my_distro} schroot for fetching source packages for the builder jobs.'
             my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-{my_distro} {my_distro}'
             my_hname: