summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Morales <victor.morales@intel.com>2017-11-06 11:51:37 -0800
committerVictor Morales <victor.morales@intel.com>2017-11-06 12:00:15 -0800
commit332d7d80bd470bb78ed154a5b5416554686a7196 (patch)
treef2685d52e336f3c8f00b0395caf2ad7de9cb7e2e
parent7fbcfe9aa0c049c05aa9cd8bbf6c62796a1f109f (diff)
Reduce the number of update_repo calls
The update_repo function allows to fetch repository metadata. This function can take some time during the initial provisioning time. This change reduce the number of calls to that function. Change-Id: I2a0b0f13f7a3e6b37f0c0316ae9730a3ed840238 Signed-off-by: Victor Morales <victor.morales@intel.com> Issue-Id: INT-324
-rwxr-xr-xbootstrap/vagrant-onap/lib/commons1
-rwxr-xr-xbootstrap/vagrant-onap/lib/functions3
-rw-r--r--bootstrap/vagrant-onap/tests/_test_base2
-rwxr-xr-xbootstrap/vagrant-onap/vagrant_utils/postinstall.sh1
4 files changed, 6 insertions, 1 deletions
diff --git a/bootstrap/vagrant-onap/lib/commons b/bootstrap/vagrant-onap/lib/commons
index ba7c7613a..2b01dc524 100755
--- a/bootstrap/vagrant-onap/lib/commons
+++ b/bootstrap/vagrant-onap/lib/commons
@@ -24,7 +24,6 @@ function is_package_installed {
# install_packages() - Install a list of packages
function install_packages {
local package=$@
- update_repos
apt-get install -y -qq $package
}
diff --git a/bootstrap/vagrant-onap/lib/functions b/bootstrap/vagrant-onap/lib/functions
index 1a1b2aa4c..de6f9ee33 100755
--- a/bootstrap/vagrant-onap/lib/functions
+++ b/bootstrap/vagrant-onap/lib/functions
@@ -75,6 +75,7 @@ function install_java {
fi
install_package software-properties-common
add-apt-repository -y ppa:openjdk-r/ppa
+ update_repos
# Remove Java 7
uninstall_packages default-jre openjdk-7-jdk openjdk-7-jre openjdk-7-jre-headless
@@ -92,6 +93,7 @@ function install_maven {
install_java
install_package software-properties-common
add-apt-repository -y ppa:andrei-pozolotin/maven3
+ update_repos
install_package maven3
# Remove Java 7
@@ -173,6 +175,7 @@ function install_docker {
add-apt-repository \
"deb [arch=amd64] https://download.docker.com/linux/ubuntu \
$(lsb_release -cs) stable"
+ update_repos
install_package docker-ce
_configure_docker_settings
diff --git a/bootstrap/vagrant-onap/tests/_test_base b/bootstrap/vagrant-onap/tests/_test_base
index 7d0415a44..78c7f8bb4 100644
--- a/bootstrap/vagrant-onap/tests/_test_base
+++ b/bootstrap/vagrant-onap/tests/_test_base
@@ -1,11 +1,13 @@
#!/bin/bash
source /var/onap_tests/asserts
+source /var/onap/commons
# main() - Starting point for Unit Tests
function main {
local covered_functions=("$@")
+ update_repos
len=${#covered_functions[@]}
echo "1..$len"
for i in ${!covered_functions[@]}; do
diff --git a/bootstrap/vagrant-onap/vagrant_utils/postinstall.sh b/bootstrap/vagrant-onap/vagrant_utils/postinstall.sh
index 7083f3d02..748d1b553 100755
--- a/bootstrap/vagrant-onap/vagrant_utils/postinstall.sh
+++ b/bootstrap/vagrant-onap/vagrant_utils/postinstall.sh
@@ -6,6 +6,7 @@ fi
source /var/onap/functions
+update_repos
create_configuration_files
install_dev_tools
configure_bind