CI: Adapting scripts to new Rel15 extension on log files

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

ci-scripts/buildOnRH.sh

@@ -179,7 +179,7 @@ echo "############################################################"
 echo "Checking build status" 
 echo "############################################################"
 
-LOG_PATTERN=.Rel14.txt
+LOG_PATTERN=.Rel15.txt
 NB_PATTERN_FILES=4
 
 LOG_FILES=`ls $ARCHIVES_LOC/*.txt`

ci-scripts/buildOnVM.sh

@@ -91,7 +91,7 @@ BUILD_ID=XX
 VM_NAME=ci-enb-usrp
 VM_MEMORY=2048
 ARCHIVES_LOC=enb_usrp
-LOG_PATTERN=.Rel14.txt
+LOG_PATTERN=.Rel15.txt
 NB_PATTERN_FILES=4
 BUILD_OPTIONS="--eNB -w USRP"
 KEEP_VM_ALIVE=0
@@ -128,7 +128,7 @@ case $key in
     -v1)
     VM_NAME=ci-enb-usrp
     ARCHIVES_LOC=enb_usrp
-    LOG_PATTERN=.Rel14.txt
+    LOG_PATTERN=.Rel15.txt
     NB_PATTERN_FILES=4
     BUILD_OPTIONS="--eNB -w USRP"
     shift
@@ -144,7 +144,7 @@ case $key in
     -v3)
     VM_NAME=ci-phy-sim
     ARCHIVES_LOC=phy_sim
-    LOG_PATTERN=.Rel14.txt
+    LOG_PATTERN=.Rel15.txt
     NB_PATTERN_FILES=3
     BUILD_OPTIONS="--phy_simulators"
     shift
@@ -161,7 +161,7 @@ case $key in
     -v5)
     VM_NAME=ci-gnb-usrp
     ARCHIVES_LOC=gnb_usrp
-    LOG_PATTERN=.Rel14.txt
+    LOG_PATTERN=.Rel15.txt
     NB_PATTERN_FILES=4
     BUILD_OPTIONS="--gNB -w USRP"
     shift
@@ -169,7 +169,7 @@ case $key in
     -v6)
     VM_NAME=ci-ue-nr-usrp
     ARCHIVES_LOC=nrue_usrp
-    LOG_PATTERN=.Rel14.txt
+    LOG_PATTERN=.Rel15.txt
     NB_PATTERN_FILES=4
     BUILD_OPTIONS="--nrUE -w USRP"
     shift
@@ -177,7 +177,7 @@ case $key in
     -v7)
     VM_NAME=ci-enb-ethernet
     ARCHIVES_LOC=enb_eth
-    LOG_PATTERN=.Rel14.txt
+    LOG_PATTERN=.Rel15.txt
     NB_PATTERN_FILES=6
     BUILD_OPTIONS="--eNB -t ETHERNET --noS1"
     shift
@@ -185,7 +185,7 @@ case $key in
     -v8)
     VM_NAME=ci-ue-ethernet
     ARCHIVES_LOC=ue_eth
-    LOG_PATTERN=.Rel14.txt
+    LOG_PATTERN=.Rel15.txt
     NB_PATTERN_FILES=6
     BUILD_OPTIONS="--UE -t ETHERNET --noS1"
     shift
@@ -196,7 +196,7 @@ case $key in
         enb-usrp)
         VM_NAME=ci-enb-usrp
         ARCHIVES_LOC=enb_usrp
-        LOG_PATTERN=.Rel14.txt
+        LOG_PATTERN=.Rel15.txt
         NB_PATTERN_FILES=4
         BUILD_OPTIONS="--eNB -w USRP"
         ;;
@@ -210,7 +210,7 @@ case $key in
         phy-sim)
         VM_NAME=ci-phy-sim
         ARCHIVES_LOC=phy_sim
-        LOG_PATTERN=.Rel14.txt
+        LOG_PATTERN=.Rel15.txt
         NB_PATTERN_FILES=3
         BUILD_OPTIONS="--phy_simulators"
         ;;
@@ -225,28 +225,28 @@ case $key in
         gnb-usrp)
         VM_NAME=ci-gnb-usrp
         ARCHIVES_LOC=gnb_usrp
-        LOG_PATTERN=.Rel14.txt
+        LOG_PATTERN=.Rel15.txt
         NB_PATTERN_FILES=4
         BUILD_OPTIONS="--gNB -w USRP"
         ;;
         nu-ue-usrp)
         VM_NAME=ci-ue-nr-usrp
         ARCHIVES_LOC=nrue_usrp
-        LOG_PATTERN=.Rel14.txt
+        LOG_PATTERN=.Rel15.txt
         NB_PATTERN_FILES=4
         BUILD_OPTIONS="--nrUE -w USRP"
         ;;
         enb-ethernet)
         VM_NAME=ci-enb-ethernet
         ARCHIVES_LOC=enb_eth
-        LOG_PATTERN=.Rel14.txt
+        LOG_PATTERN=.Rel15.txt
         NB_PATTERN_FILES=6
         BUILD_OPTIONS="--eNB -t ETHERNET --noS1"
         ;;
         ue-ethernet)
         VM_NAME=ci-ue-ethernet
         ARCHIVES_LOC=ue_eth
-        LOG_PATTERN=.Rel14.txt
+        LOG_PATTERN=.Rel15.txt
         NB_PATTERN_FILES=6
         BUILD_OPTIONS="--UE -t ETHERNET --noS1"
         ;;
@@ -396,7 +396,7 @@ do
     if [[ $FULLFILE == *"$LOG_PATTERN"* ]]
     then
         filename=$(basename -- "$FULLFILE")
-        if [ "$LOG_PATTERN" == ".Rel14.txt" ]
+        if [ "$LOG_PATTERN" == ".Rel15.txt" ]
         then
             PASS_PATTERN=`echo $filename | sed -e "s#$LOG_PATTERN##"`
         fi

ci-scripts/checkAddedWarnings.sh

@@ -110,7 +110,7 @@ MODIFIED_FILES=`git log $TARGET_INIT_COMMIT..$MERGE_COMMMIT --oneline --name-sta
 NB_WARNINGS_FILES=0
 
 # Retrieve list of warnings 
-LIST_WARNING_FILES=`egrep "error:|warning:" archives/*/*.Rel14.txt archives/*/basic_simulator_*txt | egrep -v "jobserver unavailable|Clock skew detected.|flexran.proto" | sed -e "s#^.*/home/ubuntu/tmp/##" -e "s#^.*/tmp/CI-eNB/##" -e "s#common/utils/.*/itti#common/utils/itti#" | awk -F ":" '{print $1}' | sort | uniq`
+LIST_WARNING_FILES=`egrep "error:|warning:" archives/*/*.Rel15.txt archives/*/basic_simulator_*txt | egrep -v "jobserver unavailable|Clock skew detected.|flexran.proto" | sed -e "s#^.*/home/ubuntu/tmp/##" -e "s#^.*/tmp/CI-eNB/##" -e "s#common/utils/.*/itti#common/utils/itti#" | awk -F ":" '{print $1}' | sort | uniq`
 
 echo ""
 echo "List of files that have been modified by the Merge Request AND"

ci-scripts/reportBuildLocally.sh

@@ -513,70 +513,70 @@ sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Expression depends on or
 sca_summary_table_footer ./archives/cppcheck/cppcheck.xml
 
 summary_table_header "OAI Build eNB -- USRP option"
-summary_table_row "LTE SoftModem - Release 14" ./archives/enb_usrp/lte-softmodem.Rel14.txt "Built target lte-softmodem" ./enb_usrp_row1.html
-summary_table_row "Coding - Release 14" ./archives/enb_usrp/coding.Rel14.txt "Built target coding" ./enb_usrp_row2.html
-summary_table_row "OAI USRP device if - Release 14" ./archives/enb_usrp/oai_usrpdevif.Rel14.txt "Built target oai_usrpdevif" ./enb_usrp_row3.html
-summary_table_row "Parameters Lib Config - Release 14" ./archives/enb_usrp/params_libconfig.Rel14.txt "Built target params_libconfig" ./enb_usrp_row4.html
+summary_table_row "LTE SoftModem - Release 15" ./archives/enb_usrp/lte-softmodem.Rel15.txt "Built target lte-softmodem" ./enb_usrp_row1.html
+summary_table_row "Coding - Release 15" ./archives/enb_usrp/coding.Rel15.txt "Built target coding" ./enb_usrp_row2.html
+summary_table_row "OAI USRP device if - Release 15" ./archives/enb_usrp/oai_usrpdevif.Rel15.txt "Built target oai_usrpdevif" ./enb_usrp_row3.html
+summary_table_row "Parameters Lib Config - Release 15" ./archives/enb_usrp/params_libconfig.Rel15.txt "Built target params_libconfig" ./enb_usrp_row4.html
 summary_table_footer
 
 summary_table_header "OAI Build basic simulator option"
-summary_table_row "Basic Simulator eNb - Release 14" ./archives/basic_sim/basic_simulator_enb.txt "Built target lte-softmodem" ./basic_sim_row1.html
-summary_table_row "Basic Simulator UE - Release 14" ./archives/basic_sim/basic_simulator_ue.txt "Built target lte-uesoftmodem" ./basic_sim_row2.html
-summary_table_row "Conf 2 UE data - Release 14" ./archives/basic_sim/conf2uedata.Rel14.txt "Built target conf2uedata" ./basic_sim_row3.html
+summary_table_row "Basic Simulator eNb - Release 15" ./archives/basic_sim/basic_simulator_enb.txt "Built target lte-softmodem" ./basic_sim_row1.html
+summary_table_row "Basic Simulator UE - Release 15" ./archives/basic_sim/basic_simulator_ue.txt "Built target lte-uesoftmodem" ./basic_sim_row2.html
+summary_table_row "Conf 2 UE data - Release 15" ./archives/basic_sim/conf2uedata.Rel15.txt "Built target conf2uedata" ./basic_sim_row3.html
 summary_table_footer
 
 summary_table_header "OAI Build Physical simulators option"
-summary_table_row "DL Simulator - Release 14" ./archives/phy_sim/dlsim.Rel14.txt "Built target dlsim" ./phy_sim_row1.html
-summary_table_row "UL Simulator - Release 14" ./archives/phy_sim/ulsim.Rel14.txt "Built target ulsim" ./phy_sim_row2.html
-summary_table_row "Coding - Release 14" ./archives/phy_sim/coding.Rel14.txt "Built target coding" ./phy_sim_row3.html
+summary_table_row "DL Simulator - Release 15" ./archives/phy_sim/dlsim.Rel15.txt "Built target dlsim" ./phy_sim_row1.html
+summary_table_row "UL Simulator - Release 15" ./archives/phy_sim/ulsim.Rel15.txt "Built target ulsim" ./phy_sim_row2.html
+summary_table_row "Coding - Release 15" ./archives/phy_sim/coding.Rel15.txt "Built target coding" ./phy_sim_row3.html
 summary_table_footer
 
 
-if [ -f archives/gnb_usrp/nr-softmodem.Rel14.txt ]
+if [ -f archives/gnb_usrp/nr-softmodem.Rel15.txt ]
 then
     summary_table_header "OAI Build gNB -- USRP option"
-    summary_table_row "LTE SoftModem - Release 15" ./archives/gnb_usrp/nr-softmodem.Rel14.txt "Built target nr-softmodem" ./gnb_usrp_row1.html
-    summary_table_row "Coding - Release 14" ./archives/gnb_usrp/coding.Rel14.txt "Built target coding" ./gnb_usrp_row2.html
-    summary_table_row "OAI USRP device if - Release 14" ./archives/gnb_usrp/oai_usrpdevif.Rel14.txt "Built target oai_usrpdevif" ./gnb_usrp_row3.html
-    summary_table_row "Parameters Lib Config - Release 14" ./archives/gnb_usrp/params_libconfig.Rel14.txt "Built target params_libconfig" ./gnb_usrp_row4.html
+    summary_table_row "LTE SoftModem - Release 15" ./archives/gnb_usrp/nr-softmodem.Rel15.txt "Built target nr-softmodem" ./gnb_usrp_row1.html
+    summary_table_row "Coding - Release 15" ./archives/gnb_usrp/coding.Rel15.txt "Built target coding" ./gnb_usrp_row2.html
+    summary_table_row "OAI USRP device if - Release 15" ./archives/gnb_usrp/oai_usrpdevif.Rel15.txt "Built target oai_usrpdevif" ./gnb_usrp_row3.html
+    summary_table_row "Parameters Lib Config - Release 15" ./archives/gnb_usrp/params_libconfig.Rel15.txt "Built target params_libconfig" ./gnb_usrp_row4.html
     summary_table_footer
 fi
 
-if [ -f archives/nrue_usrp/nr-uesoftmodem.Rel14.txt ]
+if [ -f archives/nrue_usrp/nr-uesoftmodem.Rel15.txt ]
 then
     summary_table_header "OAI Build 5G NR UE -- USRP option"
-    summary_table_row "UE SoftModem - Release 15" ./archives/nrue_usrp/nr-uesoftmodem.Rel14.txt "Built target nr-uesoftmodem" ./nrue_usrp_row1.html
-    summary_table_row "Coding - Release 14" ./archives/nrue_usrp/coding.Rel14.txt "Built target coding" ./nrue_usrp_row2.html
-    summary_table_row "OAI USRP device if - Release 14" ./archives/nrue_usrp/oai_usrpdevif.Rel14.txt "Built target oai_usrpdevif" ./nrue_usrp_row3.html
-    summary_table_row "Parameters Lib Config - Release 14" ./archives/nrue_usrp/params_libconfig.Rel14.txt "Built target params_libconfig" ./nrue_usrp_row4.html
+    summary_table_row "UE SoftModem - Release 15" ./archives/nrue_usrp/nr-uesoftmodem.Rel15.txt "Built target nr-uesoftmodem" ./nrue_usrp_row1.html
+    summary_table_row "Coding - Release 15" ./archives/nrue_usrp/coding.Rel15.txt "Built target coding" ./nrue_usrp_row2.html
+    summary_table_row "OAI USRP device if - Release 15" ./archives/nrue_usrp/oai_usrpdevif.Rel15.txt "Built target oai_usrpdevif" ./nrue_usrp_row3.html
+    summary_table_row "Parameters Lib Config - Release 15" ./archives/nrue_usrp/params_libconfig.Rel15.txt "Built target params_libconfig" ./nrue_usrp_row4.html
     summary_table_footer
 fi
 
 summary_table_header "OAI Build eNB -- ETHERNET transport option"
-summary_table_row "LTE SoftModem w/o S1 - Release 14" ./archives/enb_eth/lte-softmodem-nos1.Rel14.txt "Built target lte-softmodem" ./enb_eth_row1.html
-summary_table_row "Coding - Release 14" ./archives/enb_eth/coding.Rel14.txt "Built target coding" ./enb_eth_row2.html
-summary_table_row "OAI ETHERNET transport - Release 14" ./archives/enb_eth/oai_eth_transpro.Rel14.txt "Built target oai_eth_transpro" ./enb_eth_row3.html
-summary_table_row "Parameters Lib Config - Release 14" ./archives/enb_eth/params_libconfig.Rel14.txt "Built target params_libconfig" ./enb_eth_row4.html
-summary_table_row "RB Tools - Release 14" ./archives/enb_eth/rb_tool.Rel14.txt "Built target rb_tool" ./enb_eth_row5.html
-summary_table_row "NAS Mesh - Release 14" ./archives/enb_eth/nasmesh.Rel14.txt "Built target nasmesh" ./enb_eth_row6.html
+summary_table_row "LTE SoftModem w/o S1 - Release 15" ./archives/enb_eth/lte-softmodem-nos1.Rel15.txt "Built target lte-softmodem" ./enb_eth_row1.html
+summary_table_row "Coding - Release 15" ./archives/enb_eth/coding.Rel15.txt "Built target coding" ./enb_eth_row2.html
+summary_table_row "OAI ETHERNET transport - Release 15" ./archives/enb_eth/oai_eth_transpro.Rel15.txt "Built target oai_eth_transpro" ./enb_eth_row3.html
+summary_table_row "Parameters Lib Config - Release 15" ./archives/enb_eth/params_libconfig.Rel15.txt "Built target params_libconfig" ./enb_eth_row4.html
+summary_table_row "RB Tools - Release 15" ./archives/enb_eth/rb_tool.Rel15.txt "Built target rb_tool" ./enb_eth_row5.html
+summary_table_row "NAS Mesh - Release 15" ./archives/enb_eth/nasmesh.Rel15.txt "Built target nasmesh" ./enb_eth_row6.html
 summary_table_footer
 
 summary_table_header "OAI Build UE -- ETHERNET transport option"
-summary_table_row "LTE UE SoftModem w/o S1 - Release 14" ./archives/ue_eth/lte-uesoftmodem-nos1.Rel14.txt "Built target lte-uesoftmodem" ./ue_eth_row1.html
-summary_table_row "Coding - Release 14" ./archives/ue_eth/coding.Rel14.txt "Built target coding" ./ue_eth_row2.html
-summary_table_row "OAI ETHERNET transport - Release 14" ./archives/ue_eth/oai_eth_transpro.Rel14.txt "Built target oai_eth_transpro" ./ue_eth_row3.html
-summary_table_row "Parameters Lib Config - Release 14" ./archives/ue_eth/params_libconfig.Rel14.txt "Built target params_libconfig" ./ue_eth_row4.html
-summary_table_row "RB Tools - Release 14" ./archives/ue_eth/rb_tool.Rel14.txt "Built target rb_tool" ./ue_eth_row5.html
-summary_table_row "NAS Mesh - Release 14" ./archives/ue_eth/nasmesh.Rel14.txt "Built target nasmesh" ./ue_eth_row6.html
+summary_table_row "LTE UE SoftModem w/o S1 - Release 15" ./archives/ue_eth/lte-uesoftmodem-nos1.Rel15.txt "Built target lte-uesoftmodem" ./ue_eth_row1.html
+summary_table_row "Coding - Release 15" ./archives/ue_eth/coding.Rel15.txt "Built target coding" ./ue_eth_row2.html
+summary_table_row "OAI ETHERNET transport - Release 15" ./archives/ue_eth/oai_eth_transpro.Rel15.txt "Built target oai_eth_transpro" ./ue_eth_row3.html
+summary_table_row "Parameters Lib Config - Release 15" ./archives/ue_eth/params_libconfig.Rel15.txt "Built target params_libconfig" ./ue_eth_row4.html
+summary_table_row "RB Tools - Release 15" ./archives/ue_eth/rb_tool.Rel15.txt "Built target rb_tool" ./ue_eth_row5.html
+summary_table_row "NAS Mesh - Release 15" ./archives/ue_eth/nasmesh.Rel15.txt "Built target nasmesh" ./ue_eth_row6.html
 summary_table_footer
 
 echo "   <h2>Red Hat (CentOS Linux release 7.4.1708) -- Summary</h2>" >> ./build_results.html
 
 summary_table_header "Red Hat -- OAI Build eNB -- USRP option"
-summary_table_row "LTE SoftModem - Release 14" ./archives/red_hat/lte-softmodem.Rel14.txt "Built target lte-softmodem" ./enb_usrp_rh_row1.html
-summary_table_row "Coding - Release 14" ./archives/red_hat/coding.Rel14.txt "Built target coding" ./enb_usrp_rh_row2.html
-summary_table_row "OAI USRP device if - Release 14" ./archives/red_hat/oai_usrpdevif.Rel14.txt "Built target oai_usrpdevif" ./enb_usrp_rh_row3.html
-summary_table_row "Parameters Lib Config - Release 14" ./archives/red_hat/params_libconfig.Rel14.txt "Built target params_libconfig" ./enb_usrp_rh_row4.html
+summary_table_row "LTE SoftModem - Release 15" ./archives/red_hat/lte-softmodem.Rel15.txt "Built target lte-softmodem" ./enb_usrp_rh_row1.html
+summary_table_row "Coding - Release 15" ./archives/red_hat/coding.Rel15.txt "Built target coding" ./enb_usrp_rh_row2.html
+summary_table_row "OAI USRP device if - Release 15" ./archives/red_hat/oai_usrpdevif.Rel15.txt "Built target oai_usrpdevif" ./enb_usrp_rh_row3.html
+summary_table_row "Parameters Lib Config - Release 15" ./archives/red_hat/params_libconfig.Rel15.txt "Built target params_libconfig" ./enb_usrp_rh_row4.html
 summary_table_footer
 
 echo "   <h3>Details</h3>" >> ./build_results.html