X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex-deploy.sh;h=441bf9059d30f30ff2bc5a8574145c5fbef3349b;hb=1c4cc0319e5b1c37b9221b776ea264cacf8f1478;hp=dfaf2a8b55801364a1fd947b4ca9153c451bb568;hpb=e9b2da6f4ea27f92e33516c49f79cfd8f8531da6;p=releng.git

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index dfaf2a8b5..441bf9059 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -4,6 +4,8 @@ set -o nounset
 set -o pipefail
 
 IPV6_FLAG=False
+ALLINONE_FLAG=False
+CSIT_ENV_FLAG=False
 
 # log info to console
 echo "Starting the Apex deployment."
@@ -99,12 +101,26 @@ if [ "$OPNFV_CLEAN" == 'yes' ]; then
   sudo ${CLEAN_CMD} ${clean_opts}
 fi
 
+# These are add-ons to regular scenarios where you can do like
+# os-nosdn-nofeature-noha-ipv6, or os-nosdn-nofeature-noha-allinone
 if echo ${DEPLOY_SCENARIO} | grep ipv6; then
   IPV6_FLAG=True
   DEPLOY_SCENARIO=$(echo ${DEPLOY_SCENARIO} |  sed 's/-ipv6//')
   echo "INFO: IPV6 Enabled"
 fi
 
+if echo ${DEPLOY_SCENARIO} | grep allinone; then
+  ALLINONE_FLAG=True
+  DEPLOY_SCENARIO=$(echo ${DEPLOY_SCENARIO} |  sed 's/-allinone//')
+  echo "INFO: All in one deployment detected"
+fi
+
+if echo ${DEPLOY_SCENARIO} | grep csit; then
+  CSIT_ENV_FLAG=True
+  DEPLOY_SCENARIO=$(echo ${DEPLOY_SCENARIO} |  sed 's/-csit//')
+  echo "INFO: CSIT env requested in deploy scenario"
+fi
+
 echo "Deploy Scenario set to ${DEPLOY_SCENARIO}"
 DEPLOY_FILE="${DEPLOY_SETTINGS_DIR}/${DEPLOY_SCENARIO}.yaml"
 
@@ -118,8 +134,19 @@ if [[ "$JOB_NAME" =~ "virtual" ]]; then
   if [[ "${DEPLOY_SCENARIO}" =~ fdio|ovs ]]; then
     DEPLOY_CMD="${DEPLOY_CMD} --virtual-default-ram 12 --virtual-compute-ram 7"
   fi
-  if [[ "$PROMOTE" == "True" ]]; then
-    DEPLOY_CMD="${DEPLOY_CMD} --virtual-computes 2 -e csit-environment.yaml"
+  if [[ "$ALLINONE_FLAG" == "True" ]]; then
+    DEPLOY_CMD="${DEPLOY_CMD} --virtual-computes 0"
+  elif [[ "$PROMOTE" == "True" ]]; then
+    DEPLOY_CMD="${DEPLOY_CMD} --virtual-computes 2"
+  fi
+
+  if [[ "$PROMOTE" == "True"  || "$CSIT_ENV_FLAG" == "True" ]]; then
+    if [[ "$DEPLOY_SCENARIO" =~ "queens" ]]; then
+      CSIT_ENV="csit-queens-environment.yaml"
+    else
+      CSIT_ENV="csit-environment.yaml"
+    fi
+    DEPLOY_CMD="${DEPLOY_CMD} -e ${CSIT_ENV}"
   fi
 else
   # settings for bare metal deployment
@@ -156,16 +183,6 @@ fi
 # start deployment
 sudo ${DEPLOY_CMD} -d ${DEPLOY_FILE} -n ${NETWORK_FILE} --debug
 
-if [[ "$PROMOTE" == 'True' ]]; then
-  echo "CSIT job: setting host route for floating ip routing"
-  # csit route to allow docker container to reach floating ips
-  UNDERCLOUD=$(sudo virsh domifaddr undercloud | grep -Eo "[0-9\.]+{3}[0-9]+")
-  if sudo route | grep 192.168.37.128 > /dev/null; then
-    sudo route del -net 192.168.37.128 netmask 255.255.255.128
-  fi
-  sudo route add -net 192.168.37.128 netmask 255.255.255.128 gw ${UNDERCLOUD}
-fi
-
 echo
 echo "--------------------------------------------------------"
 echo "Done!"