Add protections if INSTALLER_TYPE is unset
authorCédric Ollivier <cedric.ollivier@orange.com>
Thu, 12 May 2016 15:05:42 +0000 (17:05 +0200)
committerCédric Ollivier <cedric.ollivier@orange.com>
Thu, 12 May 2016 15:06:46 +0000 (17:06 +0200)
It avoids unary operator expected errors.

Change-Id: Ie717631b651b258d9bf62706f09c6f6b7c534620
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
ci/exec_test.sh

index 3a823e7..49eb91a 100755 (executable)
@@ -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