Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Skip Metadata Capture on unsupported Clouds
[releng/global-jjb.git]
/
shell
/
release-job.sh
diff --git
a/shell/release-job.sh
b/shell/release-job.sh
index
7ac6fc5
..
9ff6799
100644
(file)
--- 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"
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
echo "ERROR: LOGS_SERVER or CDN_URL not defined"
exit 1
fi
@@
-48,6
+48,9
@@
set_variables_common(){
release_file="None"
fi
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
if [[ -n ${LOGS_SERVER:-} ]]; then
logs_url="${LOGS_SERVER}/${NEXUS_PATH}${LOG_DIR}"
elif [[ -n ${CDN_URL:-} ]]; then