Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "cleanup of obsolete non-CI arm PODs"
[releng.git]
/
jjb
/
apex
/
apex-deploy.sh
diff --git
a/jjb/apex/apex-deploy.sh
b/jjb/apex/apex-deploy.sh
index
2e00fae
..
ce9544b
100755
(executable)
--- a/
jjb/apex/apex-deploy.sh
+++ b/
jjb/apex/apex-deploy.sh
@@
-3,7
+3,6
@@
set -o errexit
set -o nounset
set -o pipefail
set -o nounset
set -o pipefail
-APEX_PKGS="common undercloud" # removed onos for danube
IPV6_FLAG=False
# log info to console
IPV6_FLAG=False
# log info to console
@@
-11,6
+10,8
@@
echo "Starting the Apex deployment."
echo "--------------------------------------------------------"
echo
echo "--------------------------------------------------------"
echo
+sudo rm -rf /tmp/tmp*
+
if [ -z "$DEPLOY_SCENARIO" ]; then
echo "Deploy scenario not set!"
exit 1
if [ -z "$DEPLOY_SCENARIO" ]; then
echo "Deploy scenario not set!"
exit 1
@@
-37,8
+38,11
@@
if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
DEPLOY_SETTINGS_DIR="${WORKSPACE}/config/deploy"
NETWORK_SETTINGS_DIR="${WORKSPACE}/config/network"
DEPLOY_CMD="${WORKSPACE}/ci/deploy.sh"
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"
RESOURCES="${WORKSPACE}/.build/"
CONFIG="${WORKSPACE}/build"
+ BASE=$CONFIG
+ IMAGES=$RESOURCES
LIB="${WORKSPACE}/lib"
# Ensure artifacts were downloaded and extracted correctly
LIB="${WORKSPACE}/lib"
# Ensure artifacts were downloaded and extracted correctly
@@
-48,10
+52,15
@@
else
DEPLOY_SETTINGS_DIR="/etc/opnfv-apex/"
NETWORK_SETTINGS_DIR="/etc/opnfv-apex/"
DEPLOY_CMD="opnfv-deploy"
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"
RESOURCES="/var/opt/opnfv/images"
CONFIG="/var/opt/opnfv"
+ BASE=$CONFIG
+ IMAGES=$RESOURCES
LIB="/var/opt/opnfv/lib"
LIB="/var/opt/opnfv/lib"
-
+ sudo mkdir -p /var/log/apex
+ sudo chmod 777 /var/log/apex
+ cd /var/log/apex
fi
# Install Dependencies
fi
# Install Dependencies
@@
-97,11
+106,7
@@
if [ "$OPNFV_CLEAN" == 'yes' ]; then
clean_opts=''
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
fi
if echo ${DEPLOY_SCENARIO} | grep ipv6; then
@@
-126,7
+131,7
@@
if [[ "$JOB_NAME" =~ "virtual" ]]; then
if [[ "$JOB_NAME" == *csit* ]]; then
DEPLOY_CMD="${DEPLOY_CMD} -e csit-environment.yaml"
fi
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
DEPLOY_CMD="${DEPLOY_CMD} --virtual-computes 2"
fi
else