From a9fcea01daf49de7099a85691eb4e9fc3b091b7e Mon Sep 17 00:00:00 2001 From: Loys Ollivier Date: Mon, 11 Dec 2017 11:33:22 +0100 Subject: jjb/common: clean up device names to standardized ones. Use the device_name table aliases earlier in the CI process. That way all the scripts are using the correct device name. Avoiding name mismatch resulting to CI failure. Change-Id: Ia6f9f8beb06c43a24605abb24e676eaed68cc67e Signed-off-by: Loys Ollivier --- jjb/common/include-agl-run-test-prepare.sh | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'jjb/common/include-agl-run-test-prepare.sh') diff --git a/jjb/common/include-agl-run-test-prepare.sh b/jjb/common/include-agl-run-test-prepare.sh index 2c6611d9..20456175 100644 --- a/jjb/common/include-agl-run-test-prepare.sh +++ b/jjb/common/include-agl-run-test-prepare.sh @@ -24,8 +24,25 @@ if [ -e releng-scripts/utils ]; then RELENG=$PWD/releng-scripts fi +declare -A agl_lava_releng_aliases +agl_lava_releng_aliases=( + [raspberrypi3]="raspberrypi3-uboot;raspberrypi3" + [qemux86-64]="qemu;qemux86-64" + [m3ulcb-nogfx]="r8a7796-m3ulcb;m3ulcb" + [porter-nogfx]="renesas-porter;renesas-porter" + [dra7xx-evm]="dra7-evm;dra7xx-evm" +) + +OFS=${IFS} +IFS=';' +arr=(${agl_lava_releng_aliases[$MACHINE]}) +IFS=${OFS} +lava_device=${arr[0]} +releng_device=${arr[1]} +# And agl_device=${MACHINE} + CREATE_ARGS="" -CREATE_ARGS+="--machine ${MACHINE} " +CREATE_ARGS+="--machine ${releng_device} " # If it's a release build if [[ $RELEASE_BRANCH ]] && [[ $RELEASE_VERSION ]]; then -- cgit 1.2.3-korg