diff options
| author |   Samuli Silvius <s.silvius@partner.samsung.com> | 2019-05-21 10:32:22 +0300 |
|---|---|---|
| committer | Samuli Silvius <s.silvius@partner.samsung.com> | 2019-05-31 08:23:02 +0300 |
| commit | d311b7ef3feb598daf9172cc292f06ae5daeb4d5 (patch) | |
| tree | 6b372959cd80eefa431e0f24a090a4622751dd7b /kud/hosting_providers/vagrant | |
| parent | 98fdb49bd98debd97fe62c5daa3ca54228ae74bf (diff) | |
Starting of k8splugin with docker-compose is brokendublin
docker-compose.yml and start.sh script cannot be used
in installer.sh to start k8splugin and mongo.
This commit modifies start.sh script to be usable in
installer.sh to start plugin before tests.
Also fixed kud_tests variable in installer.sh.
Issue-ID: MULTICLOUD-640
Change-Id: I60cc850d6f5b58df574f79ad3c65b801c59b3a14
Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
Diffstat (limited to 'kud/hosting_providers/vagrant')
| -rwxr-xr-x | kud/hosting_providers/vagrant/installer.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kud/hosting_providers/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh index c37d2746..2168d0d3 100755 --- a/kud/hosting_providers/vagrant/installer.sh +++ b/kud/hosting_providers/vagrant/installer.sh @@ -166,7 +166,7 @@ function install_plugin { pushd $kud_folder/../../../deployments sudo ./build.sh if [[ "${testing_enabled}" == "true" ]]; then - docker-compose up -d + sudo ./start.sh pushd $kud_tests for functional_test in plugin plugin_edgex; do bash ${functional_test}.sh @@ -216,7 +216,7 @@ kud_infra_folder=$kud_folder/../../deployment_infra export kud_inventory_folder=$kud_folder/inventory kud_inventory=$kud_inventory_folder/hosts.ini kud_playbooks=$kud_infra_folder/playbooks -kud_tests=$kud_folder/tests +kud_tests=$kud_folder/../../tests k8s_info_file=$kud_folder/k8s_info.log testing_enabled=${KUD_ENABLE_TESTS:-false} |