From 7d319181c7f74cd98cd82ec90a1faa7d43316c5e Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Wed, 28 Aug 2019 14:18:04 -0700 Subject: jjb/common: fix DIST_BUILD_TOPIC usage Fix use of DIST_BUILD_TOPIC to be used with --build-version (instead of --name). build-version is the key used in the backend to collect all related jobs, whereas --name is just for the LAVA job name. The email report request also uses $DIST_BUILD_TOPIC, which will allow and email report to be generated with results for all tests with the same $DIST_BUILD_TOPIC. Bug-AGL: SPEC-2646 Change-Id: I8657270bcbbc06f361b079a07f3922cf4e782e1a Signed-off-by: Kevin Hilman --- jjb/common/include-agl-run-test-short.sh | 6 +++--- 1 file changed, 3 insertions(+), 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 2358d1c5..6dc1c79f 100644 --- a/jjb/common/include-agl-run-test-short.sh +++ b/jjb/common/include-agl-run-test-short.sh @@ -27,12 +27,12 @@ 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 " + CREATE_ARGS+="--build-version $DIST_BUILD_TOPIC " else - CREATE_ARGS+="--name AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER " + [[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION-${DIST_LAYERS_MD5:0:8} " 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 " [[ ! -z $DIST_BB_AGL_BRANCH ]] && CREATE_ARGS+="--branch $DIST_BB_AGL_BRANCH " -- cgit 1.2.3-korg