summaryrefslogtreecommitdiffstats
path: root/bootstrap
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-08-30 22:17:16 +0000
committerGerrit Code Review <gerrit@onap.org>2017-08-30 22:17:16 +0000
commit2fd432a29edd1117703d464cccb9831a57109449 (patch)
tree6088ed75dfa454e02a08c222c91c888d5b49ad15 /bootstrap
parentbf1e7f0d0f88f5645f2e0b97dcbf885b69251b58 (diff)
parente173c7697148747e59eb04ba9b0678b828f5a021 (diff)
Merge "Replace src_folder for mr_src_folder"
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap/vagrant-onap/lib/mr6
-rw-r--r--bootstrap/vagrant-onap/tests/test_mr2
2 files changed, 4 insertions, 4 deletions
diff --git a/bootstrap/vagrant-onap/lib/mr b/bootstrap/vagrant-onap/lib/mr
index 5bd1d1aaf..a137f73bb 100755
--- a/bootstrap/vagrant-onap/lib/mr
+++ b/bootstrap/vagrant-onap/lib/mr
@@ -4,11 +4,11 @@ set -o xtrace
source /var/onap/functions
-src_folder=$git_src_folder/dcae/message-router
+mr_src_folder=$git_src_folder/dcae/message-router
# clone_mr_repos() - Function that clones the Message Router repositories
function clone_mr_repos {
- clone_repo dcae/demo/startup/message-router $src_folder
+ clone_repo dcae/demo/startup/message-router $mr_src_folder
}
# get_mr_images() - Function that retrieves the Message Router Docker images
@@ -21,7 +21,7 @@ function get_mr_images {
function install_message_router {
install_docker_compose
- pushd $src_folder
+ pushd $mr_src_folder
bash deploy.sh
popd
}
diff --git a/bootstrap/vagrant-onap/tests/test_mr b/bootstrap/vagrant-onap/tests/test_mr
index d8db84940..a863b99ba 100644
--- a/bootstrap/vagrant-onap/tests/test_mr
+++ b/bootstrap/vagrant-onap/tests/test_mr
@@ -11,7 +11,7 @@ covered_functions=(
function test_clone_mr_repos {
clone_mr_repos
- asserts_file_exist $src_folder/deploy.sh
+ asserts_file_exist $mr_src_folder/deploy.sh
}
# test_get_mr_images() - Verify that Message Router Docker images are retrieved