[Qa-jenkins-scm] [jenkins.debian.net] 01/01: d-i: let's try sending the right thing, in the right direction

[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 3ec06826ea9ef3992d3e43d036959e8c8c02e77f
Author: Philip Hands <phil at hands.com>
Date:   Mon Jun 20 22:03:13 2016 +0200

    d-i: let's try sending the right thing, in the right direction
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/d-i_build.sh            | 12 ++++++------
 bin/jenkins_node_wrapper.sh |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/d-i_build.sh b/bin/d-i_build.sh
index 70823e1..910b3e2 100755
--- a/bin/d-i_build.sh
+++ b/bin/d-i_build.sh
@@ -52,12 +52,6 @@ preserve_artifacts() {
 	if PU_BRANCH_DIR=$(replace_origin_pu "/srv/udebs/" $GIT_BRANCH) ; then
 		mkdir -p $PU_BRANCH_DIR
 		cp ${RESULT_DIR}/*.udeb $PU_BRANCH_DIR
-
-		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' profitbricks-build10-amd64.debian.net mkdir -p $PU_BRANCH_DIR/
-			rsync -e "ssh -o 'Batchmode = yes'" -r profitbricks-build10-amd64.debian.net:$PU_BRANCH_DIR/ $PU_BRANCH_DIR/
-		fi
 	fi
 
 	#
@@ -71,6 +65,12 @@ preserve_artifacts() {
 		sha256sum installer-*/*/images/netboot/gtk/mini.iso installer-*/*/images/netboot/mini.iso
 		mv -f installer-*/*/images/netboot/gtk/mini.iso $(iso_target gtk)
 		mv -f installer-*/*/images/netboot/mini.iso $(iso_target text)
+
+		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' profitbricks-build10-amd64.debian.net mkdir -p $ISO_DIR/
+			rsync -e "ssh -o 'Batchmode = yes'" -r $ISO_DIR/ profitbricks-build10-amd64.debian.net:$ISO_DIR/
+		fi
 	fi
 }
 
diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh
index 817e745..d00ebac 100755
--- a/bin/jenkins_node_wrapper.sh
+++ b/bin/jenkins_node_wrapper.sh
@@ -87,9 +87,9 @@ 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/udebs/.*/ ]] ; then
+elif [[ "$*" =~ rsync\ --server\ --sender\ .*\ .\ /srv/d-i/isos/.*/ ]] ; then
 	exec rsync --server --sender "$4" . "$6" ; croak "Exec failed";
-elif [[ "$*" =~ mkdir\ -p\ /srv/udebs/.* ]] ; then
+elif [[ "$*" =~ mkdir\ -p\ /srv/d-i/isos/.* ]] ; then
 	exec mkdir -p "$3"  ; croak "Exec failed";
 elif [[ "$*" =~ rm\ -r\ /srv/reproducible-results/tmp.* ]] ; then
 	exec rm -r "$3" ; croak "Exec failed";

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