From 6f9b3116e8cb7d80e27e72f3e94e9ecce9c7217b Mon Sep 17 00:00:00 2001 From: Khouloud Touil Date: Wed, 27 Feb 2019 14:07:37 +0100 Subject: Modify the --build-version content Modify the --build-version content to take the DIST_BB_DISTRO_VERSION content which is going to be extracted from the build-info file in both files 'include-agl-run-test-short-guppy.sh' and 'include-agl-run-test-short.sh'. Change-Id: Iddf7394c624a5fdc08cddf806eaebb70456c4398 Signed-off-by: Khouloud Touil --- jjb/common/include-agl-run-test-short.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'jjb/common/include-agl-run-test-short.sh') diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh index 3a79a2bd..0598d9e7 100644 --- a/jjb/common/include-agl-run-test-short.sh +++ b/jjb/common/include-agl-run-test-short.sh @@ -21,10 +21,8 @@ CREATE_ARGS+="--machine ${releng_device} " CREATE_ARGS+="--build-type ci " [[ ! -z $GERRIT_CHANGE_NUMBER ]] && CREATE_ARGS+="--changeid $GERRIT_CHANGE_NUMBER " [[ ! -z $GERRIT_PATCHSET_NUMBER ]] && CREATE_ARGS+="--patchset $GERRIT_PATCHSET_NUMBER " -BUILD_VERSION="AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER" -[[ -e output/repo-manifest-r.txt.sha1 ]] && BUILD_VERSION+="-$(cat output/repo-manifest-r.txt.sha1)" CREATE_ARGS+="--name AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER " -CREATE_ARGS+="--build-version $BUILD_VERSION " +[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION " CREATE_ARGS+="--callback-from ${LAVA_LAB} " if [[ ! -z $lavacli_tags ]] && [[ $MACHINE =~ "-nogfx" ]]; then CREATE_ARGS+="--device-tags ${lavacli_tags} " -- cgit 1.2.3-korg