From 485d5d46aa38e5e4169da75a673b387cb73df73f Mon Sep 17 00:00:00 2001
From: Khouloud Touil <ktouil@baylibre.com>
Date: Fri, 19 Apr 2019 14:30:35 +0200
Subject: Fix the URL to send the email report

The 'LAVA_MASTER_URI' used is wrong, this patch fixes the url.
It adds also a check on the output of lavacli command before to send the
test email report.

Signed-off-by: Khouloud Touil <ktouil@baylibre.com>
(cherry picked from commit d891414424913e7bcf2845740cd5c532a858877e)

Change-Id: Iff4b984593abb5ccb495764246826bcf173e6e6e
---
 jjb/common/include-agl-lava-jobs-submit.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/jjb/common/include-agl-lava-jobs-submit.sh b/jjb/common/include-agl-lava-jobs-submit.sh
index 07001e5e..bf4f478d 100644
--- a/jjb/common/include-agl-lava-jobs-submit.sh
+++ b/jjb/common/include-agl-lava-jobs-submit.sh
@@ -95,14 +95,17 @@ if [ -z "$KCI_EMAIL_AUTH_TOKEN" ]; then
 	TREE_NAME=$(grep kernel.tree: $JOB_FILE_NEW | sed 's,[[:space:]],,g' | cut -d: -f2)
 	BRANCH=$(grep git.branch: $JOB_FILE_NEW | sed 's,[[:space:]],,g' | cut -d: -f2)
 	GIT_DESCRIBE="$(grep kernel.version: $JOB_FILE_NEW | sed 's,[[:space:]],,g' | cut -d: -f2)"
-	lavacli --uri $LAVA_MASTER_URI results $job_id | grep '* [0-9]' |cut -d_ -f2- |cut -d. -f1 | sort | uniq > test_plans
-	if [ $? -eq 0 ] && [ -s test_plans ]; then
-		for plan in $(<test_plans); do
-			curl -X POST -H "Authorization: $KCI_EMAIL_AUTH_TOKEN" -H "Content-Type: application/json" -d '{"job": "'$TREE_NAME'", "kernel": "'$GIT_DESCRIBE'", "git_branch": "'$BRANCH'", "report_type": "test", "plan": "'$plan'", "send_to": [" automotive-testreports@lists.linuxfoundation.org"], "format": ["txt"], "delay": 3600}' ${KCI_API}/send
-			echo "The test email reportS will be sent with a delay of 1 hour "
-		done
-	else
-		echo "There is no test plan identified"
+	lavacli -i $lab results $job_id > test_plan.raw
+	if [ $? -eq 0 ]; then
+		grep '* [0-9]' test_plan.raw |cut -d_ -f2- |cut -d. -f1 | sort | uniq > test_plans
+		if [ $? -eq 0 ] && [ -s test_plans ]; then
+			for plan in $(<test_plans); do
+				curl -X POST -H "Authorization: $KCI_EMAIL_AUTH_TOKEN" -H "Content-Type: application/json" -d '{"job": "'$TREE_NAME'", "kernel": "'$GIT_DESCRIBE'", "git_branch": "'$BRANCH'", "report_type": "test", "plan": "'$plan'", "send_to": [" automotive-testreports@lists.linuxfoundation.org"], "format": ["txt"], "delay": 3600}' ${KCI_API}/send
+				echo "The test email reportS will be sent with a delay of 1 hour "
+			done
+		else
+			echo "There is no test plan identified"
+		fi
 	fi
 fi
 # after one successful submit, we're done
-- 
cgit 1.2.3-korg