[Qa-jenkins-scm] [jenkins.debian.net] 01/01: proof of concept: allow rebootstrap jobs on nodes too (fixup 75bab531)

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit d74094f03104000cc8e7c52d519136e3d5f48b71
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Aug 30 21:00:13 2015 +0200

    proof of concept: allow rebootstrap jobs on nodes too (fixup 75bab531)
---
 bin/reproducible_node_wrapper.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_node_wrapper.sh b/bin/reproducible_node_wrapper.sh
index 057ba4d..2866a7c 100755
--- a/bin/reproducible_node_wrapper.sh
+++ b/bin/reproducible_node_wrapper.sh
@@ -59,10 +59,14 @@ info "remote_host called with $*"
 
 allowed_cmds=()
 
-if [ "$1" = "/srv/jenkins/bin/chroot-run.sh" ] && [ "$2" = "sid" ] && [ "$3" = "minimal" ] && [ "$4" = "./bootstrap.sh" ] ; then
-	shift
+if [[ "$*" =~ rebootstrap_.* ]] ; then
+	REBOOTSTRAPSH="/srv/jenkins/bin/chroot-run.sh sid minimal ./bootstrap.sh"
+	REBOOTSTRAPSH="$REBOOTSTRAPSH HOST_ARCH=$(echo $1 | cut -d "_" -f2)"
+	if [[ "$*" =~ .*_debbindiff.* ]] ; then
+		REBOOTSTRAPSH="$REBOOTSTRAPSH ENABLE_DEBBINDIFF=yes"
+	fi		echo $j | cut -d "_" -f2
 	export LC_ALL=C
-	exec /srv/jenkins/bin/chroot-run.sh $@ ; croak "Exec failed";
+	exec $REBOOTSTRAPSH ; croak "Exec failed";
 elif [ "$1" = "/srv/jenkins/bin/reproducible_build.sh" ] && ( [ "$2" = "1" ] || [ "$2" = "2" ] ) ; then
 	exec /srv/jenkins/bin/reproducible_build.sh $2 $3 $4 ; croak "Exec failed";
 elif   [ "$*" = "reproducible_setup_pbuilder_unstable_armhf_bpi0" ] ; then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git