jjb/common: run-test-short: only use lavacli tags

Only pass tags that were queried from the LAVA devices themselves,
don't add any additional tags (e.g. "weston")

This is done since after recent changes to releng-scripts, using
--device-tags will *require* those tags to be present for a given
device for the job to run, and currently no devices are using the
"weston" tag.

How to properly handle the -nogfx builds for boards with no
display/gfx needs to be revisited after proper tag handling is merged.

Change-Id: Ic6ba4743866c5de35ee45063c834c569c4b728eb
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh
index 9995e9b..0a69360 100644 (file)
--- a/jjb/common/include-agl-run-test-short.sh
+++ b/jjb/common/include-agl-run-test-short.sh
@@ -34,10 +34,8 @@ CREATE_ARGS+="--name AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER "
 [[ ! -z $DIST_BB_AGL_BRANCH ]] && CREATE_ARGS+="--branch $DIST_BB_AGL_BRANCH "
 [[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION "
 CREATE_ARGS+="--callback-from ${LAVA_LAB} "
-if [[ ! -z $lavacli_tags ]] && [[ $MACHINE =~ "-nogfx" ]]; then
-       CREATE_ARGS+="--device-tags ${lavacli_tags} "
-else
-       CREATE_ARGS+="--device-tags ${lavacli_tags} "weston" "
+if [[ ! -z $lavacli_tags ]]; then
+    CREATE_ARGS+="--device-tags ${lavacli_tags} "
 fi
 $RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml