[Qa-jenkins-scm] [jenkins.debian.net] 01/01: d-i iso builds: allow rsync of isos to pb10

[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 6da517d1e80a7a0b318d7c4c3f57aa663ecd9c5e
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Jun 21 00:53:41 2016 +0200

    d-i iso builds: allow rsync of isos to pb10
---
 bin/d-i_build.sh            | 2 +-
 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 a0fb507..57ecbaa 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 c26d45f..101ae4e 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

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