reproducible Debian: refactoring

Signed-off-by: Holger Levsen <holger@layer-acht.org>

bin/jenkins_master_wrapper.sh

@@ -31,7 +31,7 @@ PARAMS=("$JOB_NAME")
 
 # add some more params if needed,
 case $JOB_NAME in
-	rebootstrap_*|chroot-installation_*|haskell-package-plan|reproducible_mmdebstrap_*)
+	rebootstrap_*|chroot-installation_*|haskell-package-plan|reproducible_*debstrap_*)
 		PARAMS+=("$@")
 		;;
 	reproducible_debian_live_build_*)

bin/jenkins_node_wrapper.sh

@@ -86,8 +86,8 @@ elif [ "$1" = "reproducible_pool_buildinfos" ] ; then
 	exec /srv/jenkins/bin/reproducible_pool_buildinfos.sh ; croak "Exec failed";
 elif [ "$1" = "reproducible_html_builtin-pho" ] ; then
 	exec /srv/jenkins/bin/reproducible_html_builtin-pho.sh ; croak "Exec failed";
-elif [[ "$*" =~ reproducible_mmdebstrap.* ]] ; then
-	exec /srv/jenkins/bin/reproducible_debstrap.sh "$2" ; croak "Exec failed";
+elif [[ "$*" =~ reproducible_.*debstrap.* ]] ; then
+	exec /srv/jenkins/bin/reproducible_debstrap.sh "$2" "$3" ; croak "Exec failed";
 elif [ "$1" = "janitor-setup-worker" ] ; then
 	shift ; exec /srv/jenkins/bin/janitor_setup_worker.sh ; croak "Exec failed";
 elif [ "$1" = "janitor-worker" ] ; then

bin/reproducible_debstrap.sh

@@ -24,8 +24,8 @@ cleanup() {
 
 
 # Init some variables
-export TOOL="mmdebstrap"
-export SUITE="$1"
+export TOOL="$1"
+export SUITE="$2"
 export SOURCE_DATE_EPOCH="$(date +%s)"
 output_echo "SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH"
 export BUILDDIR=$(mktemp --tmpdir=/srv/workspace/ -d -t ${TOOL}-${SUITE}.XXXXXXXX)

job-cfg/reproducible.yaml

@@ -606,17 +606,17 @@
                     my_timed: '0 6 * * H/3'
                 - 'mmdebstrap_unstable':
                     my_description: 'Check mmdebstrap of unstable is reproducible.'
-                    my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh unstable'
+                    my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh mmdebstrap unstable'
                     my_timed: '0 7 * * *'
                     my_hname: 'osuosl173'
                 - 'mmdebstrap_bookworm':
                     my_description: 'Check mmdebstrap of bookworm is reproducible.'
-                    my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh bookworm'
+                    my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh mmdebstrap bookworm'
                     my_timed: '15 7 * * *'
                     my_hname: 'osuosl173'
                 - 'mmdebstrap_bullseye':
                     my_description: 'Check mmdebstrap of bullseye is reproducible.'
-                    my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh bullseye'
+                    my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh mmdebstrap bullseye'
                     my_timed: '30 7 1 * *'
                     my_hname: 'osuosl173'
                 - 'json':