if [ -z "$DEPLOY_SCENARIO" ]; then
echo "Deploy scenario not set!"
exit 1
-elif [[ "$DEPLOY_SCENARIO" == *gate* ]]; then
- echo "Detecting Gating scenario..."
- if [ -z "$GERRIT_EVENT_COMMENT_TEXT" ]; then
- echo "ERROR: Gate job triggered without comment!"
- exit 1
- else
- DEPLOY_SCENARIO=$(echo ${GERRIT_EVENT_COMMENT_TEXT} | grep start-gate-scenario | grep -Eo 'os-.*$')
- if [ -z "$DEPLOY_SCENARIO" ]; then
- echo "ERROR: Unable to detect scenario in Gerrit Comment!"
- echo "Format of comment to trigger gate should be 'start-gate-scenario: <scenario>'"
- exit 1
- else
- echo "Gate scenario detected: ${DEPLOY_SCENARIO}"
- fi
- fi
+else
+ echo "Deploy scenario: ${DEPLOY_SCENARIO}"
fi
# Dev or RPM/ISO build
# Settings for deploying from git workspace
DEPLOY_SETTINGS_DIR="${WORKSPACE}/config/deploy"
NETWORK_SETTINGS_DIR="${WORKSPACE}/config/network"
- DEPLOY_CMD="opnfv-deploy --image-dir ${WORKSPACE}/.build"
CLEAN_CMD="opnfv-clean"
- RESOURCES="${WORKSPACE}/.build/"
+ # if we are using master, then we are downloading/caching upstream images
+ # we want to use that built in mechanism to avoid re-downloading every job
+ # so we use a dedicated folder to hold the upstream cache
+ UPSTREAM_CACHE=$HOME/upstream_cache
+ if [ "$BRANCH" == 'master' ]; then
+ mkdir -p ${UPSTREAM_CACHE}
+ RESOURCES=$UPSTREAM_CACHE
+ else
+ RESOURCES="${WORKSPACE}/.build/"
+ fi
CONFIG="${WORKSPACE}/build"
BASE=$CONFIG
IMAGES=$RESOURCES
LIB="${WORKSPACE}/lib"
-
+ DEPLOY_CMD="opnfv-deploy --image-dir ${RESOURCES}"
# Ensure artifacts were downloaded and extracted correctly
# TODO(trozet) add verification here
else
DEPLOY_SETTINGS_DIR="/etc/opnfv-apex/"
NETWORK_SETTINGS_DIR="/etc/opnfv-apex/"
- DEPLOY_CMD="opnfv-deploy"
CLEAN_CMD="opnfv-clean"
- RESOURCES="/var/opt/opnfv/images"
+ # set to use different directory here because upon RPM removal this
+ # directory will be wiped in daily
+ UPSTREAM_CACHE=$HOME/upstream_cache
+ if [ "$BRANCH" == 'master' ]; then
+ mkdir -p ${UPSTREAM_CACHE}
+ RESOURCES=$UPSTREAM_CACHE
+ else
+ RESOURCES="/var/opt/opnfv/images"
+ fi
+ DEPLOY_CMD="opnfv-deploy --image-dir ${RESOURCES}"
CONFIG="/var/opt/opnfv"
BASE=$CONFIG
IMAGES=$RESOURCES
if [[ "${DEPLOY_SCENARIO}" =~ fdio|ovs ]]; then
DEPLOY_CMD="${DEPLOY_CMD} --virtual-default-ram 12 --virtual-compute-ram 7"
fi
- if [[ "$JOB_NAME" == *csit* ]]; then
- DEPLOY_CMD="${DEPLOY_CMD} -e csit-environment.yaml"
- fi
if [[ "$PROMOTE" == "True" ]]; then
- DEPLOY_CMD="${DEPLOY_CMD} --virtual-computes 2"
+ DEPLOY_CMD="${DEPLOY_CMD} --virtual-computes 2 -e csit-environment.yaml"
fi
else
# settings for bare metal deployment
DEPLOY_CMD="${DEPLOY_CMD} -i ${INVENTORY_FILE}"
fi
+if [[ "$BRANCH" == "master" ]]; then
+ echo "Upstream deployment detected"
+ DEPLOY_CMD="${DEPLOY_CMD} --upstream"
+fi
+
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"
+elif [[ "$PROMOTE" == "True" ]]; then
+ NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings_csit.yaml"
else
NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings.yaml"
fi
# start deployment
sudo ${DEPLOY_CMD} -d ${DEPLOY_FILE} -n ${NETWORK_FILE} --debug
-if [[ "$JOB_NAME" == *csit* ]]; then
+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]+")