From adcbd80872d811ba5f094016fb5c21f8f839020f Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Mon, 8 Mar 2021 13:39:54 +0000 Subject: SPEC-3414: fix the grep test failling due to set -e The grep test fail due to jenkins beiing set -e by default Fix in the same time the path to agl-publish Bug-AGL: SPEC-3414 Change-Id: I2260d1dc266a97081695f9bd8bac9eabfdb6a3a3 Signed-off-by: Corentin LABBE --- jjb/common/include-agl-kci-publish-build-meta.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'jjb') diff --git a/jjb/common/include-agl-kci-publish-build-meta.sh b/jjb/common/include-agl-kci-publish-build-meta.sh index da36d4c7..c2c1a5c1 100644 --- a/jjb/common/include-agl-kci-publish-build-meta.sh +++ b/jjb/common/include-agl-kci-publish-build-meta.sh @@ -6,8 +6,7 @@ echo "\n\n\n" kci-publish() { # check GERRIT_PROJECT to find if we build an app or not - echo $GERRIT_PROJECT |grep -q apps - if [ $? -eq 0 ];then + if echo $GERRIT_PROJECT |grep -q apps ;then # for app BUILD_VERSION="AGL-app-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER" else @@ -22,7 +21,7 @@ kci-publish() { echo "DEBUG: arch $TARGETARCH" echo "DEBUG: branch $GERRIT_BRANCH" return 0 - ./agl-publish.py --machine ${TARGETMACHINE} \ + ./utils/agl-publish.py --machine ${TARGETMACHINE} \ --build_version $BUILD_VERSION \ --commit $DIST_BUILD_HASH \ --arch $TARGETARCH \ -- cgit 1.2.3-korg