build-linux.sh: Fix lava-boot.py results handling.

Change-Id: I54fd7c7b7281dc73a508b5bbb62f38389e81d805

1 files changed, 3 insertions, 29 deletions

diff --git a/build-linux.sh b/build-linux.sh
index c9a4756..9bda2f4 100755
--- a/build-linux.sh
+++ b/build-linux.sh
@@ -106,7 +106,6 @@ lava_boot()
 {
     arch=$1
     config=$2
-    job=
 
     case ${arch}:${config} in
 	arm:multi_v7_defconfig)
@@ -128,7 +127,7 @@ lava_boot()
     # lava_boot.py works only when started from its own dir
     pushd ${mydir}
     python3 ./lava-boot.py --level DEBUG --board ${DEVICE_TYPE} --name "TCWG GCC testing" app_linux/linux/ &
-    return $!
+    jobs="${jobs} $!"
 }
 
 status=0
@@ -151,20 +150,7 @@ do
     # Handle boot test via lava, if requested. Put the job in the lava
     # queue, we collect the results later
     if $boot ; then
-	job=$(lava_boot ${arch} ${config})
-	case ${job} in
-	    "")
-		status=1
-		lava_status=1
-		;;
-	    0)
-		# Special case where we don't support the config to
-		# boot, we do not want to report an error
-		;;
-	    *)
-		jobs="${jobs} ${job}"
-		;;
-	esac
+	lava_boot ${arch} ${config}
     fi
 done
 
@@ -173,7 +159,6 @@ if $boot ; then
 
     global_lava_result=PASS
     [ $lava_status -eq 1 ] && global_lava_result=FAILED
-    failed_jobs=
     for job in $jobs
     do
 	this_lava_result=0
@@ -181,16 +166,10 @@ if $boot ; then
 
 	case $this_lava_result in
 	    0)
-		# If the job completed, check that the individual tests were successful
-		rm -f csv
-		wget https://${LAVA_SERVER}/results/${job}/csv
-		# linux-linaro-ubuntu-lsb_release fails because lsb_release is not
-		# in the rootfs, so ignore this failure
-		cat csv | grep -v linux-linaro-ubuntu-lsb_release | awk -F, '{print $3;}' | grep -i fail && this_lava_result=1
+		# Job completed successfully
 		;;
 	    1)
 		global_lava_result=FAILED
-		failed_jobs="${failed_jobs} $job"
 		;;
 	    2)
 		# Infrastructure error. Ignore for the moment.
@@ -202,11 +181,6 @@ if $boot ; then
 
     if [ "$global_lava_result" = "FAILED" ]; then
 	status=1
-	echo "These jobs failed:"
-	for job in ${failed_jobs}
-	do
-	    echo ${job} https://${LAVA_SERVER}/results/${job}
-	done
     fi
 fi