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 <lollivier@baylibre.com>

1 files changed, 0 insertions, 20 deletions

diff --git a/jjb/common/include-agl-lava-labs-prepare.sh b/jjb/common/include-agl-lava-labs-prepare.sh
index 938dcbe6..56cdaeab 100644
--- a/jjb/common/include-agl-lava-labs-prepare.sh
+++ b/jjb/common/include-agl-lava-labs-prepare.sh
@@ -17,9 +17,6 @@ labs=(
 #    [baylibre_seattle]="http://lava.ished.com/;$LAB_BAYLIBRE_SEATTLE_USER;$LAB_BAYLIBRE_SEATTLE_TOKEN"
 )
 
-echo "## ${MACHINE} ##"
-__MACHINE=${MACHINE%-nogfx}
-
 #
 # Ensure python_keyring is set to plaintext.  Required for
 # non-interactive use
@@ -31,23 +28,6 @@ cat <<EOF >  ~/.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"
-    [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}
-
 device_available=0
 for lab in "${!labs[@]}"; do
     val=${labs[$lab]}