diff options
| author |   Loys Ollivier <lollivier@baylibre.com> | 2017-12-13 13:32:23 +0100 |
|---|---|---|
| committer | Loys Ollivier <lollivier@baylibre.com> | 2017-12-13 13:34:59 +0100 |
| commit | 712b17b970b69dce76f3203557997ec42dcda845 (patch) | |
| tree | d9007a947e8834138c15ff70dd3ce3328bb7f637 /jjb | |
| parent | bcb4e917ab4310ea99d43628fe75d9e545115379 (diff) | |
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>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/common/include-agl-lava-jobs-submit.sh | 2 | ||||
| -rw-r--r-- | jjb/common/include-agl-lava-labs-prepare.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/jjb/common/include-agl-lava-jobs-submit.sh b/jjb/common/include-agl-lava-jobs-submit.sh index 94cc6586..217e8da9 100644 --- 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 56cdaeab..0b54f9f7 100644 --- 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" |