diff --git a/ci-scripts/buildOnVM.sh b/ci-scripts/buildOnVM.sh index ba99436510dd8253f49004872f58d84792985d95..b07d34c9d0dce33ef380030fefa8e3dd29214fc5 100755 --- a/ci-scripts/buildOnVM.sh +++ b/ci-scripts/buildOnVM.sh @@ -65,6 +65,7 @@ VM_TEMPLATE=ci- JOB_NAME=XX BUILD_ID=XX VM_NAME=ci-enb-usrp +VM_MEMORY=2048 ARCHIVES_LOC=enb_usrp LOG_PATTERN=.Rel14.txt NB_PATTERN_FILES=4 @@ -126,6 +127,7 @@ case $key in ;; -v4) VM_NAME=ci-cppcheck + VM_MEMORY=4096 ARCHIVES_LOC=cppcheck LOG_PATTERN=cppcheck.xml NB_PATTERN_FILES=1 @@ -174,6 +176,7 @@ case $key in ;; cppcheck) VM_NAME=ci-cppcheck + VM_MEMORY=4096 ARCHIVES_LOC=cppcheck LOG_PATTERN=cppcheck.xml NB_PATTERN_FILES=1 @@ -247,7 +250,7 @@ then echo "############################################################" echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base" echo "############################################################" - uvt-kvm create $VM_NAME release=xenial --memory 2048 --cpu 4 --unsafe-caching --template ci-scripts/template-host.xml + uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu 4 --unsafe-caching --template ci-scripts/template-host.xml fi echo "Waiting for VM to be started" diff --git a/ci-scripts/createVM.sh b/ci-scripts/createVM.sh index 02d9523d676c033bc55c54e2c2d5a7fc662f98ed..51f597909f827a58b1c55dd00aa32c1e16ffb668 100755 --- a/ci-scripts/createVM.sh +++ b/ci-scripts/createVM.sh @@ -59,6 +59,7 @@ VM_TEMPLATE=ci- JOB_NAME=XX BUILD_ID=XX VM_NAME=ci-enb-usrp +VM_MEMORY=2048 while [[ $# -gt 0 ]] do @@ -94,6 +95,7 @@ case $key in ;; -v4) VM_NAME=ci-cppcheck + VM_MEMORY=4096 shift ;; -v7) @@ -118,6 +120,7 @@ case $key in ;; cppcheck) VM_NAME=ci-cppcheck + VM_MEMORY=4096 ;; enb-ethernet) VM_NAME=ci-enb-ethernet @@ -154,11 +157,12 @@ VM_NAME=`echo $VM_NAME | sed -e "s#ci-#$VM_TEMPLATE#"` VM_CMDS=${VM_NAME}_cmds.txt echo "VM_NAME = $VM_NAME" +echo "VM_MEMORY = $VM_MEMORY MBytes" echo "############################################################" echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base" echo "############################################################" -uvt-kvm create $VM_NAME release=xenial --memory 2048 --cpu 4 --unsafe-caching --template ci-scripts/template-host.xml +uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu 4 --unsafe-caching --template ci-scripts/template-host.xml echo "Waiting for VM to be started" uvt-kvm wait $VM_NAME --insecure