From 400860df142d9e475276339fedf610c58fa88158 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Fri, 19 Jan 2018 10:23:18 +0100 Subject: [PATCH] Allow getthelogs to fetch job logs from rdoproject CI job logs from logs.rdoproject.org use another console log name and there is no ending '/log' in the URLs. It would be nice to be able to collect those logs for tripleo CI jobs as well. Change-Id: I137cd3eb749f24cb72bb675faca625a0f1f68000 Signed-off-by: Bogdan Dobrelya --- scripts/getthelogs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/getthelogs b/scripts/getthelogs index 5f2572052..24824c6aa 100755 --- a/scripts/getthelogs +++ b/scripts/getthelogs @@ -40,13 +40,17 @@ trap finish EXIT SIGINT SIGTERM WORKERS=6 BASEURL=${1%/} SC=$(dirname $BASEURL | grep -o \/ | wc -w) -if [[ ! $(basename $BASEURL) == 'logs' && SC -le 7 ]]; then +if [[ $BASEURL =~ 'logs.rdoproject' && SC -le 9 ]] ||\ + [[ $BASEURL =~ 'logs.rdoproject.org/openstack-periodic' && SC -le 5 ]]; then + console="$BASEURL/console.txt.gz" +elif [[ ! $(basename $BASEURL) == 'logs' && SC -le 7 ]]; then console="$BASEURL/job-output.txt.gz" BASEURL=${BASEURL}/logs else console='' fi TDIR=${BASEURL##*http://} +TDIR=${TDIR##*https://} TDIR=/tmp/${TDIR} mkdir -p $TDIR cd /tmp @@ -63,7 +67,8 @@ for d in $list_to_get; do args="\"-nv -nc --no-use-server-timestamps \ --accept-regex='\.txt\.gz$|messages$' \ --reject='index.html*' \ - --recursive -l 10 --domains logs.openstack.org --no-parent \ + --recursive -l 10 --domains logs.openstack.org,logs.rdoproject.org \ + --no-parent \ -erobots=off --wait 0.25 ${d}\"" echo "${args}" >> wget-jobs.txt done