diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2018-10-03 23:01:13 +0200 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2018-10-03 23:01:13 +0200 |
| commit | 4971ec4ea3b6b37e06dd19292db92ccce2f2c661 (patch) | |
| tree | d8910929869e0281afc53ddc60b6bee55449fb10 | |
| parent | 78a77015d42e94452dba98436c1d46706158fe87 (diff) | |
Fix folder structure for app upload
Change-Id: I514e23d0b969e8571aab001fd52dd1710324d738
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
| -rw-r--r-- | jjb/ci-apps-verify/ci-apps-jjb.yaml | 2 | ||||
| -rw-r--r-- | jjb/release-jjb-flounder-sources/include-release-jjb-release-sources-rsync.sh | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/jjb/ci-apps-verify/ci-apps-jjb.yaml index 860cffa0..72433f63 100644 --- 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 c52387cf..e458a17d 100644 --- 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 |