diff options
| author | Holger Levsen <holger@layer-acht.org> | 2016-06-21 00:53:41 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-06-21 00:53:41 +0200 |
| commit | 6da517d1e80a7a0b318d7c4c3f57aa663ecd9c5e (patch) | |
| tree | 2602e22f4a4524e9fada64e7fc39c8637d53c164 | |
| parent | 81c604ff908d8425d13dbef93832622e4d0cbe71 (diff) | |
| download | jenkins.debian.net-6da517d1e80a7a0b318d7c4c3f57aa663ecd9c5e.tar.xz | |
d-i iso builds: allow rsync of isos to pb10
| -rwxr-xr-x | bin/d-i_build.sh | 2 | ||||
| -rwxr-xr-x | bin/jenkins_node_wrapper.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/d-i_build.sh b/bin/d-i_build.sh index a0fb5078..57ecbaa8 100755 --- a/bin/d-i_build.sh +++ b/bin/d-i_build.sh @@ -71,7 +71,7 @@ preserve_artifacts() { if [ "$HOSTNAME" = "jenkins" ] ; then # FIXME this rsync should probably be in a separate job that the one on pb10 could then depend on -- otherwise race conditions seem to lurk ssh -o 'Batchmode = yes' $DI_HOST mkdir -p $ISO_DIR/ - rsync -e "ssh -o 'Batchmode = yes'" -r $DI_HOST:$ISO_DIR/ $ISO_DIR/ + rsync -e "ssh -o 'Batchmode = yes'" -r $ISO_DIR/ $DI_HOST:$ISO_DIR/ fi fi } diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh index c26d45f1..101ae4eb 100755 --- a/bin/jenkins_node_wrapper.sh +++ b/bin/jenkins_node_wrapper.sh @@ -87,8 +87,8 @@ elif [[ "$*" =~ rsync\ --server\ --sender\ .*\ .\ /srv/reproducible-results/.* ] exec rsync --server --sender "$4" . "$6" ; croak "Exec failed"; elif [[ "$*" =~ rsync\ --server\ --sender\ .*\ .\ /var/lib/jenkins/userContent/reproducible/.* ]] ; then exec rsync --server --sender "$4" . "$6" ; croak "Exec failed"; -elif [[ "$*" =~ rsync\ --server\ --sender\ .*\ .\ /srv/d-i/isos/ ]] ; then - exec rsync --server --sender "$4" . "$6" ; croak "Exec failed"; +elif [[ "$*" =~ rsync\ --server\ .*\ .\ /srv/d-i/isos/ ]] ; then + exec rsync --server --sender "$3" . "$5" ; croak "Exec failed"; elif [[ "$*" =~ mkdir\ -p\ /srv/d-i/isos/.* ]] ; then exec mkdir -p "$3" ; croak "Exec failed"; elif [[ "$*" =~ rm\ -r\ /srv/reproducible-results/tmp.* ]] ; then |