From: Khouloud Touil <ktouil@baylibre.com>
Date: Thu, 2 May 2019 13:00:19 +0000 (+0200)
Subject: Avoid failing the job when sending the email report
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F35%2F21235%2F1;p=ci-management.git

Avoid failing the job when sending the email report

This patch avoid to fail the job if the sending email report section is
not working well.

Change-Id: I9bc192e1ac8f3937fc06be15233b0a697d16ff15
Signed-off-by: Khouloud Touil <ktouil@baylibre.com>
---

diff --git a/jjb/common/include-agl-lava-jobs-submit.sh b/jjb/common/include-agl-lava-jobs-submit.sh
index bf4f478d..93f8b703 100644
--- a/jjb/common/include-agl-lava-jobs-submit.sh
+++ b/jjb/common/include-agl-lava-jobs-submit.sh
@@ -95,10 +95,11 @@ 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)"
+	set +e
 	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
+		if [ -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 "
@@ -107,6 +108,7 @@ if [ -z "$KCI_EMAIL_AUTH_TOKEN" ]; then
 			echo "There is no test plan identified"
 		fi
 	fi
+	set -e
 fi
 # after one successful submit, we're done
 if [ x"$status" = x"Complete" ]; then