aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2016-05-12 17:05:42 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2016-05-12 17:06:46 +0200
commitee1a527d2f10511e3f24c19658f1b9a992844000 (patch)
treea30be923ed714510317d6a29b49a1ba790206cf0
parentdb06c3026849ef0d2db9c040b66490ee6463dc1f (diff)
Add protections if INSTALLER_TYPE is unset
It avoids unary operator expected errors. Change-Id: Ie717631b651b258d9bf62706f09c6f6b7c534620 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rwxr-xr-xci/exec_test.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 3a823e736..49eb91a9e 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -48,16 +48,16 @@ function odl_tests(){
usr_name=$(env | grep OS | grep OS_USERNAME | cut -f2 -d'=')
password=$(env | grep OS | grep OS_PASSWORD | cut -f2 -d'=')
odl_port=8181
- if [ $INSTALLER_TYPE == "fuel" ]; then
+ if [ "$INSTALLER_TYPE" == "fuel" ]; then
odl_port=8282
- elif [ $INSTALLER_TYPE == "apex" ]; then
+ elif [ "$INSTALLER_TYPE" == "apex" ]; then
:
- elif [ $INSTALLER_TYPE == "joid" ]; then
+ elif [ "$INSTALLER_TYPE" == "joid" ]; then
odl_ip=$(env | grep SDN_CONTROLLER | cut -f2 -d'=')
neutron_ip=$(openstack catalog show network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
odl_port=8080
:
- elif [ $INSTALLER_TYPE == "compass" ]; then
+ elif [ "$INSTALLER_TYPE" == "compass" ]; then
:
else
error "INSTALLER_TYPE not valid."
@@ -136,7 +136,7 @@ bgpvpn = True" >> /etc/tempest/tempest.conf
popd
;;
"onos")
- if [ $INSTALLER_TYPE == "joid" ]; then
+ if [ "$INSTALLER_TYPE" == "joid" ]; then
python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py -i joid
else
python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py