From 60f9fc3edec5e10a54c2056aba757fcc51ac0210 Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Thu, 8 Jun 2017 10:58:38 +0200
Subject: Fix git checkout and be less verbose
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I7d2b374f1ee0fe0d96c984c3e757f2fd49dd6a22
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 jjb/ci-apps-verify/.gitignore                    |  3 +++
 jjb/ci-apps-verify/ci-apps-jjb.local.sh          |  9 +++++++++
 jjb/common/include-agl-run-test-prepare.sh       |  2 +-
 jjb/common/include-agl-run-test-short-release.sh |  2 +-
 jjb/common/include-agl-run-test-short.sh         |  2 +-
 jjb/common/include-apps-build-app.sh             |  5 +++--
 jjb/common/include-apps-fetch-install-sdk.sh     | 10 +++++-----
 7 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 jjb/ci-apps-verify/.gitignore

diff --git a/jjb/ci-apps-verify/.gitignore b/jjb/ci-apps-verify/.gitignore
new file mode 100644
index 00000000..ce14f834
--- /dev/null
+++ b/jjb/ci-apps-verify/.gitignore
@@ -0,0 +1,3 @@
+mediaplayer
+controls
+poky-agl-*.sh
diff --git a/jjb/ci-apps-verify/ci-apps-jjb.local.sh b/jjb/ci-apps-verify/ci-apps-jjb.local.sh
index 9cae1dca..cb588b23 100755
--- a/jjb/ci-apps-verify/ci-apps-jjb.local.sh
+++ b/jjb/ci-apps-verify/ci-apps-jjb.local.sh
@@ -1,6 +1,15 @@
 #!/bin/bash
 
 set -x
+
+export GERRIT_REFSPEC="refs/changes/49/9549/2"
+export GERRIT_PROJECT="apps/mediaplayer"
+export GERRIT_CHANGE_NUMBER="9549"
+export GERRIT_PATCHSET_NUMBER="2"
+export GERRIT_PATCHSET_REVISION="b0f682b1579e520896ccd5492d6666d962a0c226"
+export GERRIT_HOST="gerrit.automotivelinux.org"
+export GERRIT_PORT="29418"
+
 . ../common/include-apps-header.sh
 . ../common/include-apps-fetch-install-sdk.sh
 . ../common/include-apps-build-app.sh
diff --git a/jjb/common/include-agl-run-test-prepare.sh b/jjb/common/include-agl-run-test-prepare.sh
index bf765c7b..36f5a7a4 100644
--- a/jjb/common/include-agl-run-test-prepare.sh
+++ b/jjb/common/include-agl-run-test-prepare.sh
@@ -4,7 +4,7 @@
 ################################################################################
 ## Run SHORT CI test
 ################################################################################
-set -x
+#set -x
 
 #ls -alh
 #pwd
diff --git a/jjb/common/include-agl-run-test-short-release.sh b/jjb/common/include-agl-run-test-short-release.sh
index 02a7fc18..f09dca8c 100644
--- a/jjb/common/include-agl-run-test-short-release.sh
+++ b/jjb/common/include-agl-run-test-short-release.sh
@@ -6,7 +6,7 @@
 ################################################################################
 
 
-set -x
+#set -x
 
 echo "## ${MACHINE} ##"
 cd $REPODIR
diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh
index 6897fde5..1ffc6f45 100644
--- a/jjb/common/include-agl-run-test-short.sh
+++ b/jjb/common/include-agl-run-test-short.sh
@@ -6,7 +6,7 @@
 ################################################################################
 
 
-set -x
+#set -x
 
 echo "## ${MACHINE} ##"
 cd $REPODIR
diff --git a/jjb/common/include-apps-build-app.sh b/jjb/common/include-apps-build-app.sh
index 01d765d0..8940ac00 100644
--- a/jjb/common/include-apps-build-app.sh
+++ b/jjb/common/include-apps-build-app.sh
@@ -40,7 +40,7 @@ HANDLED="no"
 
 # Projects in apps/*
 ###################
-if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "^apps/"); then
+if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "apps/"); then
 
     MYPROJECT=`echo $TARGETPROJECT | sed -e "s#apps/##g"`
 
@@ -50,7 +50,8 @@ if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "^apps/");
     git clone https://${GERRIT_HOST}/gerrit/${GERRIT_PROJECT}.git
     pushd ${MYPROJECT}
         git log -1
-        git reset --hard ${GERRIT_REFSPEC}
+        git fetch ${TARGET_REFSPEC}
+        git reset --hard FETCH_HEAD
         git log -1
         if test -f Makefile ; then
           make
diff --git a/jjb/common/include-apps-fetch-install-sdk.sh b/jjb/common/include-apps-fetch-install-sdk.sh
index d107f9ea..ad220501 100644
--- a/jjb/common/include-apps-fetch-install-sdk.sh
+++ b/jjb/common/include-apps-fetch-install-sdk.sh
@@ -41,10 +41,10 @@ fi
 
 source "${TARGETSDKENVSCRIPT}"
 
+echo "###############################################################################"
 ls -alh ~/
-
-ls
-
+echo "###############################################################################"
 ls -alh
-
-set
\ No newline at end of file
+echo "###############################################################################"
+set
+echo "###############################################################################"
-- 
cgit 1.2.3-korg