From 3fa01aed1c39f016ab3fbeeaed86b298518ee8b9 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Mon, 26 Aug 2019 16:40:52 -0700 Subject: 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 --- jjb/common/include-agl-run-test-short.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (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 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 " -- cgit 1.2.3-korg