Disable color output in pytest

[src/qa-testdefinitions.git] / common / scripts / agl-extend-test.sh

diff --git a/common/scripts/agl-extend-test.sh b/common/scripts/agl-extend-test.sh
index fd3a4f8..847d2f2 100755 (executable)
--- a/common/scripts/agl-extend-test.sh
+++ b/common/scripts/agl-extend-test.sh
@@ -1,26 +1,35 @@
 #!/bin/bash
+export NO_COLOR=1
+export TERM=dumb
 
 pre_check=`which agl-test`
 
 if [ -n "$pre_check" ] ; then
-    agl-test
     echo "agl-extend-test is present"
 else
     echo "agl-test is not installed, abort this test"
     exit 127
 fi
 
+# execute
+agl-test
+
 
 if [ -x ./artiproxy-upload.sh ] ; then
-    LOG_DIR=/var/run/agl-test/logs/log-to-report
+    LOG_DIR='/var/run/agl-test/logs/log-to-report'
     ZIP_FILE=`ls ${LOG_DIR} | grep agl-test-log*`
 
+    ls -alh ${LOG_DIR}
+
     if [ -z $ZIP_FILE ] ; then
         echo "Cannot find agl-extend-test log"
         exit 1
     fi
 
-    ./artiproxy-upload.sh $LOG_DIR $ZIP_FILE
+    echo "DEBUG: upload LOG_DIR=${LOG_DIR}XXX"
+    echo "DEBUG: upload ZIP_FILE=${ZIP_FILE}XXX"
+
+    ./artiproxy-upload.sh "$LOG_DIR/$ZIP_FILE" "$ZIP_FILE"
     if [ $? -eq 1 ] ; then
         echo "Upload of ${ZIP_FILE} failed"
         exit 1