commit 57f42afc992efe1da538d3058af0be2b8d7f0971
author garciadeblas <gerardo.garciadeblas@telefonica.com> Tue Oct 04 10:08:05 2016 +0200
committer Gerrit Code Review <root@osm.etsi.org> Tue Oct 04 10:08:05 2016 +0200
tree 26b86d9a0e045502bd9cab93a05299b16449c46a
parent 1cc0d44cfcac6dd5086d97397de072101a1f6611
parent 8b413241c07347b196b81f5c340137fa8963b1e1

Merge "allow running test_vimconn without user ssh keys. Change installation to copy .gitignore with common parameters"

scripts/install-openmano.sh

diff --git a/scripts/install-openmano.sh b/scripts/install-openmano.sh
index 9aaf028..c7e03aa 100755
--- a/scripts/install-openmano.sh
+++ b/scripts/install-openmano.sh
@@ -264,6 +264,7 @@
 #####        DOWNLOAD SOURCE                                #####
 #################################################################'
     su $SUDO_USER -c 'git clone '"${GIT_URL}"' openmano'
+    su $SUDO_USER -c 'cp openmano/.gitignore-common openmano/.gitignore'
     #[[ -z $DEVELOP ]] && su $SUDO_USER -c 'git checkout <tag version>'
 fi
 

test/test_vimconn.sh

diff --git a/test/test_vimconn.sh b/test/test_vimconn.sh
index aedf20a..7542d6c 100755
--- a/test/test_vimconn.sh
+++ b/test/test_vimconn.sh
@@ -268,13 +268,8 @@
     #USER_KEY=""
     key_param1=""
     key_param2=""
-    #for file_key in ${HOME}/.ssh/*.pub
-    #do
-    #    [[ -n ${USER_KEY} ]] && USER_KEY="${USER_KEY},"
-    #    USER_KEY="${USER_KEY}$(cat $file_key)"
-    #done
-    #[[  -n ${USER_KEY} ]] && key_param1="--keypair=${USER}:${USER_KEY}" && key_param2="--keypair=${USER_KEY}"
-    key_param1=--keypair-auto
+    #add user keys if present at .ssh    
+    ls ${HOME}/.ssh/*.pub > /dev/null 2>&1 && key_param1=--keypair-auto
 
     for sce in simple complex2
     do