diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab
index 0c3fb6bcb9b3ffc59d065efa2433da245bec552c..2021e8347f027d059f88a8b5db0951da48907159 100644
--- a/ci-scripts/Jenkinsfile-gitlab
+++ b/ci-scripts/Jenkinsfile-gitlab
@@ -8,7 +8,7 @@ pipeline {
disableConcurrentBuilds()
timestamps()
gitLabConnection('OAI GitLab')
- gitlabBuilds(builds: ["Build eNb-USRP", "Build basic-sim"])
+ gitlabBuilds(builds: ["Build eNb-USRP", "Build basic-sim", "Build phy-sim"])
}
stages {
@@ -63,6 +63,13 @@ pipeline {
}
}
}
+ stage ("Build physical simulators") {
+ steps {
+ gitlabCommitStatus(name: "Build phy-sim") {
+ sh "./ci-scripts/buildOnVM.sh --workspace $WORKSPACE --variant phy-sim"
+ }
+ }
+ }
}
post {
always {
diff --git a/ci-scripts/buildOnVM.sh b/ci-scripts/buildOnVM.sh
index dbb946ac1dafc51bdfc34b5c31315bc8e172fb0a..d34fb9a6c4d4186bd292d0505980ae6388623bbf 100755
--- a/ci-scripts/buildOnVM.sh
+++ b/ci-scripts/buildOnVM.sh
@@ -20,6 +20,7 @@ function usage {
echo ""
echo " --variant enb-usrp OR -v1"
echo " --variant basic-sim OR -v2"
+ echo " --variant phy-sim OR -v3"
echo " Specify the variant to build"
echo ""
echo " --help OR -h"
@@ -33,6 +34,7 @@ function variant_usage {
echo ""
echo " --variant enb-usrp OR -v1"
echo " --variant basic-sim OR -v2"
+ echo " --variant phy-sim OR -v3"
echo ""
}
@@ -84,6 +86,15 @@ case $key in
BUILD_EXTRA_OPTIONS="--cflags_processor \"-mssse3 -msse4.1 -mavx2\""
shift
;;
+ -v3)
+ VM_NAME=ci-phy-sim
+ ARCHIVES_LOC=phy_sim
+ LOG_PATTERN=.Rel14.txt
+ NB_PATTERN_FILES=3
+ BUILD_OPTIONS="--phy_simulators"
+ BUILD_EXTRA_OPTIONS="--cflags_processor \"-mssse3 -msse4.1 -mavx2\""
+ shift
+ ;;
--variant)
variant="$2"
case $variant in
@@ -103,6 +114,14 @@ case $key in
BUILD_OPTIONS="--basic-simulator"
BUILD_EXTRA_OPTIONS="--cflags_processor \"-mssse3 -msse4.1 -mavx2\""
;;
+ phy-sim)
+ VM_NAME=ci-phy-sim
+ ARCHIVES_LOC=phy_sim
+ LOG_PATTERN=.Rel14.txt
+ NB_PATTERN_FILES=3
+ BUILD_OPTIONS="--phy_simulators"
+ BUILD_EXTRA_OPTIONS="--cflags_processor \"-mssse3 -msse4.1 -mavx2\""
+ ;;
*)
echo ""
echo "Syntax Error: Invalid Variant option -> $variant"
@@ -230,4 +249,10 @@ done
if [ $NB_PATTERN_FILES -ne $NB_FOUND_FILES ]; then STATUS=-1; fi
+if [ $STATUS -eq 0 ]
+then
+ echo "STATUS seems OK"
+else
+ echo "STATUS failed?"
+fi
exit $STATUS
diff --git a/ci-scripts/reportBuildLocally.sh b/ci-scripts/reportBuildLocally.sh
index 55e17545933aa1455848866376f6c92fa3ebd3d7..bfa5b258c267154b7e9ec09f1f393ae2341c7888 100755
--- a/ci-scripts/reportBuildLocally.sh
+++ b/ci-scripts/reportBuildLocally.sh
@@ -68,6 +68,113 @@ function trigger_usage {
echo ""
}
+function details_table {
+ echo "
" >> ./build_results.html
+ echo " " >> ./build_results.html
+ echo " Element | " >> ./build_results.html
+ echo " Status | " >> ./build_results.html
+ echo " Nb Errors | " >> ./build_results.html
+ echo " Nb Warnings | " >> ./build_results.html
+ echo "
" >> ./build_results.html
+}
+
+function summary_table_row {
+ echo " " >> ./build_results.html
+ echo " $1" >> ./build_results.html
+ if [ -f $2 ]
+ then
+ STATUS=`egrep -c "$3" $2`
+ if [ $STATUS -eq 1 ]
+ then
+ echo " | OK" >> ./build_results.html
+ else
+ echo " | KO" >> ./build_results.html
+ fi
+ NB_ERRORS=`egrep -c "error:" $2`
+ if [ $NB_ERRORS -eq 0 ]
+ then
+ echo " | $NB_ERRORS" >> ./build_results.html
+ else
+ echo " | $NB_ERRORS" >> ./build_results.html
+ fi
+ NB_WARNINGS=`egrep "warning:" $2 | egrep -v "jobserver unavailable|Clock skew detected.|flexran.proto" | egrep -c "warning:"`
+ if [ $NB_WARNINGS -eq 0 ]
+ then
+ echo " | $NB_WARNINGS" >> ./build_results.html
+ else
+ if [ $NB_WARNINGS -gt 20 ]
+ then
+ echo " | $NB_WARNINGS" >> ./build_results.html
+ else
+ echo " | $NB_WARNINGS" >> ./build_results.html
+ fi
+ fi
+ if [ $NB_ERRORS -ne 0 ] || [ $NB_WARNINGS -ne 0 ]
+ then
+ details_table "$1" $2 $4
+ fi
+ else
+ echo " | Unknown" >> ./build_results.html
+ echo " | --" >> ./build_results.html
+ echo " | --" >> ./build_results.html
+ fi
+ echo " |
" >> ./build_results.html
+}
+
+function summary_table_footer {
+ echo "
" >> ./build_results.html
+}
+
jb_checker=0
mr_checker=0
pu_checker=0
@@ -289,245 +396,40 @@ then
echo " " >> ./build_results.html
fi
-echo " " >> ./build_results.html
-echo " " >> ./build_results.html
-echo " Element | " >> ./build_results.html
-echo " Status | " >> ./build_results.html
-echo " Nb Errors | " >> ./build_results.html
-echo " Nb Warnings | " >> ./build_results.html
-echo "
" >> ./build_results.html
-echo " " >> ./build_results.html
-echo " LTE SoftModem - Release 14" >> ./build_results.html
-if [ -f ./archives/enb_usrp/lte-softmodem.Rel14.txt ]
-then
- STATUS=`egrep -c "Built target lte-softmodem" ./archives/enb_usrp/lte-softmodem.Rel14.txt`
- if [ $STATUS -eq 1 ]
- then
- echo " | OK" >> ./build_results.html
- else
- echo " | KO" >> ./build_results.html
- fi
- STATUS=`egrep -c "error:" ./archives/enb_usrp/lte-softmodem.Rel14.txt`
- if [ $STATUS -eq 0 ]
- then
- echo " | $STATUS" >> ./build_results.html
- else
- echo " | $STATUS" >> ./build_results.html
- fi
- STATUS=`egrep "warning:" ./archives/enb_usrp/lte-softmodem.Rel14.txt | egrep -v "Clock skew detected.|flexran.proto" | egrep -c "warning:"`
- if [ $STATUS -eq 0 ]
- then
- echo " | $STATUS" >> ./build_results.html
- else
- echo " | $STATUS" >> ./build_results.html
- fi
-else
- echo " | Unknown" >> ./build_results.html
- echo " | --" >> ./build_results.html
- echo " | --" >> ./build_results.html
-fi
-echo " |
" >> ./build_results.html
-echo " " >> ./build_results.html
-echo " Coding - Release 14" >> ./build_results.html
-if [ -f ./archives/enb_usrp/coding.Rel14.txt ]
-then
- STATUS=`egrep -c "Built target coding" ./archives/enb_usrp/coding.Rel14.txt`
- if [ $STATUS -eq 1 ]
- then
- echo " | OK" >> ./build_results.html
- else
- echo " | KO" >> ./build_results.html
- fi
- STATUS=`egrep -c "error:" ./archives/enb_usrp/coding.Rel14.txt`
- if [ $STATUS -eq 0 ]
- then
- echo " | $STATUS" >> ./build_results.html
- else
- echo " | $STATUS" >> ./build_results.html
- fi
- STATUS=`egrep "warning:" ./archives/enb_usrp/coding.Rel14.txt | egrep -v "Clock skew detected.|flexran.proto" | egrep -c "warning:"`
- if [ $STATUS -eq 0 ]
- then
- echo " | $STATUS" >> ./build_results.html
- else
- echo " | $STATUS" >> ./build_results.html
- fi
-else
- echo " | Unknown" >> ./build_results.html
- echo " | --" >> ./build_results.html
- echo " | --" >> ./build_results.html
-fi
-echo " |
" >> ./build_results.html
-echo " " >> ./build_results.html
-echo " OAI USRP device if - Release 14" >> ./build_results.html
-if [ -f ./archives/enb_usrp/oai_usrpdevif.Rel14.txt ]
-then
- STATUS=`egrep -c "Built target oai_usrpdevif" ./archives/enb_usrp/oai_usrpdevif.Rel14.txt`
- if [ $STATUS -eq 1 ]
- then
- echo " | OK" >> ./build_results.html
- else
- echo " | KO" >> ./build_results.html
- fi
- STATUS=`egrep -c "error:" ./archives/enb_usrp/oai_usrpdevif.Rel14.txt`
- if [ $STATUS -eq 0 ]
- then
- echo " | $STATUS" >> ./build_results.html
- else
- echo " | $STATUS" >> ./build_results.html
- fi
- STATUS=`egrep "warning:" ./archives/enb_usrp/oai_usrpdevif.Rel14.txt | egrep -v "Clock skew detected.|flexran.proto" | egrep -c "warning:"`
- if [ $STATUS -eq 0 ]
- then
- echo " | $STATUS" >> ./build_results.html
- else
- echo " | $STATUS" >> ./build_results.html
- fi
-else
- echo " | Unknown" >> ./build_results.html
- echo " | --" >> ./build_results.html
- echo " | --" >> ./build_results.html
-fi
-echo " |
" >> ./build_results.html
-echo " " >> ./build_results.html
-echo " Parameters Lib Config - Release 14" >> ./build_results.html
-if [ -f ./archives/enb_usrp/params_libconfig.Rel14.txt ]
-then
- STATUS=`egrep -c "Built target params_libconfig" ./archives/enb_usrp/params_libconfig.Rel14.txt`
- if [ $STATUS -eq 1 ]
- then
- echo " | OK" >> ./build_results.html
- else
- echo " | KO" >> ./build_results.html
- fi
- STATUS=`egrep -c "error:" ./archives/enb_usrp/params_libconfig.Rel14.txt`
- if [ $STATUS -eq 0 ]
- then
- echo " | $STATUS" >> ./build_results.html
- else
- echo " | $STATUS" >> ./build_results.html
- fi
- STATUS=`egrep "warning:" ./archives/enb_usrp/params_libconfig.Rel14.txt | egrep -v "Clock skew detected.|flexran.proto" | egrep -c "warning:"`
- if [ $STATUS -eq 0 ]
- then
- echo " | $STATUS" >> ./build_results.html
- else
- echo " | $STATUS" >> ./build_results.html
- fi
-else
- echo " | Unknown" >> ./build_results.html
- echo " | --" >> ./build_results.html
- echo " | --" >> ./build_results.html
-fi
-echo " |
" >> ./build_results.html
-echo "
" >> ./build_results.html
+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_footer
-# conf2uedata.Rel14.txt
-# archives/basic_sim
+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_footer
-echo " " >> ./build_results.html
-echo " " >> ./build_results.html
-echo " Element | " >> ./build_results.html
-echo " Status | " >> ./build_results.html
-echo " Nb Errors | " >> ./build_results.html
-echo " Nb Warnings | " >> ./build_results.html
-echo "
" >> ./build_results.html
-echo " " >> ./build_results.html
-echo " Basic Simulator eNb - Release 14" >> ./build_results.html
-if [ -f ./archives/basic_sim/basic_simulator_enb.txt ]
-then
- STATUS=`egrep -c "Built target lte-softmodem" ./archives/basic_sim/basic_simulator_enb.txt`
- if [ $STATUS -eq 1 ]
- then
- echo " | OK" >> ./build_results.html
- else
- echo " | KO" >> ./build_results.html
- fi
- STATUS=`egrep -c "error:" ./archives/basic_sim/basic_simulator_enb.txt`
- if [ $STATUS -eq 0 ]
- then
- echo " | $STATUS" >> ./build_results.html
- else
- echo " | $STATUS" >> ./build_results.html
- fi
- STATUS=`egrep "warning:" ./archives/basic_sim/basic_simulator_enb.txt | egrep -v "Clock skew detected.|flexran.proto" | egrep -c "warning:"`
- if [ $STATUS -eq 0 ]
- then
- echo " | $STATUS" >> ./build_results.html
- else
- echo " | $STATUS" >> ./build_results.html
- fi
-else
- echo " | Unknown" >> ./build_results.html
- echo " | --" >> ./build_results.html
- echo " | --" >> ./build_results.html
-fi
-echo " |
" >> ./build_results.html
-echo " " >> ./build_results.html
-echo " Basic Simulator UE - Release 14" >> ./build_results.html
-if [ -f ./archives/basic_sim/basic_simulator_ue.txt ]
-then
- STATUS=`egrep -c "Built target lte-uesoftmodem" ./archives/basic_sim/basic_simulator_ue.txt`
- if [ $STATUS -eq 1 ]
- then
- echo " | OK" >> ./build_results.html
- else
- echo " | KO" >> ./build_results.html
- fi
- STATUS=`egrep -c "error:" ./archives/basic_sim/basic_simulator_ue.txt`
- if [ $STATUS -eq 0 ]
- then
- echo " | $STATUS" >> ./build_results.html
- else
- echo " | $STATUS" >> ./build_results.html
- fi
- STATUS=`egrep "warning:" ./archives/basic_sim/basic_simulator_ue.txt | egrep -v "Clock skew detected.|flexran.proto" | egrep -c "warning:"`
- if [ $STATUS -eq 0 ]
- then
- echo " | $STATUS" >> ./build_results.html
- else
- echo " | $STATUS" >> ./build_results.html
- fi
-else
- echo " | Unknown" >> ./build_results.html
- echo " | --" >> ./build_results.html
- echo " | --" >> ./build_results.html
-fi
-echo " |
" >> ./build_results.html
-echo " " >> ./build_results.html
-echo " Conf 2 UE data - Release 14" >> ./build_results.html
-if [ -f ./archives/basic_sim/conf2uedata.Rel14.txt ]
-then
- STATUS=`egrep -c "Built target conf2uedata" ./archives/basic_sim/conf2uedata.Rel14.txt`
- if [ $STATUS -eq 1 ]
- then
- echo " | OK" >> ./build_results.html
- else
- echo " | KO" >> ./build_results.html
- fi
- STATUS=`egrep -c "error:" ./archives/basic_sim/conf2uedata.Rel14.txt`
- if [ $STATUS -eq 0 ]
- then
- echo " | $STATUS" >> ./build_results.html
- else
- echo " | $STATUS" >> ./build_results.html
- fi
- STATUS=`egrep "warning:" ./archives/basic_sim/conf2uedata.Rel14.txt | egrep -v "Clock skew detected.|flexran.proto" | egrep -c "warning:"`
- if [ $STATUS -eq 0 ]
- then
- echo " | $STATUS" >> ./build_results.html
- else
- echo " | $STATUS" >> ./build_results.html
- fi
-else
- echo " | Unknown" >> ./build_results.html
- echo " | --" >> ./build_results.html
- echo " | --" >> ./build_results.html
-fi
-echo " |
" >> ./build_results.html
-echo "
" >> ./build_results.html
+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_footer
+
+echo "