commit 472a3069ab2c7de0969051fd170dacf4c76015e5
author Victor Morales <victor.morales@intel.com> Fri Feb 02 08:26:50 2018 -0800
committer Victor Morales <victor.morales@intel.com> Mon Feb 05 02:57:18 2018 -0800
tree 0c1fdbf9f1736289f08af23909654f9a49532fa2
parent 7b94e0a63c3598eea5e1eed18bb5cd1cd0b0beb2

Update SDC instructions

The variables and instructions of SDC script were out of date.
This change includes the usage of "src_folders" variable besides
the simplification of the process.

Change-Id: I557b2a9a2a2ed567003230febfae56a043a2e9e2
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-ID: INT-16

bootstrap/vagrant-onap/lib/sdc

diff --git a/bootstrap/vagrant-onap/lib/sdc b/bootstrap/vagrant-onap/lib/sdc
index fee583d..91523f8 100755
--- a/bootstrap/vagrant-onap/lib/sdc
+++ b/bootstrap/vagrant-onap/lib/sdc
@@ -24,12 +24,19 @@
 
 # get_sdc_images() - Function that retrieves the SDC docker images
 function get_sdc_images {
+    build_docker_image ${src_folders[sdc]}/utils/webseal-simulator docker
     if [[ "$build_image" == "True" ]]; then
-        build_docker_image $sdc_src_folder/sdc-docker-base
-    else
-        for image in backend frontend elasticsearch kibana cassandra sanity; do
-            pull_openecomp_image openecomp/sdc-$image
+        build_docker_image ${src_folders[sdc]}/sdc-docker-base
+        compile_src  ${src_folders[sdc]}
+        for project in catalog-fe test-apis-ci; do
+            compile_src  ${src_folders[sdc]}/$project
         done
+        build_docker_image ${src_folders[sdc]}/sdc-os-chef docker
+    else
+        for image in elasticsearch init-elasticsearch cassandra kibana backend frontend sanity; do
+            pull_onap_image sdc-$image &
+        done
+        wait_docker_pull
     fi
 }
 
@@ -39,15 +46,14 @@
     local MR_IP_ADDR='10.0.11.1'
 
     _init_data_folders
-    cp $sdc_src_folder/sdc-os-chef/environments/Template.json /data/environments
-    cp $sdc_src_folder/sdc-os-chef/scripts/docker_run.sh /data/scripts
-    cp $sdc_src_folder/sdc-os-chef/scripts/docker_health.sh /data/scripts
-    cp $sdc_src_folder/sdc-os-chef/scripts/docker_login.sh /data/scripts
-    cp $sdc_src_folder/sdc-os-chef/scripts/docker_clean.sh /data/scripts
-    chmod +x /data/scripts/docker_run.sh
-    chmod +x /data/scripts/docker_health.sh
-    chmod +x /data/scripts/docker_login.sh
-    chmod +x /data/scripts/docker_clean.sh
+    cp ${src_folders[sdc]}/sdc-os-chef/environments/Template.json /data/environments
+    cp ${src_folders[sdc]}/sdc-os-chef/scripts/docker_run.sh /data/scripts
+    cp ${src_folders[sdc]}/sdc-os-chef/scripts/docker_health.sh /data/scripts
+    cp ${src_folders[sdc]}/sdc-os-chef/scripts/docker_login.sh /data/scripts
+    cp ${src_folders[sdc]}/sdc-os-chef/scripts/docker_clean.sh /data/scripts
+    cp ${src_folders[sdc]}/sdc-os-chef/scripts/simulator_docker_run.sh /data/scripts
+
+    chmod +x /data/scripts/*.sh
 
     cat /data/environments/Template.json | sed "s/yyy/"$IP_ADDRESS"/g" > /data/environments/$ENV_NAME.json
     sed -i "s/xxx/"$ENV_NAME"/g" /data/environments/$ENV_NAME.json
@@ -56,7 +62,7 @@
 
     install_docker
     if [[ "$skip_get_images" == "False" ]]; then
-        bash /data/scripts/docker_run.sh -e $ENV_NAME  -l
+        bash /data/scripts/docker_run.sh -e $ENV_NAME -l
     else
         bash /data/scripts/docker_run.sh -e $ENV_NAME -r $docker_version -p $(echo $nexus_docker_repo | cut -d':' -f2)
     fi