Refactor clone and compile functions

[integration.git] / bootstrap / vagrant-onap / lib / ccsdk

diff --git a/bootstrap/vagrant-onap/lib/ccsdk b/bootstrap/vagrant-onap/lib/ccsdk
index 03987ea..9f00e9a 100755 (executable)
--- a/bootstrap/vagrant-onap/lib/ccsdk
+++ b/bootstrap/vagrant-onap/lib/ccsdk
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -o xtrace
-
 source /var/onap/functions
 
 ccsdk_src_folder=$git_src_folder/ccsdk
@@ -11,25 +9,9 @@ ccsdk_repos=("ccsdk" "ccsdk/dashboard" "ccsdk/distribution" "ccsdk/parent"
 "ccsdk/sli/plugins" "ccsdk/storage" "ccsdk/storage/esaas" "ccsdk/storage/pgaas"
 "ccsdk/utils")
 
-# clone_ccsdk_repos() - Function that clones the CCSDK repositories
-function clone_ccsdk_repos {
-    for repo in ${ccsdk_repos[@]}; do
-        clone_repo $repo $ccsdk_src_folder${repo#ccsdk}
-    done
-}
-
-# compile_ccsdk_repos() - 
-function compile_ccsdk_repos {
-    install_package unzip
-    for repo in ${ccsdk_repos[@]}; do
-        compile_src $ccsdk_src_folder${repo#ccsdk}
-    done
-}
-
 # _build_ccsdk_images() - Build CCSDK Docker images from source code
 function _build_ccsdk_images {
     install_package unzip
-    clone_repo ccsdk/distribution $ccsdk_src_folder/distribution
     compile_src $ccsdk_src_folder/distribution
     for image in ubuntu opendaylight odlsli dgbuilder-docker; do
         build_docker_image $ccsdk_src_folder/distribution/$image docker
@@ -50,9 +32,12 @@ function get_ccsdk_images {
 # init_ccsdk() - Function that initialize Multi Cloud services
 function init_ccsdk {
     if [[ "$clone_repo" == "True" ]]; then
-        clone_ccsdk_repos
+        clone_repos "ccsdk"
         if [[ "$compile_repo" == "True" ]]; then
-            compile_ccsdk_repos
+            compile_repos "ccsdk"
         fi
     fi
+    if [[ "$skip_get_images" == "False" ]]; then
+        get_ccsdk_images
+    fi
 }