Merge "Initial add of VES job file"

[releng.git] / jjb / apex / apex-deploy.sh

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index b68225f..f2dc994 100755 (executable)
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -183,10 +183,15 @@ if [[ "$JOB_NAME" == *virtual* ]]; then
   # settings for virtual deployment
   if [ "$IPV6_FLAG" == "True" ]; then
     NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings_v6.yaml"
+  elif echo ${DEPLOY_SCENARIO} | grep fdio; then
+    NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings_vpp.yaml"
   else
     NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings.yaml"
   fi
   DEPLOY_CMD="${DEPLOY_CMD} -v"
+  if [[ "${DEPLOY_SCENARIO}" =~ fdio|ovs ]]; then
+    DEPLOY_CMD="${DEPLOY_CMD} --virtual-ram 14"
+  fi
   if [[ "$JOB_NAME" == *csit* ]]; then
     DEPLOY_CMD="${DEPLOY_CMD} -e csit-environment.yaml --virtual-computes 2"
   fi