CI: separating the OSA, non-OSA build variants from the test variants

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
This commit is contained in:
Raphael Defosseux
2019-03-29 16:41:11 +01:00
parent 92ca8a5e34
commit 802f4c6158
+17 -14
View File
@@ -34,14 +34,17 @@ function top_usage {
} }
function variant_usage { function variant_usage {
echo " # OpenAirInterface Build Variants"
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 " --variant phy-sim OR -v3"
echo " --variant cppcheck OR -v4" echo " --variant cppcheck OR -v4"
echo " --variant enb-ethernet OR -v7" echo " --variant enb-ethernet OR -v7"
echo " --variant ue-ethernet OR -v8" echo " --variant ue-ethernet OR -v8"
echo " --variant l2-sim OR -v9" echo " # non-OSA Build Variants"
echo " --variant flexran-rtc OR -v10" echo " --variant flexran-rtc OR -v10"
echo " # OpenAirInterface Test Variants"
echo " --variant l2-sim OR -v22"
} }
MY_DIR=$(dirname $(readlink -f $0)) MY_DIR=$(dirname $(readlink -f $0))
@@ -290,13 +293,6 @@ case $key in
NBARGS=$[$NBARGS+256] NBARGS=$[$NBARGS+256]
shift shift
;; ;;
-v9)
VM_NAME=ci-l2-sim
ARCHIVES_LOC=l2_sim
RUN_OPTIONS="complex"
NBARGS=$[$NBARGS+256]
shift
;;
-v10) -v10)
VM_NAME=ci-flexran-rtc VM_NAME=ci-flexran-rtc
ARCHIVES_LOC=flexran ARCHIVES_LOC=flexran
@@ -306,6 +302,13 @@ case $key in
NBARGS=$[$NBARGS+256] NBARGS=$[$NBARGS+256]
shift shift
;; ;;
-v22)
VM_NAME=ci-l2-sim
ARCHIVES_LOC=l2_sim
RUN_OPTIONS="complex"
NBARGS=$[$NBARGS+256]
shift
;;
--variant) --variant)
variant="$2" variant="$2"
case $variant in case $variant in
@@ -366,12 +369,6 @@ case $key in
BUILD_OPTIONS="--UE -t ETHERNET" BUILD_OPTIONS="--UE -t ETHERNET"
NBARGS=$[$NBARGS+256] NBARGS=$[$NBARGS+256]
;; ;;
l2-sim)
VM_NAME=ci-l2-sim
ARCHIVES_LOC=l2_sim
RUN_OPTIONS="complex"
NBARGS=$[$NBARGS+256]
;;
flexran-rtc) flexran-rtc)
VM_NAME=ci-flexran-rtc VM_NAME=ci-flexran-rtc
ARCHIVES_LOC=flexran ARCHIVES_LOC=flexran
@@ -380,6 +377,12 @@ case $key in
BUILD_OPTIONS="cmake . && make -j2" BUILD_OPTIONS="cmake . && make -j2"
NBARGS=$[$NBARGS+256] NBARGS=$[$NBARGS+256]
;; ;;
l2-sim)
VM_NAME=ci-l2-sim
ARCHIVES_LOC=l2_sim
RUN_OPTIONS="complex"
NBARGS=$[$NBARGS+256]
;;
*) *)
echo "" echo ""
echo "Syntax Error: Invalid Variant option -> $variant" echo "Syntax Error: Invalid Variant option -> $variant"