Fix issue with difference in buildid by using changeset number only

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

diff --git a/jjb/common/include-apps-prepare-upload-folder-merged.sh b/jjb/common/include-apps-prepare-upload-folder-merged.sh
index eb9018a..0e273bd 100644 (file)
--- a/jjb/common/include-apps-prepare-upload-folder-merged.sh
+++ b/jjb/common/include-apps-prepare-upload-folder-merged.sh
@@ -32,9 +32,9 @@ fi
 # construct upload folder
 #mv UPLOAD UPLOAD2 || true
 rm -rf UPLOAD/* || true
-mkdir -p UPLOAD/${MYPROJECT}/${AGLBRANCH}/${BUILD_NUMBER}-${GERRIT_CHANGE_NUMBER}/${TARGETARCH}
-ln -sf ${BUILD_NUMBER}-${GERRIT_CHANGE_NUMBER} UPLOAD/${MYPROJECT}/${AGLBRANCH}/latest
-export DEST=$(pwd)/UPLOAD/${MYPROJECT}/${AGLBRANCH}/${BUILD_NUMBER}-${GERRIT_CHANGE_NUMBER}/${TARGETARCH}
+mkdir -p UPLOAD/${MYPROJECT}/${AGLBRANCH}/changeset-${GERRIT_CHANGE_NUMBER}/${TARGETARCH}
+ln -sf changeset-${GERRIT_CHANGE_NUMBER} UPLOAD/${MYPROJECT}/${AGLBRANCH}/latest
+export DEST=$(pwd)/UPLOAD/${MYPROJECT}/${AGLBRANCH}/changeset-${GERRIT_CHANGE_NUMBER}/${TARGETARCH}
 
 # copy the wgt to the upload folder
 pushd ${MYPROJECT}