2 files changed, 36 insertions, 27 deletions
diff --git a/jjb/common/include-apps-prepare-upload-folder.sh b/jjb/common/include-apps-prepare-upload-folder.sh
new file mode 100644
index 00000000..e883e610
--- /dev/null
+++ b/jjb/common/include-apps-prepare-upload-folder.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+#set -x
+set -e
+
+echo -e "\n\n\n"
+echo "#########################################"
+echo -e "\n\n\n"
+
+
+
+# construct upload folder
+#mv UPLOAD UPLOAD2 || true
+if test x"" = x"${AGLBRANCH}" ; then
+  rm -rf UPLOAD/${TARGETARCH} || true
+  mkdir -p UPLOAD/${TARGETARCH}
+  export DEST=$(pwd)/UPLOAD/${TARGETARCH}
+else
+  rm -rf UPLOAD/${AGLBRANCH}/${TARGETARCH} || true
+  mkdir -p UPLOAD/${AGLBRANCH}/${TARGETARCH}
+  export DEST=$(pwd)/UPLOAD/${AGLBRANCH}/${TARGETARCH}
+fi
+
+pushd ${MYPROJECT}
+pwd
+
+ls -alh
+
+ls
+
+ls package || true
+
+cp package/*.wgt $DEST
+ls -alh $DEST
+
+popd
diff --git a/jjb/common/include-apps-rsync-download-changeid.sh b/jjb/common/include-apps-rsync-download-changeid.sh
index 8a9129a1..1f5e10b9 100644
--- a/jjb/common/include-apps-rsync-download-changeid.sh
+++ b/jjb/common/include-apps-rsync-download-changeid.sh
@@ -7,35 +7,8 @@ echo -e "\n\n\n"
 echo "#########################################"
 echo -e "\n\n\n"
 
-
 export RSYNCDST="/srv/download/AGL/upload/ci/${GERRIT_CHANGE_NUMBER}/${GERRIT_PATCHSET_NUMBER}"
 export RSYNCSRC=$(pwd)/UPLOAD/
-
-# construct upload folder
-#mv UPLOAD UPLOAD2 || true
-if test x"" = x"${AGLBRANCH}" ; then
-  rm -rf UPLOAD/${TARGETARCH} || true
-  mkdir -p UPLOAD/${TARGETARCH}
-  export DEST=$(pwd)/UPLOAD/${TARGETARCH}
-else
-  rm -rf UPLOAD/${AGLBRANCH}/${TARGETARCH} || true
-  mkdir -p UPLOAD/${AGLBRANCH}/${TARGETARCH}
-  export DEST=$(pwd)/UPLOAD/${AGLBRANCH}/${TARGETARCH}
-fi
-
-pushd ${MYPROJECT}
-pwd
-
-ls -alh
-
-ls
-
-ls package || true
-
-cp package/*.wgt $DEST
-ls -alh $DEST
 LANG=C tree $RSYNCSRC
-
-popd
 ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 mkdir -p ${RSYNCDST}
 rsync -avr -L -e "ssh -o StrictHostKeyChecking=no" $RSYNCSRC jenkins-slave@10.30.72.8:$RSYNCDST