From 8b413241c07347b196b81f5c340137fa8963b1e1 Mon Sep 17 00:00:00 2001 From: tierno Date: Tue, 4 Oct 2016 08:00:54 +0000 Subject: [PATCH] allow running test_vimconn without user ssh keys. Change installation to copy .gitignore with common parameters Signed-off-by: tierno --- scripts/install-openmano.sh | 1 + test/test_vimconn.sh | 9 ++------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/install-openmano.sh b/scripts/install-openmano.sh index 9aaf028e..c7e03aa5 100755 --- a/scripts/install-openmano.sh +++ b/scripts/install-openmano.sh @@ -264,6 +264,7 @@ if [[ -z $NOCLONE ]]; then ##### 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 ' fi diff --git a/test/test_vimconn.sh b/test/test_vimconn.sh index aedf20ac..7542d6c2 100755 --- a/test/test_vimconn.sh +++ b/test/test_vimconn.sh @@ -268,13 +268,8 @@ then #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 -- 2.25.1