[doctor] fix log cleaner and exclude joid testing

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

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 790d2a3..dc70488 100755 (executable)
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -62,7 +62,7 @@ fi
 if [ -z "$DEPLOY_SCENARIO" ]; then
   echo "Deploy scenario not set!"
   exit 1
-elif [ "$DEPLOY_SCENARIO" == *gate* ]; then
+elif [[ "$DEPLOY_SCENARIO" == *gate* ]]; then
   echo "Detecting Gating scenario..."
   if [ -z "$GERRIT_EVENT_COMMENT_TEXT" ]; then
     echo "ERROR: Gate job triggered without comment!"
@@ -183,6 +183,8 @@ 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