aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/common/include-agl-lava-jobs-submit.sh2
-rw-r--r--jjb/common/include-agl-lava-labs-prepare.sh3
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"