bin/jenkins_master_wrapper.sh

 #!/bin/bash
+# vim: set noexpandtab:
 
 # Copyright 2015-2017 Holger Levsen <holger@layer-acht.org>
 #                2016 Phil Hands <phil@hands.com>
+#           2018      Mattia Rizzolo <mattia@debian.org>
 # released under the GPLv=2
 # based on an idea by Peter Palfrader (see bin/jenkins_node_wrapper.sh)
 
@@ -25,7 +27,8 @@ RETRIEVE_ARTIFACTS=no
 # add some more params if needed,
 # by default we just use the job name as param
 case $JOB_NAME in
-	rebootstrap_*) 	PARAMS="$JOB_NAME $@"
+	rebootstrap_*|chroot-installation_*)
+		PARAMS="$JOB_NAME $@"
 		;;
 	lvc_*) 		PARAMS="$JOB_NAME $EXECUTOR_NUMBER TRIGGERING_BRANCH=${TRIGGERING_BRANCH:-} $@"
 			RETRIEVE_ARTIFACTS=yes

bin/jenkins_node_wrapper.sh

 #!/usr/bin/env bash
+# vim: set noexpandtab:
 
 # Copyright (c) 2009, 2010, 2012, 2015 Peter Palfrader
 #               2015-2017 Holger Levsen
-#               2017      Mattia Rizzolo <mattia@debian.org>
+#               2017-2018 Mattia Rizzolo <mattia@debian.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -72,6 +73,10 @@ elif [[ "$*" =~ ^rebootstrap_.* ]] ; then
 	REBOOTSTRAPSH="/srv/jenkins/bin/rebootstrap.sh $@"
 	export LC_ALL=C
 	exec $REBOOTSTRAPSH; croak "Exec failed";
+elif [[ "$*" =~ ^chroot-installation_.*maintenance$ ]]; then
+	shift ; exec /srv/jenkins/bin/maintenance.sh $@ ; croak "Exec failed"
+elif [[ "$*" =~ ^chroot-installation_.* ]]; then
+	shift ; exec /srv/jenkins/bin/chroot-installation.sh $@ ; croak "Exec failed"
 elif [ "$*" = "reproducible_html_nodes_info" ] ; then
 	exec /srv/jenkins/bin/reproducible_info.sh ; croak "Exec failed";
 elif [ "$1" = "/srv/jenkins/bin/reproducible_build.sh" ] && ( [ "$2" = "1" ] || [ "$2" = "2" ] ) ; then
@@ -116,14 +121,6 @@ elif [[ "$*" =~ ^reproducible_node_health_check_.*_.* ]] ; then
 	exec /srv/jenkins/bin/reproducible_node_health_check.sh ; croak "Exec failed";
 elif [[ "$*" =~ ^reproducible_setup_schroot_unstable_diffoscope_.*_.* ]] ; then
 	exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-diffoscope unstable diffoscope locales-all ; croak "Exec failed";
-elif [[ "$*" =~ ^reproducible_setup_schroot_buster_.*_.* ]] ; then
-	exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-buster buster ; croak "Exec failed";
-elif [[ "$*" =~ ^reproducible_setup_schroot_unstable_.*_.* ]] ; then
-	exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable unstable botch ; croak "Exec failed";
-elif [[ "$*" =~ ^reproducible_setup_schroot_stretch_.*_.* ]] ; then
-	exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-stretch stretch ; croak "Exec failed";
-elif [[ "$*" =~ ^reproducible_setup_schroot_experimental_.*_.* ]] ; then
-	exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-experimental experimental ; croak "Exec failed";
 elif [[ "$*" =~ ^reproducible_coreboot ]] ; then
 	exec /srv/jenkins/bin/reproducible_coreboot.sh ; croak "Exec failed";
 elif [[ "$*" =~ ^reproducible_openwrt ]] ; then

job-cfg/chroot-installation.yaml.py

@@ -314,7 +314,7 @@ jobs.append({ '{name}_{dist}_{action}': {
                   'my_description': 'Maintainance job for chroot-installation_{dist}_* jobs, do some cleanups and monitoring so that there is a predictable environment.',
                   'my_prio': '135',
                   'my_recipients': 'qa-jenkins-scm@lists.alioth.debian.org',
-                  'my_shell': '/srv/jenkins/bin/maintenance.sh chroot-installation_{dist}',
+                  'my_shell': '/srv/jenkins/bin/jenkins_master_wrapper.sh chroot-installation_{dist}',
                   'my_view': 'jenkins.d.n'}})
 
 
@@ -339,7 +339,7 @@ for jobindex, jobspec in enumerate(jobspecs):
                       'my_prio': 131,
                       'my_time': '',
                       'my_recipients': get_recipients('bootstrap'),
-                      'my_shell': '/srv/jenkins/bin/chroot-installation.sh {dist} none'+jobspec['s_ext'],
+                      'my_shell': '/srv/jenkins/bin/jenkins_master_wrapper.sh {dist} none'+jobspec['s_ext'],
                       'my_view': get_view('bootstrap', None),
                   }}
                   for (dists, trigs) in js_dists_trigs[jobindex].keys()])
@@ -367,7 +367,7 @@ for jobindex, jobspec in enumerate(jobspecs):
                                  'my_recipients': get_recipients(t)}}
                              for t in dv_targs],
                   'my_description': 'Debootstrap {dist}, then install {my_spokenname}'+jobspec['d_ext']+'.',
-                  'my_shell': '/srv/jenkins/bin/chroot-installation.sh {dist} {target}'+jobspec['s_ext'],
+                  'my_shell': '/srv/jenkins/bin/jenkins_master_wrapper.sh {dist} {target}'+jobspec['s_ext'],
                   'my_view': view,
                   }}
                   for (dists, view), dv_targs in targets_per_distview[jobindex].items()])