Fix folder structure for app upload

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

diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/jjb/ci-apps-verify/ci-apps-jjb.yaml
index 860cffa..72433f6 100644 (file)
--- a/jjb/ci-apps-verify/ci-apps-jjb.yaml
+++ b/jjb/ci-apps-verify/ci-apps-jjb.yaml
@@ -592,7 +592,7 @@
           - ../common/include-apps-fetch-install-sdk.sh
           - ../common/include-apps-build-app.sh
           - ../common/include-apps-prepare-upload-folder-merged.sh
-          - ../common/include-apps-rsync-download-apprepo.sh
+          #- ../common/include-apps-rsync-download-apprepo.sh
 
     publishers:
       - naginator:

diff --git a/jjb/release-jjb-flounder-sources/include-release-jjb-release-sources-rsync.sh b/jjb/release-jjb-flounder-sources/include-release-jjb-release-sources-rsync.sh
index c52387c..e458a17 100644 (file)
--- a/jjb/release-jjb-flounder-sources/include-release-jjb-release-sources-rsync.sh
+++ b/jjb/release-jjb-flounder-sources/include-release-jjb-release-sources-rsync.sh
@@ -28,9 +28,12 @@ mkdir -p ../UPLOAD/
 cp -ar agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.* ../UPLOAD/
 
 export RSYNCSRC=$(pwd)/../UPLOAD
-export RSYNCDST="jenkins-slave@10.30.72.8:/srv/download/AGL/release/${RELEASE_BRANCH}/"
+export RSYNCDST="/srv/download/AGL/release/${RELEASE_BRANCH}/"
 
 if test x"yes" = x"${UPLOAD}" ; then
+   set +x
    ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 "mkdir -p ${RSYNCDST}"
-   rsync -avr -e "ssh -o StrictHostKeyChecking=no" ${RSYNCSRC}/* ${RSYNCDST}
-fi
+   rsync -avr -e "ssh -o StrictHostKeyChecking=no" ${RSYNCSRC}/* jenkins-slave@10.30.72.8:${RSYNCDST}
+   ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 "rm -rf ${RSYNCDST}/latest" 
+   ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 "ln -sf ${RELEASE_VERSION} ${RSYNCDST}/latest"
+fi
\ No newline at end of file