diff options
Diffstat (limited to 'bootstrap/vagrant-onap/lib')
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/functions | 5 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/robot | 16 |
2 files changed, 11 insertions, 10 deletions
diff --git a/bootstrap/vagrant-onap/lib/functions b/bootstrap/vagrant-onap/lib/functions index 907805e97..8d906dc68 100755 --- a/bootstrap/vagrant-onap/lib/functions +++ b/bootstrap/vagrant-onap/lib/functions @@ -70,13 +70,14 @@ function clone_repo { # clone_repos() - Function that clones source repositories for a given project function clone_repos { local project=$1 + local repo_name=${2:-$project} local name=${project}_repos[@] local src_name=${project}_src_folder local repos_list=("${!name}") - local dest_folder=${3:-${!src_name}} + local dest_folder=${!src_name} for repo in ${repos_list[@]}; do - clone_repo $repo $dest_folder${repo#*$project} + clone_repo $repo $dest_folder${repo#*$repo_name} done } diff --git a/bootstrap/vagrant-onap/lib/robot b/bootstrap/vagrant-onap/lib/robot index 374a2563c..588da6c1e 100755 --- a/bootstrap/vagrant-onap/lib/robot +++ b/bootstrap/vagrant-onap/lib/robot @@ -2,18 +2,18 @@ source /var/onap/functions -testsuite_src_folder=$git_src_folder/testsuite -testsuite_repos=("testsuite" "testsuite/heatbridge" "testsuite/properties" \ +robot_src_folder=$git_src_folder/testsuite +robot_repos=("testsuite" "testsuite/heatbridge" "testsuite/properties" \ "testsuite/python-testing-utils") # _setup_ete_folder() - Create and copy ete folder structure function _setup_ete_folder { mkdir -p /opt/eteshare/config - cp $testsuite_src_folder/integration_* /opt/eteshare/config - cp $testsuite_src_folder/vm_config2robot.sh /opt/eteshare/config - cp $testsuite_src_folder/ete.sh /opt - cp $testsuite_src_folder/demo.sh /opt + cp $robot_src_folder/integration_* /opt/eteshare/config + cp $robot_src_folder/vm_config2robot.sh /opt/eteshare/config + cp $robot_src_folder/ete.sh /opt + cp $robot_src_folder/demo.sh /opt chmod +x /opt/ete.sh chmod +x /opt/demo.sh @@ -33,10 +33,10 @@ function install_robot { # init_robot() - Function that initialize Robot services function init_robot { if [[ "$clone_repo" == "True" ]]; then - clone_repos "testsuite" + clone_repos "robot" "testsuite" _setup_ete_folder if [[ "$compile_repo" == "True" ]]; then - compile_repos "testsuite" + compile_repos "robot" fi fi |