Modify the build-version as well as the GIT_DESCRIBE values

Using only the DIST_LAYERS_MD5 wont give us any really useful
information so we use the version to get a proper information and append
that with the DIST_LAYERS_MD5 to garantee the uniqueness for the email
test reports.

Signed-off-by: Khouloud Touil <ktouil@baylibre.com>
Change-Id: I9418d48c1d89718dcad63f4786f28490d257322c

diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh
index 1cd56da..95db487 100644 (file)
--- a/jjb/common/include-agl-run-test-short.sh
+++ b/jjb/common/include-agl-run-test-short.sh
@@ -28,7 +28,7 @@ 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 "
 CREATE_ARGS+="--name AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER "
-[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_LAYERS_MD5 "
+[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION-${DIST_LAYERS_MD5:0:8} "
 [[ ! -z $DIST_BUILD_HASH ]] && CREATE_ARGS+="--commit $DIST_BUILD_HASH "
 [[ ! -z $DIST_BUILD_ID ]] && CREATE_ARGS+="--build-id $DIST_BUILD_ID "
 [[ ! -z $DIST_BB_AGL_BRANCH ]] && CREATE_ARGS+="--branch $DIST_BB_AGL_BRANCH "

diff --git a/jjb/common/include-agl-send-email-report.sh b/jjb/common/include-agl-send-email-report.sh
index 5ac5971..82582e2 100644 (file)
--- a/jjb/common/include-agl-send-email-report.sh
+++ b/jjb/common/include-agl-send-email-report.sh
@@ -24,7 +24,7 @@ if [ -n "$KCI_EMAIL_AUTH_TOKEN" ]; then
        KCI_API='http://kernelci.dev.baylibre.com:8081'
        TREE_NAME='AGL-yocto'
        BRANCH=$DIST_BB_AGL_BRANCH
-       GIT_DESCRIBE=$DIST_LAYERS_MD5
+       GIT_DESCRIBE=$DIST_BB_DISTRO_VERSION-${DIST_LAYERS_MD5:0:8}
        PLAN='agl-testplan'
        curl -X POST -H "Authorization: $KCI_EMAIL_AUTH_TOKEN" -H "Content-Type: application/json" -d '{"job": "'$TREE_NAME'", "kernel": "'$GIT_DESCRIBE'", "git_branch": "'$BRANCH'", "report_type": "test", "plan": "'$PLAN'", "send_to": ["automotive-testreports@lists.linuxfoundation.org"], "format": ["txt"], "delay": 3600}' ${KCI_API}/send
        echo "The test email reportS will be sent with a delay of 1 hour "