1 files changed, 38 insertions, 51 deletions
diff --git a/jjb/common/include-agl-run-test-prepare.sh b/jjb/common/include-agl-run-test-prepare.sh
index 1613bdcf..f0701bfc 100644
--- a/jjb/common/include-agl-run-test-prepare.sh
+++ b/jjb/common/include-agl-run-test-prepare.sh
@@ -24,63 +24,50 @@ if [ -e releng-scripts/utils ]; then
     RELENG=$PWD/releng-scripts
 fi
 
-ls -alhR meta-agl/templates/machine/${MACHINE}
-
-#### Find out if machine can be tested.
-#### We keep a stamp file in meta-agl/templates/machine/$MACHINE/test
-if [ ! -d meta-agl/templates/machine/${MACHINE}/test ]; then
-  echo "No HW test templates for ${MACHINE} configured."
-  echo "Add meta-agl/templates/machine/${MACHINE}/test/ and its contents to enable"
-  exit 0
+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}
+
+if [ -z "${lava_device}" -o -z "${releng_device}" ]; then
+    echo "Board not supported: $MACHINE"
+    exit 0
 fi
 
-if [ ! -f meta-agl/templates/machine/${MACHINE}/test/hwtest.enable ] ; then 
-  echo "No HW test for ${MACHINE} configured."
-  echo "Add meta-agl/templates/machine/${MACHINE}/test/hwtest.enable to enable"
-  exit 0
-fi
+CREATE_ARGS=""
+CREATE_ARGS+="--machine ${releng_device} "
 
-if [ ! -f meta-agl/templates/machine/${MACHINE}/test/hwtest.short.enable ] ; then
-  echo "No short HW test for ${MACHINE} configured."
-  echo "Add meta-agl/templates/machine/${MACHINE}/test/hwtest.enable.short to enable"
-else
-  eval export ENVFILE=meta-agl/templates/machine/${MACHINE}/test/hwtest.short.environment
+# If it's a release build
+if [[ $RELEASE_BRANCH ]] && [[ $RELEASE_VERSION ]]; then
+    CREATE_ARGS+="--build-type release $RELEASE_BRANCH $RELEASE_VERSION "
 fi
-
-if [ ! -f $ENVFILE ] ; then
-  echo "No short HW test environment file available for ${MACHINE}."
-  echo "Add ${ENVFILE} to enable."
-  exit 1
+# If it's a CI build
+if [[ $GERRIT_CHANGE_NUMBER ]] && [[ $GERRIT_PATCHSET_NUMBER ]]; then
+    CREATE_ARGS+="--build-type ci $GERRIT_CHANGE_NUMBER $GERRIT_PATCHSET_NUMBER "
 fi
 
-# some defaults
-#export DEVICE_ARCH=arm
-#export DEVICE_TYPE=raspberrypi3-uboot
-#export DEVICE_NAME=raspberrypi3
-#export DEVICE_DTB=uImage-bcm2710-rpi-3-b.dtb
-#export DEVICE_KERNEL=uImage
-#export DEVICE_INITRAMFS=initramfs-netboot-image-raspberrypi3.ext4
-#export DEVICE_INITRAMFS_COMPRESSION=false
-#export DEVICE_NBDROOT=agl-demo-platform-raspberrypi3.ext4
-#export DEVICE_NBDROOT_COMPRESSION=false
-#export DEVICE_BOOT_METHOD=u-boot
-#export DEVICE_BOOT_TYPE=bootm
-export DEVICE_URL_PREFIX='https://download.automotivelinux.org/AGL/upload/ci/'
-
-
-# import device defaults. Format 'a=b'
-for i in DEVICE_ARCH DEVICE_TYPE DEVICE_NAME DEVICE_DTB DEVICE_KERNEL DEVICE_INITRAMFS DEVICE_INITRAMFS_COMPRESSION DEVICE_NBDROOT DEVICE_NBDROOT_COMPRESSION DEVICE_BOOT_METHOD DEVICE_BOOT_TYPE DEVICE_URL_PREFIX DEVICE_QEMU_ARGS DEVICE_KERNEL_CMDLINE; do
-    if grep -q ^$i $ENVFILE ; then
-        X=$(grep $i $ENVFILE | sed -e "s#${i}=##g" -e "s#;.*##g")
-        eval export ${i}=${X}
-    else
-        echo "Variable ${i} missing in environment file $ENVFILE"
-    fi
-done
-
-echo "Resulting values:"
-set | grep DEVICE_
-
+$RELENG/utils/job-prereq.py ${CREATE_ARGS}
+if [ $? -ne 0 ]; then
+    echo "Board not supported by releng-scripts: job-prereq.py"
+    exit 0
+fi
+# First call to job-prereq suceeded, other should suceed as they use the same args.
+export DEVICE_DTB=`$RELENG/utils/job-prereq.py ${CREATE_ARGS} --dtb`
+export DEVICE_KERNEL=`$RELENG/utils/job-prereq.py ${CREATE_ARGS} --kernel`
+export DEVICE_INITRAMFS=`$RELENG/utils/job-prereq.py ${CREATE_ARGS} --initrd`
+export DEVICE_NBDROOT=`$RELENG/utils/job-prereq.py ${CREATE_ARGS} --nbdroot`
 
 # echo NEXT is rsync
 #exit 0