X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex-deploy.sh;h=9535e7fb7adb3a1d63a341e067b2b604f9b81bd4;hb=0ae37d142ae4ce27b6ae7d35b2ca7d48ba36475c;hp=c6cfb26d104e35456c1575a0c813c8bf5c9e474f;hpb=f0830fb30a41e6db542ce7c843c5819fcb205c9e;p=releng.git

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index c6cfb26d1..9535e7fb7 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -3,7 +3,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-APEX_PKGS="common undercloud opendaylight-sfc onos"
+APEX_PKGS="common undercloud onos"
 IPV6_FLAG=False
 
 # log info to console
@@ -15,7 +15,7 @@ if ! rpm -q wget > /dev/null; then
   sudo yum -y install wget
 fi
 
-if [[ $BUILD_DIRECTORY == *verify* ]]; then
+if [[ "$BUILD_DIRECTORY" == *verify* || "$BUILD_DIRECTORY" == *csit* ]]; then
     # Build is from a verify, use local build artifacts (not RPMs)
     cd $WORKSPACE/../${BUILD_DIRECTORY}
     WORKSPACE=$(pwd)
@@ -54,8 +54,8 @@ else
       fi
       # source the file so we get OPNFV vars
       source opnfv.properties
-      RPM_INSTALL_PATH=$(echo $OPNFV_RPM_URL | sed 's/'"$(basename $OPNFV_RPM_URL)"'//')
-      RPM_LIST=$RPM_INSTALL_PATH/$(basename $OPNFV_RPM_URL)
+      RPM_INSTALL_PATH=$(echo "http://"$OPNFV_RPM_URL | sed 's/\/'"$(basename $OPNFV_RPM_URL)"'//')
+      RPM_LIST=${RPM_INSTALL_PATH}/$(basename $OPNFV_RPM_URL)
     fi
 fi
 
@@ -64,15 +64,15 @@ if [ -z "$DEPLOY_SCENARIO" ]; then
   exit 1
 fi
 
-# use local build for verify
-if [[ "$BUILD_DIRECTORY" == *verify* ]]; then
+# use local build for verify and csit promote
+if [[ "$BUILD_DIRECTORY" == *verify* || "$BUILD_DIRECTORY" == *csit* ]]; then
     if [ ! -e "${WORKSPACE}/build/lib" ]; then
       ln -s ${WORKSPACE}/lib ${WORKSPACE}/build/lib
     fi
     DEPLOY_SETTINGS_DIR="${WORKSPACE}/config/deploy"
     NETWORK_SETTINGS_DIR="${WORKSPACE}/config/network"
     DEPLOY_CMD="$(pwd)/deploy.sh"
-    RESOURCES="${WORKSPACE}/build/images/"
+    RESOURCES="${WORKSPACE}/.build/"
     CONFIG="${WORKSPACE}/build"
     LIB="${WORKSPACE}/lib"
     # Make sure python34 deps are installed
@@ -139,10 +139,15 @@ fi
 DEPLOY_CMD="CONFIG=${CONFIG} RESOURCES=${RESOURCES} LIB=${LIB} ${DEPLOY_CMD}"
 
 if [ "$OPNFV_CLEAN" == 'yes' ]; then
-  if [[ "$BUILD_DIRECTORY" == *verify* ]]; then
-    sudo CONFIG=${CONFIG} LIB=${LIB} ./clean.sh
+  if sudo test -e '/root/inventory/pod_settings.yaml'; then
+    clean_opts='-i /root/inventory/pod_settings.yaml'
   else
-    sudo CONFIG=${CONFIG} LIB=${LIB} opnfv-clean
+    clean_opts=''
+  fi
+  if [[ "$BUILD_DIRECTORY" == *verify* || "$BUILD_DIRECTORY" == *csit* ]]; then
+    sudo CONFIG=${CONFIG} LIB=${LIB} ./clean.sh ${clean_opts}
+  else
+    sudo CONFIG=${CONFIG} LIB=${LIB} opnfv-clean ${clean_opts}
   fi
 fi
 
@@ -167,10 +172,15 @@ if [[ "$JOB_NAME" == *virtual* ]]; then
     NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings.yaml"
   fi
   DEPLOY_CMD="${DEPLOY_CMD} -v"
+  if [[ "$JOB_NAME" == *csit* ]]; then
+    DEPLOY_CMD="${DEPLOY_CMD} -e csit-environment.yaml --virtual-computes 2"
+  fi
 else
   # settings for bare metal deployment
   if [ "$IPV6_FLAG" == "True" ]; then
     NETWORK_FILE="/root/network/network_settings_v6.yaml"
+  elif [[ "$JOB_NAME" == *master* ]]; then
+    NETWORK_FILE="/root/network/network_settings-master.yaml"
   else
     NETWORK_FILE="/root/network/network_settings.yaml"
   fi