CI: proper disabling of 5g RF sim RA-TEST

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

ci-scripts/reportTestLocally.sh

@@ -768,54 +768,55 @@ function report_test {
 
                 #RA test (--do-ra option)
 
-                #build log files names
-                RA_ENB_LOG=$ARCHIVES_LOC/ra_check_${TMODE}_${BW}prb_${CN_CONFIG}_gnb.log
-                RA_UE_LOG=$ARCHIVES_LOC/ra_check_${TMODE}_${BW}prb_${CN_CONFIG}_ue.log
-                if [ -f $RA_ENB_LOG ] && [ -f $RA_UE_LOG ]
-                then
-                    #get rid of full path
-                    NAME_ENB=`echo $RA_ENB_LOG | sed -e "s#$ARCHIVES_LOC/##"`
-                    NAME_UE=`echo $RA_UE_LOG | sed -e "s#$ARCHIVES_LOC/##"`
-                    echo "      <tr>" >> ./test_simulator_results.html
-                    echo "        <td>$NAME_ENB --- $NAME_UE</td>" >> ./test_simulator_results.html
-                    echo "        <td>Check if RA proc succeeded</td>" >> ./test_simulator_results.html
-
-                    #gNB RA check
-                    GNB_RECEIVED=`egrep -c "received correctly" $RA_ENB_LOG`
-                    GNB_CONNECTED=`egrep -c "now 5G connected" $RA_ENB_LOG`
-                    #UE RA check
-                    UE_RA_PROC_OK=`egrep -c "RA procedure succeeded" $RA_UE_LOG`
-
-
-                    if [ $GNB_RECEIVED -gt 0 ] && [ $GNB_CONNECTED -gt 0 ] && [ $UE_RA_PROC_OK -gt 0 ]
-                    then
-                        echo "        <td bgcolor = \"green\" >OK</td>" >> ./test_simulator_results.html
-                    else
-                        echo "        <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
-                    fi
-
-                    echo "        <td><pre>" >> ./test_simulator_results.html
-                    if [ $GNB_RECEIVED -gt 0 ]
-                    then
-                        echo "<font color = \"blue\">- gNB --> RA received</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- gNB RA NOT RECEIVED</b></font>" >> ./test_simulator_results.html
-                    fi
-                    if [ $GNB_CONNECTED -gt 0 ]
-                    then
-                        echo "<font color = \"blue\">- gNB --> 5G connected</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- gNB NOT 5G CONNECTED</b></font>" >> ./test_simulator_results.html
-                    fi
-                    if [ $UE_RA_PROC_OK -gt 0 ]
-                    then
-                        echo "<font color = \"blue\">- NR UE  --> RA procedure succeded</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- NR UE RA procedure failed</b></font>" >> ./test_simulator_results.html
-                    fi
-                    echo "        </pre></td>" >> ./test_simulator_results.html
-                    echo "      </tr>" >> ./test_simulator_results.html
-                fi
+# Currently disabled
+#                #build log files names
+#                RA_ENB_LOG=$ARCHIVES_LOC/${TMODE}_${BW}prb_${CN_CONFIG}_gnb_ra_test.log
+#                RA_UE_LOG=$ARCHIVES_LOC/ra_check_${TMODE}_${BW}prb_${CN_CONFIG}_ue_ra_test.log
+#                if [ -f $RA_ENB_LOG ] && [ -f $RA_UE_LOG ]
+#                then
+#                    #get rid of full path
+#                    NAME_ENB=`echo $RA_ENB_LOG | sed -e "s#$ARCHIVES_LOC/##"`
+#                    NAME_UE=`echo $RA_UE_LOG | sed -e "s#$ARCHIVES_LOC/##"`
+#                    echo "      <tr>" >> ./test_simulator_results.html
+#                    echo "        <td>$NAME_ENB --- $NAME_UE</td>" >> ./test_simulator_results.html
+#                    echo "        <td>Check if RA proc succeeded</td>" >> ./test_simulator_results.html
+#
+#                    #gNB RA check
+#                    GNB_RECEIVED=`egrep -c "received correctly" $RA_ENB_LOG`
+#                    GNB_CONNECTED=`egrep -c "now 5G connected" $RA_ENB_LOG`
+#                    #UE RA check
+#                    UE_RA_PROC_OK=`egrep -c "RA procedure succeeded" $RA_UE_LOG`
+#
+#
+#                    if [ $GNB_RECEIVED -gt 0 ] && [ $GNB_CONNECTED -gt 0 ] && [ $UE_RA_PROC_OK -gt 0 ]
+#                    then
+#                        echo "        <td bgcolor = \"green\" >OK</td>" >> ./test_simulator_results.html
+#                    else
+#                        echo "        <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
+#                    fi
+#
+#                    echo "        <td><pre>" >> ./test_simulator_results.html
+#                    if [ $GNB_RECEIVED -gt 0 ]
+#                    then
+#                        echo "<font color = \"blue\">- gNB --> RA received</font>" >> ./test_simulator_results.html
+#                    else
+#                        echo "<font color = \"red\"><b>- gNB RA NOT RECEIVED</b></font>" >> ./test_simulator_results.html
+#                    fi
+#                    if [ $GNB_CONNECTED -gt 0 ]
+#                    then
+#                        echo "<font color = \"blue\">- gNB --> 5G connected</font>" >> ./test_simulator_results.html
+#                    else
+#                        echo "<font color = \"red\"><b>- gNB NOT 5G CONNECTED</b></font>" >> ./test_simulator_results.html
+#                    fi
+#                    if [ $UE_RA_PROC_OK -gt 0 ]
+#                    then
+#                        echo "<font color = \"blue\">- NR UE  --> RA procedure succeded</font>" >> ./test_simulator_results.html
+#                    else
+#                        echo "<font color = \"red\"><b>- NR UE RA procedure failed</b></font>" >> ./test_simulator_results.html
+#                    fi
+#                    echo "        </pre></td>" >> ./test_simulator_results.html
+#                    echo "      </tr>" >> ./test_simulator_results.html
+#                fi
 
                 #SYNC test
                 ENB_LOG=$ARCHIVES_LOC/${TMODE}_${BW}prb_${CN_CONFIG}_gnb.log

ci-scripts/runTestOnVM.sh

@@ -1318,8 +1318,11 @@ function start_rf_sim_nr_ue {
     echo "sudo apt-get --yes install daemon >> /home/ubuntu/tmp/cmake_targets/log/daemon-install.txt 2>&1" >> $1
     echo "echo \"cd /home/ubuntu/tmp/cmake_targets/ran_build/build/\"" >> $1
     echo "sudo chmod 777 /home/ubuntu/tmp/cmake_targets/ran_build/build/" >> $1
+    if [ $LOC_RA_TEST -eq 0 ] #no RA test => use --phy-test option
+    then
         echo "sudo cp /home/ubuntu/tmp/r*config.raw /home/ubuntu/tmp/cmake_targets/ran_build/build/" >> $1
         echo "sudo chmod 666 /home/ubuntu/tmp/cmake_targets/ran_build/build/r*config.raw" >> $1
+    fi
     echo "cd /home/ubuntu/tmp/cmake_targets/ran_build/build/" >> $1
     if [ $LOC_S1_CONFIGURATION -eq 0 ]
     then
@@ -2192,26 +2195,23 @@ function run_test_on_vm {
         local try_cnt="0"
         NR_STATUS=0
 
-        ######### start of loop
-        while [ $try_cnt -lt 4 ]
+        ######### start of RA TEST loop
+        while [ $try_cnt -lt 1 ]
         do
 
-            #start RA test
             SYNC_STATUS=0
-            PING_STATUS=0
-            IPERF_STATUS=0
 
             echo "############################################################"
             echo "${CN_CONFIG} : Starting the gNB"
             echo "############################################################"
-            CURRENT_GNB_LOG_FILE=tdd_${PRB}prb_${CN_CONFIG}_gnb.log
+            CURRENT_GNB_LOG_FILE=tdd_${PRB}prb_${CN_CONFIG}_gnb_ra_test.log
             #last argument = 1 is to enable --do-ra for RA test
             start_rf_sim_gnb $GNB_VM_CMDS "$GNB_VM_IP_ADDR" $CURRENT_GNB_LOG_FILE $PRB $CONF_FILE $S1_NOS1_CFG 1
 
             echo "############################################################"
             echo "${CN_CONFIG} : Starting the NR-UE"
             echo "############################################################"
-            CURRENT_NR_UE_LOG_FILE=tdd_${PRB}prb_${CN_CONFIG}_ue.log
+            CURRENT_NR_UE_LOG_FILE=tdd_${PRB}prb_${CN_CONFIG}_ue_ra_test.log
             #last argument = 1 is to enable --do-ra for RA test
             start_rf_sim_nr_ue $NR_UE_VM_CMDS $NR_UE_VM_IP_ADDR $GNB_VM_IP_ADDR $CURRENT_NR_UE_LOG_FILE $PRB $FREQUENCY $S1_NOS1_CFG 1
             if [ $NR_UE_SYNC -eq 0 ]
@@ -2240,15 +2240,19 @@ function run_test_on_vm {
             echo "${CN_CONFIG} : Checking RA on gNB / NR-UE"
             echo "############################################################"
 
-            mv $ARCHIVES_LOC/$CURRENT_GNB_LOG_FILE $ARCHIVES_LOC/ra_check_$CURRENT_GNB_LOG_FILE
-            mv $ARCHIVES_LOC/$CURRENT_NR_UE_LOG_FILE  $ARCHIVES_LOC/ra_check_$CURRENT_NR_UE_LOG_FILE
             # Proper check to be done when RA test is working!
-            #check_ra_result $ARCHIVES_LOC/ra_check_$CURRENT_GNB_LOG_FILE $ARCHIVES_LOC/ra_check_$CURRENT_NR_UE_LOG_FILE
+            #check_ra_result $ARCHIVES_LOC/$CURRENT_GNB_LOG_FILE $ARCHIVES_LOC/$CURRENT_NR_UE_LOG_FILE
 
+            try_cnt=$[$try_cnt+1]
 
-            #end RA test
-            sleep 30
+        ########### end RA test
+        done
+        sleep 10
+        try_cnt="0"
 
+        ######### start of PHY TEST loop
+        while [ $try_cnt -lt 4 ]
+        do
             SYNC_STATUS=0
             PING_STATUS=0
             IPERF_STATUS=0