jjb/common: Fix query of lava log in jenkins log

Fix the query of the log in jenkins log. Use the lava website url and not the
lava API url.

JIRA: SPEC-1178

Change-Id: I9ddc48b13e91a91aa2e53c768aa02f2ae12e5a99
Signed-off-by: Loys Ollivier <lollivier@baylibre.com>

diff --git a/jjb/common/include-agl-lava-jobs-submit.sh b/jjb/common/include-agl-lava-jobs-submit.sh
index 94cc658..217e8da 100644 (file)
--- a/jjb/common/include-agl-lava-jobs-submit.sh
+++ b/jjb/common/include-agl-lava-jobs-submit.sh
@@ -44,7 +44,7 @@ echo "####"
 
 JOB_OUTPUT="${JOB_BASE}_output.yaml"
 JOB_LOG="${JOB_BASE}_output.log"
-curl -s -o $JOB_OUTPUT $full_url/scheduler/job/$job_id/log_file/plain
+curl -s -o $JOB_OUTPUT $lava_url/scheduler/job/$job_id/log_file/plain
 cat $JOB_OUTPUT | grep '"target",' | sed -e 's#- {"dt".*"lvl".*"msg":."##g' -e 's#"}$##g' | tee $JOB_LOG
 
 echo "####"

diff --git a/jjb/common/include-agl-lava-labs-prepare.sh b/jjb/common/include-agl-lava-labs-prepare.sh
index 56cdaea..0b54f9f 100644 (file)
--- a/jjb/common/include-agl-lava-labs-prepare.sh
+++ b/jjb/common/include-agl-lava-labs-prepare.sh
@@ -52,7 +52,8 @@ for lab in "${!labs[@]}"; do
     fi
 
     # LAVA URL with username
-    full_url=${url/:\/\//:\/\/${user}\@}
+    lava_url=${url/:\/\//:\/\/${user}\@}
+    full_url=${lava_url}
     full_url+="RPC2/" # entry point for XML-RPC API
     echo "LAVA auth-add for lab: $lab, URL: $full_url"