summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-06-20 22:03:13 +0200
committerHolger Levsen <holger@layer-acht.org>2016-06-20 22:05:10 +0200
commit3ec06826ea9ef3992d3e43d036959e8c8c02e77f (patch)
tree009d339c16b2959258d3d56bd8c99733f486fa28 /bin
parentc455661645fed3335f77bed8a022a3f3d235262d (diff)
downloadjenkins.debian.net-3ec06826ea9ef3992d3e43d036959e8c8c02e77f.tar.xz
d-i: let's try sending the right thing, in the right direction
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/d-i_build.sh12
-rwxr-xr-xbin/jenkins_node_wrapper.sh4
2 files changed, 8 insertions, 8 deletions
diff --git a/bin/d-i_build.sh b/bin/d-i_build.sh
index 70823e1a..910b3e25 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 817e7454..d00ebacc 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";