Commit c68d15d1 authored by frtabu's avatar frtabu

Merge branch 'issue407_nos1_siml1_datapath' of...

Merge branch 'issue407_nos1_siml1_datapath' of https://gitlab.eurecom.fr/oai/openairinterface5g into issue407_nos1_siml1_datapath
parents 753c2f44 f922c8d9
...@@ -69,7 +69,7 @@ VM_MEMORY=2048 ...@@ -69,7 +69,7 @@ VM_MEMORY=2048
VM_CPU=4 VM_CPU=4
ARCHIVES_LOC=enb_usrp ARCHIVES_LOC=enb_usrp
LOG_PATTERN=.Rel14.txt LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=4 NB_PATTERN_FILES=7
BUILD_OPTIONS="--eNB -w USRP" BUILD_OPTIONS="--eNB -w USRP"
KEEP_VM_ALIVE=0 KEEP_VM_ALIVE=0
RUN_OPTIONS="none" RUN_OPTIONS="none"
...@@ -231,7 +231,7 @@ case $key in ...@@ -231,7 +231,7 @@ case $key in
VM_NAME=ci-enb-usrp VM_NAME=ci-enb-usrp
ARCHIVES_LOC=enb_usrp ARCHIVES_LOC=enb_usrp
LOG_PATTERN=.Rel14.txt LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=6 NB_PATTERN_FILES=7
BUILD_OPTIONS="--eNB -w USRP --mu" BUILD_OPTIONS="--eNB -w USRP --mu"
NBARGS=$[$NBARGS+256] NBARGS=$[$NBARGS+256]
shift shift
...@@ -272,7 +272,7 @@ case $key in ...@@ -272,7 +272,7 @@ case $key in
VM_NAME=ci-enb-ethernet VM_NAME=ci-enb-ethernet
ARCHIVES_LOC=enb_eth ARCHIVES_LOC=enb_eth
LOG_PATTERN=.Rel14.txt LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=7 NB_PATTERN_FILES=8
BUILD_OPTIONS="--eNB -t ETHERNET --noS1" BUILD_OPTIONS="--eNB -t ETHERNET --noS1"
NBARGS=$[$NBARGS+256] NBARGS=$[$NBARGS+256]
shift shift
...@@ -281,7 +281,7 @@ case $key in ...@@ -281,7 +281,7 @@ case $key in
VM_NAME=ci-ue-ethernet VM_NAME=ci-ue-ethernet
ARCHIVES_LOC=ue_eth ARCHIVES_LOC=ue_eth
LOG_PATTERN=.Rel14.txt LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=7 NB_PATTERN_FILES=8
BUILD_OPTIONS="--UE -t ETHERNET --noS1" BUILD_OPTIONS="--UE -t ETHERNET --noS1"
NBARGS=$[$NBARGS+256] NBARGS=$[$NBARGS+256]
shift shift
...@@ -292,7 +292,7 @@ case $key in ...@@ -292,7 +292,7 @@ case $key in
VM_CPU=8 VM_CPU=8
ARCHIVES_LOC=l2_sim ARCHIVES_LOC=l2_sim
LOG_PATTERN=.Rel14.txt LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=7 NB_PATTERN_FILES=6
BUILD_OPTIONS="--eNB -t ETHERNET" BUILD_OPTIONS="--eNB -t ETHERNET"
RUN_OPTIONS="complex" RUN_OPTIONS="complex"
NBARGS=$[$NBARGS+256] NBARGS=$[$NBARGS+256]
...@@ -314,7 +314,7 @@ case $key in ...@@ -314,7 +314,7 @@ case $key in
VM_NAME=ci-enb-usrp VM_NAME=ci-enb-usrp
ARCHIVES_LOC=enb_usrp ARCHIVES_LOC=enb_usrp
LOG_PATTERN=.Rel14.txt LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=6 NB_PATTERN_FILES=7
BUILD_OPTIONS="--eNB -w USRP --mu" BUILD_OPTIONS="--eNB -w USRP --mu"
NBARGS=$[$NBARGS+256] NBARGS=$[$NBARGS+256]
;; ;;
...@@ -351,7 +351,7 @@ case $key in ...@@ -351,7 +351,7 @@ case $key in
VM_NAME=ci-enb-ethernet VM_NAME=ci-enb-ethernet
ARCHIVES_LOC=enb_eth ARCHIVES_LOC=enb_eth
LOG_PATTERN=.Rel14.txt LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=7 NB_PATTERN_FILES=8
BUILD_OPTIONS="--eNB -t ETHERNET --noS1" BUILD_OPTIONS="--eNB -t ETHERNET --noS1"
NBARGS=$[$NBARGS+256] NBARGS=$[$NBARGS+256]
;; ;;
...@@ -359,7 +359,7 @@ case $key in ...@@ -359,7 +359,7 @@ case $key in
VM_NAME=ci-ue-ethernet VM_NAME=ci-ue-ethernet
ARCHIVES_LOC=ue_eth ARCHIVES_LOC=ue_eth
LOG_PATTERN=.Rel14.txt LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=7 NB_PATTERN_FILES=8
BUILD_OPTIONS="--UE -t ETHERNET --noS1" BUILD_OPTIONS="--UE -t ETHERNET --noS1"
NBARGS=$[$NBARGS+256] NBARGS=$[$NBARGS+256]
;; ;;
...@@ -369,7 +369,7 @@ case $key in ...@@ -369,7 +369,7 @@ case $key in
VM_CPU=8 VM_CPU=8
ARCHIVES_LOC=l2_sim ARCHIVES_LOC=l2_sim
LOG_PATTERN=.Rel14.txt LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=5 NB_PATTERN_FILES=6
BUILD_OPTIONS="--eNB -t ETHERNET" BUILD_OPTIONS="--eNB -t ETHERNET"
RUN_OPTIONS="complex" RUN_OPTIONS="complex"
NBARGS=$[$NBARGS+256] NBARGS=$[$NBARGS+256]
......
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