Fix typo and upload mechanism

Change-Id: I4e7494eec84102cc59fe917b01193ff0bdc8b893
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/jjb/release-jjb-chinook-release/include-release-jjb-chinook-release-move-sandbox.sh b/jjb/release-jjb-chinook-release/include-release-jjb-chinook-release-move-sandbox.sh
index 536f726..396dfb1 100644 (file)
--- a/jjb/release-jjb-chinook-release/include-release-jjb-chinook-release-move-sandbox.sh
+++ b/jjb/release-jjb-chinook-release/include-release-jjb-chinook-release-move-sandbox.sh
@@ -14,7 +14,7 @@ if test x"" = x"${RELEASE_VERSION}"; then
 fi
 
 
-export REMOTESRC="/src/download/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/"
+export REMOTESRC="/srv/download/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/"
 export REMOTEDST="/srv/download/AGL/release/${RELEASE_BRANCH}/${RELEASE_VERSION}/"
 
 if test x"yes" = x"$UPLOAD" ; then

diff --git a/jjb/release-jjb-dab-snapshot/include-release-jjb-dab-snapshot-rsync.sh b/jjb/release-jjb-dab-snapshot/include-release-jjb-dab-snapshot-rsync.sh
index 50944a8..3ffeb24 100644 (file)
--- a/jjb/release-jjb-dab-snapshot/include-release-jjb-dab-snapshot-rsync.sh
+++ b/jjb/release-jjb-dab-snapshot/include-release-jjb-dab-snapshot-rsync.sh
@@ -19,9 +19,9 @@ echo "#######################################"
 
 cd repoclone/output
 
-export REMOTEDST="/srv/download/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/"
+export REMOTEDST="/srv/download/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/"
 export RSYNCDST="jenkins-slave@10.30.72.8:${REMOTEDST}"
-export RSYNCSRC=$(pwd)/UPLOAD/
+export RSYNCSRC=$(pwd)/UPLOAD/${MACHINE}
 
 # construct upload folder
 mv UPLOAD UPLOAD2 || true
@@ -44,11 +44,13 @@ tree $DEST
 
 ls -alhR $DEST
 
+
+
 echo "would do rsync -avr -e \"ssh -o StrictHostKeyChecking=no\" $RSYNCSRC $RSYNCDST "
 
 if test x"yes" = x"$UPLOAD" ; then
    ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 mkdir -p ${REMOTEDST}
-   rsync -avr -e "ssh -o StrictHostKeyChecking=no" $RSYNCSRC $RSYNCDST
+   rsync --delete -avr -e "ssh -o StrictHostKeyChecking=no" $RSYNCSRC/* $RSYNCDST
 fi
 
 exit 0
\ No newline at end of file