diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-07-19 13:44:02 +0200 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-07-19 13:44:08 +0200 |
| commit | 1ac1732d615f28524f7c63625738130ed7188b0e (patch) | |
| tree | ceeccb809a7b62ae477126bdaef0a4f8a81f842d | |
| parent | 196f9128a0aad71605f2816127928c62bfdda707 (diff) | |
Also pull submodules and add autobuild support
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>
| -rw-r--r-- | jjb/common/include-apps-build-app.sh | 24 | ||||
| -rw-r--r-- | jjb/common/include-apps-rsync-download-changeid.sh | 4 |
2 files changed, 18 insertions, 10 deletions
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}" |