Merge "Update SDC lib and test scripts"

1 files changed, 9 insertions, 10 deletions

diff --git a/bootstrap/vagrant-onap/tests/test_sdc b/bootstrap/vagrant-onap/tests/test_sdc
index bb0cd7010..9b6f5a5a5 100644
--- a/bootstrap/vagrant-onap/tests/test_sdc
+++ b/bootstrap/vagrant-onap/tests/test_sdc
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 source /var/onap_tests/_test_base
-source /var/onap/asdc
+source /var/onap/sdc
 
 covered_functions=(
 "clone_all_sdc_repos" "compile_all_sdc_repos" "get_sdc_images" "install_sdc"
@@ -26,11 +26,10 @@ function test_compile_all_sdc_repos {
     compile_all_sdc_repos
 
     asserts_file_exist $sdc_src_folder/jtosca/target/jtosca-1.1.10-SNAPSHOT.jar
-    asserts_file_exist $sdc_src_folder/sdc-distribution-client/sdc-distribution-ci/target/sdc-distribution-ci-1.1.32-SNAPSHOT.jar
-    asserts_file_exist $sdc_src_folder/sdc-distribution-client/sdc-distribution-client/target/sdc-distribution-client-1.1.32-SNAPSHOT.jar
-    asserts_file_exist $sdc_src_folder/sdc-os-chef/target/sdc-os-chef-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $sdc_src_folder/sdc-titan-cassandra/target/sdc-titan-cassandra-1.0.0.jar
-    asserts_file_exist $sdc_src_folder/sdc-tosca/target/sdc-tosca-1.1.50-SNAPSHOT.jar
+    asserts_file_exist $sdc_src_folder/sdc-distribution-client/sdc-distribution-ci/target/sdc-distribution-ci-1.1.*-SNAPSHOT.jar
+    asserts_file_exist $sdc_src_folder/sdc-distribution-client/sdc-distribution-client/target/sdc-distribution-client-1.1.*-SNAPSHOT.jar
+    asserts_file_exist $sdc_src_folder/sdc-titan-cassandra/target/jamm-0.3.0.jar
+    asserts_file_exist $sdc_src_folder/sdc-tosca/target/sdc-tosca-1.1.*-SNAPSHOT.jar
 
     for dirc in logging sdc-artifact-generator; do
         name="openecomp-$dirc"
@@ -46,8 +45,8 @@ function test_get_sdc_images {
     clone_all_sdc_repos
     get_sdc_images
 
-    for image in backend frontend elasticsearch kibana cassandra sanity; do
-        asserts_image openecomp/sdc-$image
+    for image in sanity elasticsearch cassandra kibana frontend backend; do
+        asserts_image openecomp/base_sdc-$image
     done
 }
 
@@ -57,8 +56,8 @@ function test_install_sdc {
     get_sdc_images
     install_sdc
 
-    for image in backend frontend elasticsearch kibana cassandra sanity; do
-        asserts_image_running openecomp/sdc-$image
+    for image in elasticsearch cassandra kibana frontend backend; do
+        asserts_image_running openecomp/base_sdc-$image
     done
 }