aboutsummaryrefslogtreecommitdiffstats
path: root/jjb/common/include-agl-run-test-short.sh
diff options
context:
space:
mode:
authorLoys Ollivier <lollivier@baylibre.com>2017-11-08 14:03:21 +0100
committerLoys Ollivier <lollivier@baylibre.com>2017-11-08 14:03:21 +0100
commiteb128da8fdda07d8f8f74ff941961992a9a52adc (patch)
treec1b4ebae021fa113dd76314508ed42e989970d47 /jjb/common/include-agl-run-test-short.sh
parent41f2a94135443b239d3335949726b4223d8c2f3d (diff)
CIBT improve lava lab searching and coding style
Fix coding style, indentation. Improve the lab search, if a lab has the device do not search in others as it won't be used. Change-Id: I7471511ff7af3d2f6d8708943b42099a450ef770 Signed-off-by: Loys Ollivier <lollivier@baylibre.com>
Diffstat (limited to 'jjb/common/include-agl-run-test-short.sh')
-rw-r--r--jjb/common/include-agl-run-test-short.sh17
1 files changed, 4 insertions, 13 deletions
diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh
index fda2da9e..68b412ad 100644
--- a/jjb/common/include-agl-run-test-short.sh
+++ b/jjb/common/include-agl-run-test-short.sh
@@ -7,25 +7,16 @@
set -x
-#
-# LAVA lab names for releng-scripts
-#
-declare -A lava_labs
-lava_labs=(
- [agl]="lab-agl-core"
- [baylibre]="lab-baylibre-legacy"
- )
-
echo "## ${MACHINE} ##"
-echo "# ${lava_labs[$LAVA_LAB]} #"
cd $REPODIR
# WIP: use $RELENG for subset of boards
__MACHINE=${MACHINE%-nogfx} # releng doesn't care
if [ ! -z $RELENG ] && \
[[ x$__MACHINE == x"qemux86-64" || \
- x$__MACHINE == x"raspberrypi3" || \
- x$__MACHINE == x"m3ulcb" ]]; then
+ x$__MACHINE == x"raspberrypi3" || \
+ x$__MACHINE == x"m3ulcb" ]]; then
+ echo "# LAVA lab target: ${LAVA_LAB} #"
# releng-scripts depends on jinja2 >= 2.9
echo "## Check version of python-jinja2: "
pip show jinja2
@@ -38,7 +29,7 @@ if [ ! -z $RELENG ] && \
[[ -e output/repo-manifest-r.txt.sha1 ]] && BUILD_VERSION+="-$(cat output/repo-manifest-r.txt.sha1)"
CREATE_ARGS+="--name AGL-gerrit "
CREATE_ARGS+="--build-version $BUILD_VERSION "
- CREATE_ARGS+="--callback ${lava_labs[$LAVA_LAB]} "
+ CREATE_ARGS+="--callback ${LAVA_LAB} "
CREATE_ARGS+="--test all"
$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml
cat testjob.yaml