diff --git a/ci-scripts/buildOnRH.sh b/ci-scripts/buildOnRH.sh index bb57cde165ed82b63e74cd774bbcf20a84e37223..dd3c38295183435defe5e99ae31d172b82e6e585 100755 --- a/ci-scripts/buildOnRH.sh +++ b/ci-scripts/buildOnRH.sh @@ -204,12 +204,13 @@ then STATUS=-1 fi +echo "COMMAND: build_oai -I -w USRP --eNB" > $ARCHIVES_LOC/build_final_status.log if [ $STATUS -eq 0 ] then - echo "BUILD_OK" > $ARCHIVES_LOC/build_final_status.log + echo "BUILD_OK" >> $ARCHIVES_LOC/build_final_status.log echo "STATUS seems OK" else - echo "BUILD_KO" > $ARCHIVES_LOC/build_final_status.log + echo "BUILD_KO" >> $ARCHIVES_LOC/build_final_status.log echo "STATUS failed?" fi exit $STATUS diff --git a/ci-scripts/reportBuildLocally.sh b/ci-scripts/reportBuildLocally.sh index 3e385fb810548b799017fe66a7512e01004cd7a6..d237cc652b98650abfd1b420603783b14034ca2f 100755 --- a/ci-scripts/reportBuildLocally.sh +++ b/ci-scripts/reportBuildLocally.sh @@ -143,13 +143,21 @@ function summary_table_header { echo " <h3>$1</h3>" >> ./build_results.html if [ -f $2/build_final_status.log ] then + if [ `grep -c COMMAND $2/build_final_status.log` -eq 1 ] + then + COMMAND=`grep COMMAND $2/build_final_status.log | sed -e "s#COMMAND: ##"` + else + COMMAND="Unknown" + fi if [ `grep -c BUILD_OK $2/build_final_status.log` -eq 1 ] then echo " <div class=\"alert alert-success\">" >> ./build_results.html + echo " <span class=\"glyphicon glyphicon-expand\"></span> $COMMAND <span class=\"glyphicon glyphicon-arrow-right\"></span> " >> ./build_results.html echo " <strong>BUILD was SUCCESSFUL <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./build_results.html echo " </div>" >> ./build_results.html else echo " <div class=\"alert alert-danger\">" >> ./build_results.html + echo " <span class=\"glyphicon glyphicon-expand\"></span> $COMMAND <span class=\"glyphicon glyphicon-arrow-right\"></span> " >> ./build_results.html echo " <strong>BUILD was a FAILURE! <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./build_results.html echo " </div>" >> ./build_results.html fi @@ -220,6 +228,13 @@ function sca_summary_table_header { NB_WARNINGS=`egrep -c "severity=\"warning\"" $1` ADDED_ERRORS="0" ADDED_WARNINGS="0" + FINAL_LOG=`echo $1 | sed -e "s#cppcheck\.xml#build_final_status.log#"` + if [ `grep -c COMMAND $FINAL_LOG` -eq 1 ] + then + COMMAND=`grep COMMAND $FINAL_LOG | sed -e "s#COMMAND: ##"` + else + COMMAND="Unknown" + fi if [ $MR_TRIG -eq 1 ] then if [ -d ../../cppcheck_archives ] @@ -237,12 +252,14 @@ function sca_summary_table_header { if [ $NB_ERRORS -eq 0 ] && [ $NB_WARNINGS -eq 0 ] then echo " <div class=\"alert alert-success\">" >> ./build_results.html + echo " <span class=\"glyphicon glyphicon-expand\"></span> $COMMAND <br><br>" >> ./build_results.html echo " <strong>CPPCHECK found NO error and NO warning <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./build_results.html echo " </div>" >> ./build_results.html else if [ $NB_ERRORS -eq 0 ] then echo " <div class=\"alert alert-warning\">" >> ./build_results.html + echo " <span class=\"glyphicon glyphicon-expand\"></span> $COMMAND <br><br>" >> ./build_results.html if [ $PU_TRIG -eq 1 ] then echo " <strong>CPPCHECK found NO error and $NB_WARNINGS warnings <span class=\"glyphicon glyphicon-warning-sign\"></span></strong>" >> ./build_results.html @@ -259,6 +276,7 @@ function sca_summary_table_header { echo " </div>" >> ./build_results.html else echo " <div class=\"alert alert-danger\">" >> ./build_results.html + echo " <span class=\"glyphicon glyphicon-expand\"></span> $COMMAND <br><br>" >> ./build_results.html if [ $PU_TRIG -eq 1 ] then echo " <strong>CPPCHECK found $NB_ERRORS errors and $NB_WARNINGS warnings <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./build_results.html diff --git a/ci-scripts/waitBuildOnVM.sh b/ci-scripts/waitBuildOnVM.sh index 2820b88647c907a58c223d82a865d8b476c57b0b..7e4504944fc1467c177d389c6d66a5baad5a5f3d 100755 --- a/ci-scripts/waitBuildOnVM.sh +++ b/ci-scripts/waitBuildOnVM.sh @@ -185,10 +185,16 @@ function check_on_vm_build { fi fi + if [[ "$VM_NAME" == *"-cppcheck"* ]] + then + echo "COMMAND: cppcheck $BUILD_OPTIONS . 2> cppcheck.xml" > $ARCHIVES_LOC/build_final_status.log + else + echo "COMMAND: build_oai -I $BUILD_OPTIONS" > $ARCHIVES_LOC/build_final_status.log + fi if [[ $STATUS -eq 0 ]] then - echo "BUILD_OK" > $ARCHIVES_LOC/build_final_status.log + echo "BUILD_OK" >> $ARCHIVES_LOC/build_final_status.log else - echo "BUILD_KO" > $ARCHIVES_LOC/build_final_status.log + echo "BUILD_KO" >> $ARCHIVES_LOC/build_final_status.log fi }