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 <ktouil@baylibre.com>

diff --git a/jjb/common/include-agl-run-test-short-guppy.sh b/jjb/common/include-agl-run-test-short-guppy.sh
index 42565b4..d6a6076 100644 (file)
--- a/jjb/common/include-agl-run-test-short-guppy.sh
+++ b/jjb/common/include-agl-run-test-short-guppy.sh
@@ -20,10 +20,8 @@ CREATE_ARGS+="--build-type release "
 #[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH "
 #[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION "
 CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ "
-BUILD_VERSION="AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION"
-[[ -e output/repo-manifest-r.txt.sha1 ]] && BUILD_VERSION+="-$(cat output/repo-manifest-r.txt.sha1)"
 CREATE_ARGS+="--name AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION "
-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} "
 $RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml
 

diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh
index 3a79a2b..0598d9e 100644 (file)
--- 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} "