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 "add filter based on begin&end time of start_date"
[releng.git]
/
jjb
/
compass4nfv
/
compass-deploy.sh
diff --git
a/jjb/compass4nfv/compass-deploy.sh
b/jjb/compass4nfv/compass-deploy.sh
index
6696e4b
..
2668ccd
100644
(file)
--- a/
jjb/compass4nfv/compass-deploy.sh
+++ b/
jjb/compass4nfv/compass-deploy.sh
@@
-23,7
+23,11
@@
fi
echo 1 > /proc/sys/vm/drop_caches
export CONFDIR=$WORKSPACE/deploy/conf
echo 1 > /proc/sys/vm/drop_caches
export CONFDIR=$WORKSPACE/deploy/conf
-export ISO_URL=file://$BUILD_DIRECTORY/compass.iso
+if [[ "$BRANCH" = 'stable/danube' ]]; then
+ export ISO_URL=file://$BUILD_DIRECTORY/compass.iso
+else
+ export ISO_URL=file://$BUILD_DIRECTORY/compass.tar.gz
+fi
cd $WORKSPACE
cd $WORKSPACE
@@
-34,6
+38,8
@@
if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]]; then
export NETWORK_CONF_FILE=network_ocl.yml
elif [[ "${DEPLOY_SCENARIO}" =~ "-onos" ]]; then
export NETWORK_CONF_FILE=network_onos.yml
export NETWORK_CONF_FILE=network_ocl.yml
elif [[ "${DEPLOY_SCENARIO}" =~ "-onos" ]]; then
export NETWORK_CONF_FILE=network_onos.yml
+elif [[ "${DEPLOY_SCENARIO}" =~ "-openo" ]]; then
+ export NETWORK_CONF_FILE=network_openo.yml
else
export NETWORK_CONF_FILE=network.yml
fi
else
export NETWORK_CONF_FILE=network.yml
fi