diff options
| -rwxr-xr-x | bin/jenkins_master_wrapper.sh | 6 | ||||
| -rwxr-xr-x | bin/jenkins_node_wrapper.sh | 9 | ||||
| -rwxr-xr-x | job-cfg/rebootstrap.yaml.py | 7 |
3 files changed, 13 insertions, 9 deletions
diff --git a/bin/jenkins_master_wrapper.sh b/bin/jenkins_master_wrapper.sh index e11aec05..f50d85d0 100755 --- a/bin/jenkins_master_wrapper.sh +++ b/bin/jenkins_master_wrapper.sh @@ -17,7 +17,11 @@ case "$NODE_NAME" in exec ssh -p 2226 $NODE_NAME "$JOB_NAME" ;; profitbricks-build?-amd64.debian.net) - exec ssh $NODE_NAME "$JOB_NAME" + if [[ "$JOBNAME" =~ rebootstrap_.* ]] ; then + exec ssh $NODE_NAME "$JOB_NAME $@" + else + exec ssh $NODE_NAME "$JOB_NAME" + fi ;; *) echo >&2 "Unknown node $NODE_NAME." diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh index 23717899..18444119 100755 --- a/bin/jenkins_node_wrapper.sh +++ b/bin/jenkins_node_wrapper.sh @@ -62,14 +62,11 @@ allowed_cmds=() if [[ "$*" =~ /bin/nc\ localhost\ 4949 ]] ; then exec /bin/nc localhost 4949 ; croak "Exec failed"; -elif [[ "$*" =~ rebootstrap_.* ]] ; then +elif [[ "$0" =~ 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 + shift export LC_ALL=C - exec $REBOOTSTRAPSH ; 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 $5 ; croak "Exec failed"; elif [[ "$*" =~ rsync\ --server\ --sender\ .*\ .\ /srv/reproducible-results/tmp.* ]] ; then diff --git a/job-cfg/rebootstrap.yaml.py b/job-cfg/rebootstrap.yaml.py index da3bae3e..17a58721 100755 --- a/job-cfg/rebootstrap.yaml.py +++ b/job-cfg/rebootstrap.yaml.py @@ -78,7 +78,7 @@ print(""" branches: - '{my_branchname}' builders: - - shell: '{my_wrapper} LC_ALL=C /srv/jenkins/bin/chroot-run.sh sid minimal ./bootstrap.sh HOST_ARCH={my_arch} {my_params}' + - shell: '{my_wrapper} HOST_ARCH={my_arch} {my_params}' publishers: - logparser: parse-rules: '/srv/jenkins/logparse/rebootstrap.rules' @@ -142,4 +142,7 @@ for arch in sorted(architectures): debbindiff_comment=" showing debbindiffs" if debbindiff else "", node=get_node(arch))) if get_node(arch): - print(" my_wrapper: '/srv/jenkins/bin/reproducible_master_wrapper.sh'") + print(" my_wrapper: '/srv/jenkins/bin/jenkins_master_wrapper.sh'") + else: + print(" my_wrapper: 'LC_ALL=C /srv/jenkins/bin/chroot-run.sh sid minimal ./bootstrap.sh'") + |