diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-09-06 14:35:53 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-09-06 14:44:11 +0200 |
| commit | ce16a75c785cb97137d3d0328fd60374442c9c70 (patch) | |
| tree | e82058b13ed302fd4a28c0b6bedff99bfbbbe024 | |
| parent | 47b87c6c3cbf548ed51a936606196ba8b9a8ba98 (diff) | |
| download | jenkins.debian.net-ce16a75c785cb97137d3d0328fd60374442c9c70.tar.xz | |
reproducible: remote builds: deal with 404 properly
| -rw-r--r-- | TODO | 1 | ||||
| -rwxr-xr-x | bin/reproducible_build.sh | 26 |
2 files changed, 25 insertions, 2 deletions
@@ -239,7 +239,6 @@ properties: * reproducible_build.sh changes needed: ** diffoscope needs to be run on the target arch... *** can't this be run via qemu on the host? -* exit 404 / * detect "bad gateway" as in https://jenkins.debian.net/job/reproducible_builder_amd64_4/222/ and deal with it properly * deal with rsync problems as in https://jenkins.debian.net/job/reproducible_builder_armhf_4/61/: ---- jenkins_node_wrapper.sh[14148] remote_host called with rsync --server --sender -re.iLsfx . /srv/reproducible-results/tmp.QhHoGHUUnP/b1 diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 461fbf13..273291db 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -409,7 +409,7 @@ get_source_package() { if [ "$MODE" = "legacy" ] || [ "$MODE" = "ng" ] ; then handle_404 else - exit 404 # FIXME: this is unhandled atm + exit 404 fi fi VERSION="$(grep '^Version: ' ${SRCPACKAGE}_*.dsc| head -1 | egrep -v '(GnuPG v|GnuPG/MacGPG2)' | cut -d ' ' -f2-)" @@ -511,6 +511,14 @@ check_buildinfo() { first_build else ssh -p $PORT1 $NODE1 /srv/jenkins/bin/reproducible_build.sh 1 ${SRCPACKAGE} ${SUITE} ${TMPDIR} + RESULT=$? + # 404-256=148... (ssh 'really' only 'supports' exit codes below 255...) + if [ $RESULT -eq 148 ] ; then + handle_404 + elif [ $RESULT -ne 0 ] ; then + echo "Unhandled exit code from remote build job, please investigate." + /srv/jenkins/bin/abort.sh + fi rsync -e "ssh -p $PORT1" -r $NODE1:$TMPDIR/b1 $TMPDIR/ ls -R $TMPDIR ssh -p $PORT1 $NODE1 "rm -r $TMPDIR" @@ -534,6 +542,14 @@ build_rebuild() { first_build else ssh -p $PORT1 $NODE1 /srv/jenkins/bin/reproducible_build.sh 1 ${SRCPACKAGE} ${SUITE} ${TMPDIR} + RESULT=$? + # 404-256=148... (ssh 'really' only 'supports' exit codes below 255...) + if [ $RESULT -eq 148 ] ; then + handle_404 + elif [ $RESULT -ne 0 ] ; then + echo "Unhandled exit code from remote build job, please investigate." + /srv/jenkins/bin/abort.sh + fi rsync -e "ssh -p $PORT1" -r $NODE1:$TMPDIR/b1 $TMPDIR/ ls -R $TMPDIR ssh -p $PORT1 $NODE1 "rm -r $TMPDIR" @@ -555,6 +571,14 @@ build_rebuild() { second_build else ssh -p $PORT2 $NODE2 /srv/jenkins/bin/reproducible_build.sh 2 ${SRCPACKAGE} ${SUITE} ${TMPDIR} + RESULT=$? + # 404-256=148... (ssh 'really' only 'supports' exit codes below 255...) + if [ $RESULT -eq 148 ] ; then + handle_404 + elif [ $RESULT -ne 0 ] ; then + echo "Unhandled exit code from remote build job, please investigate." + /srv/jenkins/bin/abort.sh + fi rsync -e "ssh -p $PORT2" -r $NODE2:$TMPDIR/b2 $TMPDIR/ ls -R $TMPDIR ssh -p $PORT2 $NODE2 "rm -r $TMPDIR" |