X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Frelease-job.sh;h=9ff67994434e90a56ed3daa80e2c640d6a5bc835;hb=f51dc60970af3ae53126b5628ff2f1e4c480b17e;hp=7ac6fc58ce21121e4a4cc65950a2764c5132e178;hpb=b0de8e76ba8c4e2cacbef206d7864e856b1ffc1d;p=releng%2Fglobal-jjb.git diff --git a/shell/release-job.sh b/shell/release-job.sh index 7ac6fc58..9ff67994 100644 --- a/shell/release-job.sh +++ b/shell/release-job.sh @@ -25,7 +25,7 @@ python -m pip freeze set_variables_common(){ echo "INFO: Setting common variables" - if [[ -z ${LOGS_SERVER:-} ]] || [[ -z ${CDN_URL:-} ]]; then + if [[ -z ${LOGS_SERVER:-} ]] && [[ -z ${CDN_URL:-} ]]; then echo "ERROR: LOGS_SERVER or CDN_URL not defined" exit 1 fi @@ -48,6 +48,9 @@ set_variables_common(){ release_file="None" fi + if [[ -z ${LOG_DIR:-} ]]; then + LOG_DIR=$(yq -r ".log_dir" "$release_file") + fi if [[ -n ${LOGS_SERVER:-} ]]; then logs_url="${LOGS_SERVER}/${NEXUS_PATH}${LOG_DIR}" elif [[ -n ${CDN_URL:-} ]]; then