diff options
| author |   Kevin Hilman <khilman@baylibre.com> | 2019-08-26 16:40:52 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2019-08-26 16:45:28 -0700 |
| commit | 3fa01aed1c39f016ab3fbeeaed86b298518ee8b9 (patch) | |
| tree | a8286ce3a0ed12543b309ffa2bf68d27ecba5683 | |
| parent | e1c361d397d5ebc2901d053b79c86bcf6aea516b (diff) | |
jjb/common: use DIST_BUILD_TOPIC when available
Switch to $DIST_BUILD_TOPIC (if available) for determining the unique
ID used for the kernelCI backend data, as well as requesting the email
report.
Bug-AGL: SPEC-2646
Change-Id: Ib71c592c2973b5cbf31bc0d95a5a9d40ef3769a0
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
| -rw-r--r-- | jjb/common/include-agl-run-test-short.sh | 6 | ||||
| -rw-r--r-- | jjb/common/include-agl-send-email-report.sh | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh index 95db4875..2358d1c5 100644 --- a/jjb/common/include-agl-run-test-short.sh +++ b/jjb/common/include-agl-run-test-short.sh @@ -27,7 +27,11 @@ 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 " -CREATE_ARGS+="--name AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER " +if [[ ! -z $DIST_BUILD_TOPIC ]]; then + CREATE_ARGS+="--name $DIST_BUILD_TOPIC " +else + CREATE_ARGS+="--name AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER " +fi [[ ! -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 " diff --git a/jjb/common/include-agl-send-email-report.sh b/jjb/common/include-agl-send-email-report.sh index 82582e24..01daea34 100644 --- a/jjb/common/include-agl-send-email-report.sh +++ b/jjb/common/include-agl-send-email-report.sh @@ -24,8 +24,12 @@ 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_BB_DISTRO_VERSION-${DIST_LAYERS_MD5:0:8} + if [[ ! -z $DIST_BUILD_TOPIC ]]; then + GIT_DESCRIBE=$DIST_BUILD_TOPIC + else + GIT_DESCRIBE=$DIST_BB_DISTRO_VERSION-${DIST_LAYERS_MD5:0:8} + fi 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 " -fi
\ No newline at end of file +fi |