diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0bb6d164ed6130099c5b357d08af848176991d4b..0931a928a02d7fdab22289325647813e336462fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,8 +32,8 @@ job1: - sshpass -p "$OAI_PASS" rsync -az -e "ssh -o StrictHostKeyChecking=no " --rsync-path="mkdir -p $NFS_TEST_RESULTS_DIR && rsync" $OPENAIR_DIR/cmake_targets/autotests/log $OAI_USER@localhost:$NFS_TEST_RESULTS_DIR - sshpass -p "$OAI_PASS" rsync -az -e "ssh -o StrictHostKeyChecking=no " --rsync-path="mkdir -p $EXTERNAL_SHARE_DIR && rsync" $OPENAIR_DIR/cmake_targets/autotests/log $OAI_USER@localhost:$EXTERNAL_SHARE_DIR - cat $OPENAIR_DIR/cmake_targets/autotests/log/results_autotests.xml - - exce_log=`egrep -i 'warning|error|critical|exception' $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest.log ` + - exce_log=`egrep -i 'warning|error|critical|exception' $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest.log |cat ` - if [ -n "$exce_log" ]; then echo -e "\e[31mThere are errors in $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest.log. Please check the logs\e[0m" ; fi - - exce_log=`egrep -i 'warning|error|critical|exception' $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest_cleanup.log ` + - exce_log=`egrep -i 'warning|error|critical|exception' $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest_cleanup.log |cat ` - if [ -n "$exce_log" ]; then echo -e "\e[31mThere are errors in $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest_cleanup.log. Please check the logs\e[0m" ; fi diff --git a/cmake_targets/autotests/run_exec_lte-softmodem_tests.py b/cmake_targets/autotests/run_exec_lte-softmodem_tests.py index f7b09598d182c57814904fe59a479c49eb8a0b8f..b25bc08427675a828ffc46edca332512bce57d9f 100755 --- a/cmake_targets/autotests/run_exec_lte-softmodem_tests.py +++ b/cmake_targets/autotests/run_exec_lte-softmodem_tests.py @@ -1009,14 +1009,14 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo , #If there is assertion, we mark the test case as failure as most likely eNB crashed cmd = "grep -ilr \"assertion\" " + logdir_local_testcase + " | cat " cmd_out = subprocess.check_output ([cmd], shell=True) - if not cmd_out: + if len(cmd_out) !=0 : run_result=0 run_result_string = ' RUN_'+str(run) + ' = FAIL(Assert)' #If there is thread busy error, we mark the test case as failure as most likely eNB crashed cmd = "grep -ilr \"thread busy\" " + logdir_local_testcase + " | cat " cmd_out = subprocess.check_output ([cmd], shell=True) - if not cmd_out: + if len(cmd_out) !=0: run_result=0 run_result_string = ' RUN_'+str(run) + ' = FAIL(Thread_Busy)'