Merge "Fix regex for coverage projects function"

3 files changed, 10 insertions, 18 deletions

diff --git a/bootstrap/vagrant-onap/tests/test_functions b/bootstrap/vagrant-onap/tests/test_functions
index 8043ebbd7..3ab5828cb 100644
--- a/bootstrap/vagrant-onap/tests/test_functions
+++ b/bootstrap/vagrant-onap/tests/test_functions
@@ -178,7 +178,7 @@ function test_coverity_repos {
     pushd /var/onap_tests/
     cp projects.txt remaining_projects.txt
     for covered_repo in "${repos_list[@]}"; do
-        sed -i "/$covered_repo/d" remaining_projects.txt
+        sed -i '/^'${covered_repo//\//\\/}'$/d' remaining_projects.txt
     done
 
     threshold=75
diff --git a/bootstrap/vagrant-onap/tests/test_policy b/bootstrap/vagrant-onap/tests/test_policy
index 0c544cd7d..08231fc7a 100644
--- a/bootstrap/vagrant-onap/tests/test_policy
+++ b/bootstrap/vagrant-onap/tests/test_policy
@@ -49,8 +49,7 @@ function test_compile_all_policy_repos {
     done
     asserts_file_exist $policy_src_folder/drools-applications/controlloop/packages/basex/target/basex-1.1.0-SNAPSHOT.tar.gz
     asserts_file_exist $policy_src_folder/drools-applications/controlloop/templates/template.demo/target/template.demo-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $policy_src_folder/drools-applications/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/target/archetype-cl-legacy-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $policy_src_folder/drools-applications/controlloop/templates/template.demo.v1.0.0/template.demo/target/demo-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $policy_src_folder/drools-applications/controlloop/templates/template.demo/target/template.demo-1.1.0-SNAPSHOT.jar
     for feature in eelf healthcheck session-persistence; do
         asserts_file_exist $policy_src_folder/drools-pdp/feature-$feature/target/feature-$feature-1.1.0-SNAPSHOT.jar
     done
diff --git a/bootstrap/vagrant-onap/tests/test_sdnc b/bootstrap/vagrant-onap/tests/test_sdnc
index ddc1d9c6b..7b54749dd 100644
--- a/bootstrap/vagrant-onap/tests/test_sdnc
+++ b/bootstrap/vagrant-onap/tests/test_sdnc
@@ -12,12 +12,12 @@ function test_clone_all_sdnc_repos {
     clone_all_sdnc_repos
 
     asserts_file_exist $sdnc_src_folder/adaptors/pom.xml
-    # asserts_file_exist $sdnc_src_folder/architecture/pom.xml
+    asserts_file_exist $sdnc_src_folder/architecture/docs/index.rst
     asserts_file_exist $sdnc_src_folder/core/pom.xml
-    # asserts_file_exist $sdnc_src_folder/features/pom.xml
+    asserts_file_exist $sdnc_src_folder/features/docs/index.rst
     asserts_file_exist $sdnc_src_folder/northbound/pom.xml
     asserts_file_exist $sdnc_src_folder/oam/pom.xml
-    # asserts_file_exist $sdnc_src_folder/parent/pom.xml
+    asserts_file_exist $sdnc_src_folder/parent/docs/index.rst
     asserts_file_exist $sdnc_src_folder/plugins/pom.xml
 }
 
@@ -27,19 +27,12 @@ function test_compile_all_sdnc_repos {
     compile_all_sdnc_repos
 
     for component in generic-resource-api vnfapi vnftools; do
-        if [[ "$component" != "generic-resource-api" ]]; then
-            if [[ "$component" == "vnfapi" ]]; then
-                asserts_file_exist $sdnc_src_folder/northbound/vnfapi/model/target/vnfapi-model-1.2.0-SNAPSHOT.jar
-            fi
-            asserts_file_exist $sdnc_src_folder/northbound/$component/installer/target/sdnc-$component-1.2.0-SNAPSHOT-installer.zip
-            asserts_file_exist $sdnc_src_folder/northbound/$component/features/target/$component-features-1.2.0-SNAPSHOT.jar
-            asserts_file_exist $sdnc_src_folder/northbound/$component/provider/target/$component-provider-1.2.0-SNAPSHOT.jar
-        else
-            asserts_file_exist $sdnc_src_folder/northbound/generic-resource-api/features/target/generic-resource-api.features-1.2.0-SNAPSHOT.jar
-            asserts_file_exist $sdnc_src_folder/northbound/generic-resource-api/installer/target/sdnc-generic-resources-api-1.2.0-SNAPSHOT-installer.zip
-            asserts_file_exist $sdnc_src_folder/northbound/generic-resource-api/model/target/generic-resource-api.model-1.2.0-SNAPSHOT.jar
-            asserts_file_exist $sdnc_src_folder/northbound/generic-resource-api/provider/target/generic-resource-api.provider-1.2.0-SNAPSHOT.jar
+        if [[ "$component" == "vnfapi" ]]; then
+            asserts_file_exist $sdnc_src_folder/northbound/vnfapi/model/target/vnfapi-model-1.2.0-SNAPSHOT.jar
         fi
+        asserts_file_exist $sdnc_src_folder/northbound/$component/installer/target/sdnc-$component-1.2.0-SNAPSHOT-installer.zip
+        asserts_file_exist $sdnc_src_folder/northbound/$component/features/target/$component-features-1.2.0-SNAPSHOT.jar
+        asserts_file_exist $sdnc_src_folder/northbound/$component/provider/target/$component-provider-1.2.0-SNAPSHOT.jar
     done
     asserts_file_exist $sdnc_src_folder/oam/admportal/target/admportal.*-SNAPSHOT.zip
     asserts_file_exist $sdnc_src_folder/oam/dgbuilder/target/dgbuilder.*-SNAPSHOT.zip