From 9929c8aaa1e6278efc26698f8fc1a6c311ff46b3 Mon Sep 17 00:00:00 2001 From: Loys Ollivier Date: Wed, 15 Nov 2017 10:24:09 +0100 Subject: jjb/common: lava-jobs: create device name aliases The previous version would fail to find some boards if the device names were different between lava, AGL, releng. This version creates a device alias table. And uses this table with the correct name for each component (AGL, lava, releng). Change-Id: Ief064c5ff9edb2d824e80549148ee0ab40ebcddf Signed-off-by: Loys Ollivier --- jjb/common/include-agl-lava-labs-prepare.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'jjb/common/include-agl-lava-labs-prepare.sh') diff --git a/jjb/common/include-agl-lava-labs-prepare.sh b/jjb/common/include-agl-lava-labs-prepare.sh index cde6539d..b7acd0a6 100644 --- a/jjb/common/include-agl-lava-labs-prepare.sh +++ b/jjb/common/include-agl-lava-labs-prepare.sh @@ -31,6 +31,21 @@ cat < ~/.local/share/python_keyring/keyringrc.cfg default-keyring=keyring.backends.file.PlaintextKeyring EOF +declare -A agl_lava_releng_aliases +agl_lava_releng_aliases=( + [raspberrypi3]="raspberrypi3-uboot;raspberrypi3" + [qemux86-64]="qemu;qemux86-64" + [m3ulcb-nogfx]="r8a7796-m3ulcb;m3ulcb" +) + +OFS=${IFS} +IFS=';' +arr=(${agl_lava_releng_aliases[$MACHINE]}) +IFS=${OFS} +lava_device=${arr[0]} +releng_device=${arr[1]} +# And agl_device=${MACHINE} + for lab in "${!labs[@]}"; do val=${labs[$lab]} OFS=${IFS} @@ -67,8 +82,8 @@ for lab in "${!labs[@]}"; do rm -f $token_file # Find the LAVA Lab that has the device available to run the job - echo -n "Checking for $__MACHINE at $full_url... " - line=$(lava-tool devices-list $full_url |grep $__MACHINE | tr -d '[:space:]') + echo -n "Checking for $lava_device at $full_url... " + line=$(lava-tool devices-list $full_url |grep $lava_device | tr -d '[:space:]') if [ -z "$line" ]; then echo "not found." continue -- cgit 1.2.3-korg