From 2ec61ea77ed4649c8721d1fa07e0c4365ca0c736 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Tue, 20 Aug 2019 16:43:23 +0200 Subject: [PATCH] CI: fixing CI test flexran ctrl + basic simulator Signed-off-by: Raphael Defosseux --- ci-scripts/buildOnVM.sh | 2 +- .../doc/vm_based_simulator_main_scripts.md | 18 +++++++++--------- ci-scripts/waitBuildOnVM.sh | 3 +++ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ci-scripts/buildOnVM.sh b/ci-scripts/buildOnVM.sh index 00562e561c..c6854357fe 100755 --- a/ci-scripts/buildOnVM.sh +++ b/ci-scripts/buildOnVM.sh @@ -179,7 +179,7 @@ function build_on_vm { echo "echo \"./tools/install_dependencies \"" >> $VM_CMDS echo "./tools/install_dependencies > cmake_targets/log/install-build.txt 2>&1" >> $VM_CMDS echo "echo \"$BUILD_OPTIONS \"" >> $VM_CMDS - echo "$BUILD_OPTIONS > cmake_targets/log/rt_controller.Rel14.txt 2>&1" >> $VM_CMDS + echo "$BUILD_OPTIONS > cmake_targets/log/rt_controller.Rel15.txt 2>&1" >> $VM_CMDS fi if [[ "$VM_NAME" != *"-cppcheck"* ]] && [[ "$VM_NAME" != *"-flexran-rtc"* ]] then diff --git a/ci-scripts/doc/vm_based_simulator_main_scripts.md b/ci-scripts/doc/vm_based_simulator_main_scripts.md index 092165b37c..000d89a1eb 100644 --- a/ci-scripts/doc/vm_based_simulator_main_scripts.md +++ b/ci-scripts/doc/vm_based_simulator_main_scripts.md @@ -83,43 +83,43 @@ You can get the list of variant specific variables specifying the variant argume VM_NAME=ci-flexran-rtc ARCHIVES_LOC=flexran VM_MEMORY=2048 VM_CPU=4 NB_PATTERN_FILES=1 BUILD_OPTIONS="cmake . && make -j2" - LOG_PATTERN=.Rel14.txt + LOG_PATTERN=.Rel15.txt --variant enb-usrp OR -v1 ( build and test ) VM_NAME=ci-enb-usrp ARCHIVES_LOC=enb_usrp VM_MEMORY=2048 VM_CPU=4 NB_PATTERN_FILES=9 BUILD_OPTIONS="--eNB -w USRP --mu" - LOG_PATTERN=.Rel14.txt + LOG_PATTERN=.Rel15.txt --variant l1-sim OR -v20 ( test ) VM_NAME=ci-l1-sim ARCHIVES_LOC=l1_sim VM_MEMORY=2048 VM_CPU=4 NB_PATTERN_FILES=9 BUILD_OPTIONS="" - LOG_PATTERN=.Rel14.txt + LOG_PATTERN=.Rel15.txt --variant rf-sim OR -v21 ( test ) VM_NAME=ci-rf-sim ARCHIVES_LOC=rf_sim VM_MEMORY=2048 VM_CPU=4 NB_PATTERN_FILES=9 BUILD_OPTIONS="" - LOG_PATTERN=.Rel14.txt + LOG_PATTERN=.Rel15.txt --variant l2-sim OR -v22 ( test ) VM_NAME=ci-l2-sim ARCHIVES_LOC=l2_sim VM_MEMORY=2048 VM_CPU=4 NB_PATTERN_FILES=9 BUILD_OPTIONS="" - LOG_PATTERN=.Rel14.txt + LOG_PATTERN=.Rel15.txt --variant basic-sim OR -v2 ( build and test ) VM_NAME=ci-basic-sim ARCHIVES_LOC=basic_sim VM_MEMORY=8192 VM_CPU=4 NB_PATTERN_FILES=13 BUILD_OPTIONS="--eNB --UE" - LOG_PATTERN=.Rel14.txt + LOG_PATTERN=.Rel15.txt --variant phy-sim OR -v3 ( build and test ) VM_NAME=ci-phy-sim ARCHIVES_LOC=phy_sim VM_MEMORY=2048 VM_CPU=4 NB_PATTERN_FILES=3 BUILD_OPTIONS="--phy_simulators" - LOG_PATTERN=.Rel14.txt + LOG_PATTERN=.Rel15.txt --variant cppcheck OR -v4 ( build and test ) VM_NAME=ci-cppcheck ARCHIVES_LOC=cppcheck @@ -131,13 +131,13 @@ You can get the list of variant specific variables specifying the variant argume VM_NAME=ci-enb-ethernet ARCHIVES_LOC=enb_eth VM_MEMORY=4096 VM_CPU=4 NB_PATTERN_FILES=8 BUILD_OPTIONS="--eNB" - LOG_PATTERN=.Rel14.txt + LOG_PATTERN=.Rel15.txt --variant ue-ethernet OR -v8 ( build and test ) VM_NAME=ci-ue-ethernet ARCHIVES_LOC=ue_eth VM_MEMORY=4096 VM_CPU=4 NB_PATTERN_FILES=12 BUILD_OPTIONS="--UE" - LOG_PATTERN=.Rel14.txt + LOG_PATTERN=.Rel15.txt ``` diff --git a/ci-scripts/waitBuildOnVM.sh b/ci-scripts/waitBuildOnVM.sh index 8c2e60bec5..9626e36551 100755 --- a/ci-scripts/waitBuildOnVM.sh +++ b/ci-scripts/waitBuildOnVM.sh @@ -168,6 +168,9 @@ function check_on_vm_build { if [[ "$VM_NAME" == *"-cppcheck"* ]] then echo "COMMAND: cppcheck $BUILD_OPTIONS . 2> cppcheck.xml" > $ARCHIVES_LOC/build_final_status.log + elif [[ "$VM_NAME" == *"-flexran-rtc"* ]] + then + echo "COMMAND: $BUILD_OPTIONS" > $ARCHIVES_LOC/build_final_status.log else echo "COMMAND: build_oai -I $BUILD_OPTIONS" > $ARCHIVES_LOC/build_final_status.log fi