set -o nounset
set -o pipefail
-APEX_PKGS="common undercloud" # removed onos for danube
+APEX_PKGS="common undercloud onos"
IPV6_FLAG=False
# log info to console
DEPLOY_SETTINGS_DIR="${WORKSPACE}/config/deploy"
NETWORK_SETTINGS_DIR="${WORKSPACE}/config/network"
DEPLOY_CMD="${WORKSPACE}/ci/deploy.sh"
+ CLEAN_CMD="${WORKSPACE}/ci/clean.sh"
RESOURCES="${WORKSPACE}/.build/"
CONFIG="${WORKSPACE}/build"
+ BASE=$CONFIG
+ IMAGES=$RESOURCES
LIB="${WORKSPACE}/lib"
# Ensure artifacts were downloaded and extracted correctly
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"
CONFIG="/var/opt/opnfv"
+ BASE=$CONFIG
+ IMAGES=$RESOURCES
LIB="/var/opt/opnfv/lib"
fi
clean_opts=''
fi
- if [[ "$ARTIFACT_VERSION" =~ "dev" ]]; then
- sudo CONFIG=${CONFIG} LIB=${LIB} ./clean.sh ${clean_opts}
- else
- sudo BASE=${BASE} LIB=${LIB} opnfv-clean ${clean_opts}
- fi
+ sudo BASE=${BASE} LIB=${LIB} ${CLEAN_CMD} ${clean_opts}
fi
if echo ${DEPLOY_SCENARIO} | grep ipv6; then
if [[ "$JOB_NAME" == *csit* ]]; then
DEPLOY_CMD="${DEPLOY_CMD} -e csit-environment.yaml"
fi
- if [[ "$JOB_NAME" == *promote* ]]; then
+ if [[ "$PROMOTE" == "True" ]]; then
DEPLOY_CMD="${DEPLOY_CMD} --virtual-computes 2"
fi
else