Index: build/build.sh
===================================================================
diff -u -r8fd222d29cda75ad0f7ea9ab7956deecb19473f1 -re14be295cb3a37e35e39c7bb4f043841d3321fb4
--- build/build.sh	(.../build.sh)	(revision 8fd222d29cda75ad0f7ea9ab7956deecb19473f1)
+++ build/build.sh	(.../build.sh)	(revision e14be295cb3a37e35e39c7bb4f043841d3321fb4)
@@ -18,7 +18,6 @@
 REMOTE_DIR="/media/XDrive/Users/Bamboo-Projects"
 REPORT_DIR="$timeStamp-BuildNo-$buildNumber-$buildPlan"
 REPORT=Report
-LOG=log
 
 # gcc env
 gcc_qmake="/opt/Qt/5.12.4/gcc_64/bin/qmake"
@@ -80,8 +79,8 @@
     -I$app_path/sources/configuration \
     -I$app_path/sources/canbus \
     --enable=all \
-    1> $LOG/cppcheck.log \
-    2> $LOG/cppcheck.err
+    1> cppcheck.log \
+    2> cppcheck.err
 
 if [[ $(grep \(error\) cppcheck.err) != "" ]]; then
     echo "ERROR: Static Code Analysis Failed"
@@ -112,8 +111,8 @@
 $poky_qmake ../../$pro_path/$pro_name $poky_spec $pro_build
 
 #run make
-build_err=../$LOG/build.err
-build_log=../$LOG/build.log
+build_err=../build.err
+build_log=../build.log
 $poky_make -j4 1> $build_log 2> $build_err
 
 if [[ $(grep "error:" $build_err) != "" ]]; then
@@ -140,7 +139,8 @@
 cd ..
 
 #copy the out file into the server
-cp $out_path/$LOG/* $REMOTE_DIR/$REPORT_DIR
+mkdir -p $REMOTE_DIR/$REPORT_DIR/log
+cp $out_path/* $REMOTE_DIR/$REPORT_DIR/log
 mkdir -p $REMOTE_DIR/$REPORT_DIR/bin
 cp $out_path/$poky_out/denali $REMOTE_DIR/$REPORT_DIR/bin
 sync;sync;sync;
Index: build/unittest.sh
===================================================================
diff -u -r8fd222d29cda75ad0f7ea9ab7956deecb19473f1 -re14be295cb3a37e35e39c7bb4f043841d3321fb4
--- build/unittest.sh	(.../unittest.sh)	(revision 8fd222d29cda75ad0f7ea9ab7956deecb19473f1)
+++ build/unittest.sh	(.../unittest.sh)	(revision e14be295cb3a37e35e39c7bb4f043841d3321fb4)
@@ -8,15 +8,15 @@
 REMOTE_DIR="/media/XDrive/Users/Bamboo-Projects"
 REPORT_DIR="$timeStamp-BuildNo-$buildNumber-$buildPlan"
 REPORT=Report
-LOGS=logs
+LOG=log
 
 export PATH=$PATH:/opt/Qt5.12.5/5.12.5/gcc_64/bin/:/opt/Qt/5.12.5/gcc_64/lib
 export PATH=$PATH:/opt/SquishCoco/bin/:/opt/SquishCoco/wrapper/bin/
 export LD_LIBRARY_PATH=/opt/Qt/5.12.5/gcc_64/lib
 export DISPLAY=:10.0
 
 echo " ------------------------------ Create the Report output/log folder"
-mkdir $REPORT
+mkdir -p $REPORT/
 
 echo " ------------------------------ Clone Denali "
 git clone ssh://git@dvm-linux02:7999/ui/application.git
@@ -35,17 +35,17 @@
 git clone ssh://git@dvm-linux02:7999/ui/testsuites.git
 
 echo " ------------------------------ Starting the Squish Server"
-$SQUISH_DIR/bin/squishserver addAUT $BUID_DIR/denali --port=$SQUISH_SERVER_PORT 1>$REPORT/$LOGS/server.log 2>$REPORT/$LOGS/server.err &
+$SQUISH_DIR/bin/squishserver addAUT $BUID_DIR/denali --port=$SQUISH_SERVER_PORT 1>$REPORT/$LOG/server.log 2>$REPORT/$LOG/server.err &
 
 echo " ------------------------------ Starting tests"
 $SQUISH_DIR/bin/squishrunner addAUT $BUID_DIR/denali --testsuite testsuites --exitCodeOnFail 13	--reportgen html,$REPORT/UnitTest
 sleep 5
 
 echo " ------------------------------ Importing the excecution report into the coverage database"
-cmcsexeimport -m $BUID_DIR/denali.csmes -t UnitTest01 $BUID_DIR/denali.csexe 1>$REPORT/$LOGS/cmcsexeimport.log 2>$REPORT/$LOGS/cmcsexeimport.err
+cmcsexeimport -m $BUID_DIR/denali.csmes -t UnitTest01 $BUID_DIR/denali.csexe 1>$REPORT/$LOG/cmcsexeimport.log 2>$REPORT/$LOG/cmcsexeimport.err
 
 echo " ------------------------------ Generating the coverage report"
-cmreport --csmes=$BUID_DIR/denali.csmes --html=$REPORT/Coverage/index 1>$REPORT/$LOGS/cmreport.log 2>$REPORT/$LOGS/cmreport.err
+cmreport --csmes=$BUID_DIR/denali.csmes --html=$REPORT/Coverage/index 1>$REPORT/$LOG/cmreport.log 2>$REPORT/$LOG/cmreport.err
 
 echo " ------------------------------ Copy the reports to server"
 mkdir $REMOTE_DIR/$REPORT_DIR