After merge, rebuild app

and upload it to the app repository folder on
the download server for consumption.

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

3 files changed, 64 insertions, 9 deletions

diff --git a/jjb/common/include-apps-header.sh b/jjb/common/include-apps-header.sh
index da084eda..9afcbde6 100644
--- a/jjb/common/include-apps-header.sh
+++ b/jjb/common/include-apps-header.sh
@@ -24,18 +24,9 @@ function dprint() {
     :
 }
 
-#export TARGETARCHALL="arm aarch64 x86-64"
-#set | grep arm
-#set | grep aarch64
-#set | grep x86-64
-
 echo "################################################################################"
 set | grep TARGETARCH
 echo "################################################################################"
-#if test x"" = x"${TARGETARCH}"; then
-#    export TARGETARCH="arm"
-#fi
-#set +x
 
 # finally cmdline arguments
 while getopts ":b:a:p:r:dvx" opt; do
diff --git a/jjb/common/include-apps-prepare-upload-folder-merged.sh b/jjb/common/include-apps-prepare-upload-folder-merged.sh
new file mode 100644
index 00000000..37b5887f
--- /dev/null
+++ b/jjb/common/include-apps-prepare-upload-folder-merged.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+#set -x
+set -e
+
+echo -e "\n\n\n"
+echo "#########################################"
+echo -e "\n\n\n"
+
+#failsafe
+if test x"" = x"${ALGBRANCH}" ; then
+  echo "AGLBRANCH not defined"
+  exit 1
+fi
+if test x"" = x"${MYPROJECT}"; then
+  echo "MYPROJECT not defined"
+  exit 1
+fi
+if test x"" = x"${BUILD_NUMBER}"; then
+  echo "BUILD_NUMBER not defined"
+  exit 1
+fi
+if test x"" = x"${GERRIT_CHANGE_NUMBER}"; then
+  echo "GERRIT_CHANGE_NUMBER not defined"
+  exit 1
+fi
+if test x"" = x"${TARGETARCH}"; then
+  echo "TARGETARCH is not defined"
+  exit 1
+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}
+
+# copy the wgt to the upload folder
+pushd ${MYPROJECT}
+  pwd
+  ls -alh || true
+  ls package || true
+  cp package/*.wgt $DEST
+  ls -alh $DEST
+popd
diff --git a/jjb/common/include-apps-rsync-download-apprepo.sh b/jjb/common/include-apps-rsync-download-apprepo.sh
new file mode 100644
index 00000000..3d8e1e10
--- /dev/null
+++ b/jjb/common/include-apps-rsync-download-apprepo.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+#set -x
+set -e
+
+echo -e "\n\n\n"
+echo "#########################################"
+echo -e "\n\n\n"
+#                                       project branch date(latest)
+export RSYNCDST="/srv/download/AGL/apps/"
+export RSYNCSRC=$(pwd)/UPLOAD/
+LANG=C tree $RSYNCSRC
+
+set
+
+exit 0
+ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 mkdir -p ${RSYNCDST}
+rsync -avr -l --copy-unsafe-links -e "ssh -o StrictHostKeyChecking=no" $RSYNCSRC jenkins-slave@10.30.72.8:$RSYNCDST