Commit 20db2d2f authored by Raphael Defosseux's avatar Raphael Defosseux

CI: Improvements:

 -- Added VM-build support for physical simulators
 -- More details in the reported HTML files
Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent 29ffb116
...@@ -8,7 +8,7 @@ pipeline { ...@@ -8,7 +8,7 @@ pipeline {
disableConcurrentBuilds() disableConcurrentBuilds()
timestamps() timestamps()
gitLabConnection('OAI GitLab') gitLabConnection('OAI GitLab')
gitlabBuilds(builds: ["Build eNb-USRP", "Build basic-sim"]) gitlabBuilds(builds: ["Build eNb-USRP", "Build basic-sim", "Build phy-sim"])
} }
stages { stages {
...@@ -63,6 +63,13 @@ pipeline { ...@@ -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 { post {
always { always {
......
...@@ -20,6 +20,7 @@ function usage { ...@@ -20,6 +20,7 @@ function usage {
echo "" echo ""
echo " --variant enb-usrp OR -v1" echo " --variant enb-usrp OR -v1"
echo " --variant basic-sim OR -v2" echo " --variant basic-sim OR -v2"
echo " --variant phy-sim OR -v3"
echo " Specify the variant to build" echo " Specify the variant to build"
echo "" echo ""
echo " --help OR -h" echo " --help OR -h"
...@@ -33,6 +34,7 @@ function variant_usage { ...@@ -33,6 +34,7 @@ function variant_usage {
echo "" echo ""
echo " --variant enb-usrp OR -v1" echo " --variant enb-usrp OR -v1"
echo " --variant basic-sim OR -v2" echo " --variant basic-sim OR -v2"
echo " --variant phy-sim OR -v3"
echo "" echo ""
} }
...@@ -84,6 +86,15 @@ case $key in ...@@ -84,6 +86,15 @@ case $key in
BUILD_EXTRA_OPTIONS="--cflags_processor \"-mssse3 -msse4.1 -mavx2\"" BUILD_EXTRA_OPTIONS="--cflags_processor \"-mssse3 -msse4.1 -mavx2\""
shift 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)
variant="$2" variant="$2"
case $variant in case $variant in
...@@ -103,6 +114,14 @@ case $key in ...@@ -103,6 +114,14 @@ case $key in
BUILD_OPTIONS="--basic-simulator" BUILD_OPTIONS="--basic-simulator"
BUILD_EXTRA_OPTIONS="--cflags_processor \"-mssse3 -msse4.1 -mavx2\"" 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 ""
echo "Syntax Error: Invalid Variant option -> $variant" echo "Syntax Error: Invalid Variant option -> $variant"
...@@ -230,4 +249,10 @@ done ...@@ -230,4 +249,10 @@ done
if [ $NB_PATTERN_FILES -ne $NB_FOUND_FILES ]; then STATUS=-1; fi 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 exit $STATUS
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment