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 d115eaa..9f00e9a 100755 (executable)
--- a/bootstrap/vagrant-onap/lib/ccsdk
+++ b/bootstrap/vagrant-onap/lib/ccsdk
@@ -1,35 +1,18 @@
 #!/bin/bash
 
-set -o xtrace
-
 source /var/onap/functions
 
 ccsdk_src_folder=$git_src_folder/ccsdk
-ccsdk_repos=("dashboard" "distribution" "parent" "platform/blueprints" "platform/nbapi" "platform/plugins" "sli" "sli/adaptors" "sli/core" "sli/northbound" "sli/plugins" "storage" "storage/esaas" "storage/pgaas" "utils")
-
-# clone_ccsdk_repos() - Function that clones the CCSDK repositories
-function clone_ccsdk_repos {
-    clone_repo ccsdk $ccsdk_src_folder
-
-    for dirc in ${ccsdk_repos[@]}; do
-        clone_repo ccsdk/$dirc $ccsdk_src_folder/$dirc
-    done
-}
-
-# compile_ccsdk_repos() - 
-function compile_ccsdk_repos {
-    compile_src ccsdk $ccsdk_src_folder
-
-    for dirc in ${ccsdk_repos[@]}; do
-        compile_src $ccsdk_src_folder/$dirc
-    done
-}
+ccsdk_repos=("ccsdk" "ccsdk/dashboard" "ccsdk/distribution" "ccsdk/parent"
+"ccsdk/platform/blueprints" "ccsdk/platform/nbapi" "ccsdk/platform/plugins"
+"ccsdk/sli" "ccsdk/sli/adaptors" "ccsdk/sli/core" "ccsdk/sli/northbound"
+"ccsdk/sli/plugins" "ccsdk/storage" "ccsdk/storage/esaas" "ccsdk/storage/pgaas"
+"ccsdk/utils")
 
 # _build_ccsdk_images() - Build CCSDK Docker images from source code
 function _build_ccsdk_images {
     install_package unzip
     compile_src $ccsdk_src_folder/distribution
-    clone_repo ccsdk/distribution $ccsdk_src_folder/distribution
     for image in ubuntu opendaylight odlsli dgbuilder-docker; do
         build_docker_image $ccsdk_src_folder/distribution/$image docker
     done
@@ -44,21 +27,17 @@ function get_ccsdk_images {
             pull_onap_image ccsdk-$image-image
         done
     fi
-
-}
-
-# install_ccsdk() - 
-function install_ccsdk {
-    echo "pass"
 }
 
 # 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
-    install_ccsdk
+    if [[ "$skip_get_images" == "False" ]]; then
+        get_ccsdk_images
+    fi
 }