From c1f21dd967fb4e5d53e341cd02110e499068d966 Mon Sep 17 00:00:00 2001
From: James Ketrenos <james.p.ketrenos@intel.com>
Date: Thu, 6 Feb 2020 14:30:04 -0800
Subject: [PATCH] Updated to latest xe-solutions

Signed-off-by: James Ketrenos <james.p.ketrenos@intel.com>
---
 scripts/trigger.sh | 6 +++---
 scripts/watch.sh   | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/scripts/trigger.sh b/scripts/trigger.sh
index dbb2e1a..a089bee 100755
--- a/scripts/trigger.sh
+++ b/scripts/trigger.sh
@@ -11,8 +11,6 @@
 YES=
 QUIET=
 
-PROJECT=$(basename $(pwd))
-
 while getopts ydqp: opt; do
   case "${opt}" in
   q)
@@ -67,6 +65,8 @@ BUILD=${BUILD:-7517585}
 BRANCH=${BRANCH:-releases_19.4}
 REF=${REF:-master}
 
+PROJECT=${PROJECT:-${CONTAINER}}
+PROJECT=${PROJECT:-$(basename $(pwd))}
 PROJECT="vtt/sws/osgc/solutions/${PROJECT}"
 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}" == "" ]] && {
-    >&2 echo "Unable to create trigger"
+    >&2 echo "Unable to create trigger for ${PROJECT}"
     >&2 echo "${RESULTS}"
     exit 1
   }
diff --git a/scripts/watch.sh b/scripts/watch.sh
index 43a9367..53ebd00 100755
--- a/scripts/watch.sh
+++ b/scripts/watch.sh
@@ -166,18 +166,23 @@ while true; do
     success)
       update_log ${ID}
       ;;
-    cancelled)
+    cancelled|canceled)
       FAIL=1
       ;;
     failed)
       FAIL=1
       ;;
+    *)
+      echo "${JOB}"
+      ;;
     esac
   done
 
   (( 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}"
+    [[ ! -d "logs" ]] && mkdir "logs"
+    echo -e "${JOBS[@]}\n${FAIL}" > logs/${PIPELINE}
     exit ${FAIL}
   }