From 0d037623063fac86eede997073e7f7badfac0597 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Tue, 23 May 2017 18:35:15 +0000 Subject: ci-platform: use updated LAVA auth LAVA authentiticaion setup is now done in a dedicated script (include-agl-lava-labs-prepare.sh), remove it from run-test-short.sh as it's no longer needed. While at it, rename porter.automotivelinux.org to its new name: lava.automotivelinux.org Change-Id: Ifd7b701c9d76abdeb02f3d242f0b32c26d448749 Signed-off-by: Kevin Hilman --- jjb/common/include-agl-run-test-short.sh | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'jjb/common/include-agl-run-test-short.sh') diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh index 162df146..6897fde5 100644 --- a/jjb/common/include-agl-run-test-short.sh +++ b/jjb/common/include-agl-run-test-short.sh @@ -11,20 +11,6 @@ set -x echo "## ${MACHINE} ##" cd $REPODIR -echo "default keyring config" -mkdir -p ~/.local/share/python_keyring/ -cat < ~/.local/share/python_keyring/keyringrc.cfg -[backend] -default-keyring=keyring.backends.file.PlaintextKeyring -EOF - -cat < ~/.local/token -$AGLLAVATOKEN -EOF - -lava-tool auth-add --token-file ~/.local/token https://agl-jenkins-user@porter.automotivelinux.org -rm -rf ~/.local/token || true - echo "## $TESTJOBFILE ##" if [ -e $TESTJOBFILE ] ; then @@ -99,18 +85,18 @@ sed -i -e "s#@REPLACE_URL_PREFIX@#${DEVICE_URL_PREFIX}#g" testjob.yaml cat testjob.yaml -lava-tool submit-job --block https://agl-jenkins-user@porter.automotivelinux.org testjob.yaml | tee .myjob +lava-tool submit-job --block https://agl-jenkins-user@lava.automotivelinux.org testjob.yaml | tee .myjob MYJOB=`cat .myjob | grep "submitted as job" | sed -e "s#submitted as job id: ##g"` echo "#### JOBID: $MYJOB #####" -( lava-tool job-status https://agl-jenkins-user@porter.automotivelinux.org $MYJOB | tee .status ) || true +( lava-tool job-status https://agl-jenkins-user@lava.automotivelinux.org $MYJOB | tee .status ) || true STATUS=`grep "Job Status:" .status | sed -e "s#Job Status: ##g"` if [ x"Complete" = x"$STATUS" ] ; then echo "YAY! $STATUS" - curl -o plain_output.yaml https://porter.automotivelinux.org/scheduler/job/$MYJOB/log_file/plain + curl -o plain_output.yaml https://lava.automotivelinux.org/scheduler/job/$MYJOB/log_file/plain cat plain_output.yaml | grep '"target",' | sed -e 's#- {"dt".*"lvl".*"msg":."##g' -e 's#"}$##g' # cleanup @@ -119,7 +105,7 @@ if [ x"Complete" = x"$STATUS" ] ; then exit 0 else echo "Nooooooooo! $STATUS" - curl -o plain_output.yaml https://porter.automotivelinux.org/scheduler/job/$MYJOB/log_file/plain + curl -o plain_output.yaml https://lava.automotivelinux.org/scheduler/job/$MYJOB/log_file/plain cat plain_output.yaml | grep '"target",' | sed -e 's#- {"dt".*"lvl".*"msg":."##g' -e 's#"}$##g' # cleanup -- cgit 1.2.3-korg