From 1ac1732d615f28524f7c63625738130ed7188b0e Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Wed, 19 Jul 2017 13:44:02 +0200
Subject: Also pull submodules and add autobuild support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enable automatically pulling the submodules when cloning and
use the autobuild script if present.

Change-Id: Ib5641cb8d8c3c849c2c9bbcdacd287e9d01b6805
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 jjb/common/include-apps-build-app.sh               | 24 ++++++++++++++--------
 jjb/common/include-apps-rsync-download-changeid.sh |  4 ++--
 2 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'jjb')

diff --git a/jjb/common/include-apps-build-app.sh b/jjb/common/include-apps-build-app.sh
index f46c7f8d..ec79d841 100644
--- a/jjb/common/include-apps-build-app.sh
+++ b/jjb/common/include-apps-build-app.sh
@@ -46,7 +46,7 @@ if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "apps/"); t
 
     # clone git
     rm -rf ${MYPROJECT}
-    git clone https://${GERRIT_HOST}/gerrit/${GERRIT_PROJECT}.git
+    git clone --recursive https://${GERRIT_HOST}/gerrit/${GERRIT_PROJECT}.git
     pushd ${MYPROJECT}
         git log -1 --pretty=oneline
         if test x"" != x"${TARGETREFSPEC}" ; then
@@ -66,14 +66,22 @@ if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "apps/"); t
         git log -1 --pretty=oneline
 
         # Fixme: use aglbuild script
-        if test -f Makefile ; then
-          make
-          make package
+        export DONE=false
+        if test ! $DONE -a -f conf.d/autobuild/agl/autobuild ; then
+            mkdir -p $(pwd)/package/
+            conf.d/autobuild/agl/autobuild package DEST=$(pwd)/package/
+            export DONE=true
         fi
-        if test -f ${MYPROJECT}.pro; then
-          qmake
-          make
-          make package
+        if test ! $DONE -a -f Makefile ; then
+            make
+            make package
+            export DONE=true
+        fi
+        if test ! $DONE -a -f ${MYPROJECT}.pro; then
+            qmake
+            make
+            make package
+            export DONE=true
         fi
     popd
 
diff --git a/jjb/common/include-apps-rsync-download-changeid.sh b/jjb/common/include-apps-rsync-download-changeid.sh
index d6e9f8a3..939496d6 100644
--- a/jjb/common/include-apps-rsync-download-changeid.sh
+++ b/jjb/common/include-apps-rsync-download-changeid.sh
@@ -3,9 +3,9 @@
 #set -x
 set -e
 
-echo "\n\n\n"
+echo -e "\n\n\n"
 echo "#########################################"
-echo "\n\n\n"
+echo -e "\n\n\n"
 
 
 export RSYNCDST="/srv/download/AGL/upload/ci/${GERRIT_CHANGE_NUMBER}/${GERRIT_PATCHSET_NUMBER}"
-- 
cgit 1.2.3-korg