summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRitu Sood <Ritu.Sood@intel.com>2019-10-30 20:59:33 +0000
committerGerrit Code Review <gerrit@onap.org>2019-10-30 20:59:33 +0000
commit599d59f739ce9af07360e0c45a7e12bee31fe650 (patch)
treec8940028f3e8c1caa335815dcee0f2c87d2047a5
parent703f8fb06d8c378beba5069017a8f301345034d0 (diff)
parentef732ee5db7c92f67c400a40028ee8ba97b70ecf (diff)
Merge "Testcases shouldn't run prematurely from installer script"
-rwxr-xr-xkud/hosting_providers/vagrant/installer.sh18
1 files changed, 7 insertions, 11 deletions
diff --git a/kud/hosting_providers/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh
index e5138c24..235736e1 100755
--- a/kud/hosting_providers/vagrant/installer.sh
+++ b/kud/hosting_providers/vagrant/installer.sh
@@ -154,23 +154,19 @@ function install_addons {
echo "Installing Kubernetes AddOns"
_install_ansible
sudo ansible-galaxy install $verbose -r $kud_infra_folder/galaxy-requirements.yml --ignore-errors
-
ansible-playbook $verbose -i $kud_inventory $kud_playbooks/configure-kud.yml | sudo tee $log_folder/setup-kud.log
- for addon in ${KUD_ADDONS:-virtlet ovn4nfv nfd}; do
+ for addon in ${KUD_ADDONS:-virtlet ovn4nfv nfd sriov}; do
echo "Deploying $addon using configure-$addon.yml playbook.."
ansible-playbook $verbose -i $kud_inventory $kud_playbooks/configure-${addon}.yml | sudo tee $log_folder/setup-${addon}.log
- if [[ "${testing_enabled}" == "true" ]]; then
- pushd $kud_tests
- bash ${addon}.sh
- popd
- fi
done
- ansible-playbook $verbose -i $kud_inventory $kud_playbooks/configure-sriov.yml | sudo tee $log_folder/setup-sriov.log
- if [[ "${testing_enabled}" == "true" ]]; then
+ echo "Run the test cases if testing_enabled is set to true."
+ if [[ "${testing_enabled}" == "true" ]]; then
+ for addon in ${KUD_ADDONS:-virtlet ovn4nfv nfd sriov}; do
pushd $kud_tests
- bash sriov.sh
+ bash ${addon}.sh
popd
- fi
+ done
+ fi
echo "Add-ons deployment complete..."
}