1
0

Updated to latest xe-solutions

Signed-off-by: James Ketrenos <james.p.ketrenos@intel.com>
This commit is contained in:
James Ketrenos 2020-02-06 14:30:04 -08:00
parent ef3e113f0d
commit c1f21dd967
2 changed files with 10 additions and 5 deletions

View File

@ -11,8 +11,6 @@
YES= YES=
QUIET= QUIET=
PROJECT=$(basename $(pwd))
while getopts ydqp: opt; do while getopts ydqp: opt; do
case "${opt}" in case "${opt}" in
q) q)
@ -67,6 +65,8 @@ BUILD=${BUILD:-7517585}
BRANCH=${BRANCH:-releases_19.4} BRANCH=${BRANCH:-releases_19.4}
REF=${REF:-master} REF=${REF:-master}
PROJECT=${PROJECT:-${CONTAINER}}
PROJECT=${PROJECT:-$(basename $(pwd))}
PROJECT="vtt/sws/osgc/solutions/${PROJECT}" PROJECT="vtt/sws/osgc/solutions/${PROJECT}"
URI_PROJECT=$(echo ${PROJECT} | sed -E 's,/,%2F,g') URI_PROJECT=$(echo ${PROJECT} | sed -E 's,/,%2F,g')
@ -144,7 +144,7 @@ TOKEN=$(echo ${RESULTS} | sed -E 's#([[{},])#\1\n#g' | {
TOKEN=$(echo ${RESULTS} | sed -nE 's,.*"token":\s*"([^"]*).*,\1,p') TOKEN=$(echo ${RESULTS} | sed -nE 's,.*"token":\s*"([^"]*).*,\1,p')
[[ "${TOKEN}" == "" ]] && { [[ "${TOKEN}" == "" ]] && {
>&2 echo "Unable to create trigger" >&2 echo "Unable to create trigger for ${PROJECT}"
>&2 echo "${RESULTS}" >&2 echo "${RESULTS}"
exit 1 exit 1
} }

View File

@ -166,18 +166,23 @@ while true; do
success) success)
update_log ${ID} update_log ${ID}
;; ;;
cancelled) cancelled|canceled)
FAIL=1 FAIL=1
;; ;;
failed) failed)
FAIL=1 FAIL=1
;; ;;
*)
echo "${JOB}"
;;
esac esac
done done
(( MORE == 0 )) && { (( MORE == 0 )) && {
(( FAIL )) && >&2 echo "See ${JOBS[*]} in logs for failures" (( FAIL )) && >&2 echo "See ${JOBS[@]} in logs for failures"
(( ! QUIET )) && echo "No more jobs. Exiting ${FAIL}" (( ! QUIET )) && echo "No more jobs. Exiting ${FAIL}"
[[ ! -d "logs" ]] && mkdir "logs"
echo -e "${JOBS[@]}\n${FAIL}" > logs/${PIPELINE}
exit ${FAIL} exit ${FAIL}
} }