Optimize Build

Optimize the log output

Issue-ID: SDC-3232
Signed-off-by: JulienBe <julien.bertozzi@intl.att.com>
Change-Id: I50cfb7119b1e9087d3e2db56a81fe47df4ad6254

21 files changed, 0 insertions, 812 deletions

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/CRUDArtifacts.xml b/test-apis-ci/src/main/resources/ci/testSuites/CRUDArtifacts.xml
deleted file mode 100644
index 78c93723fa..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/CRUDArtifacts.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="CRUDArtifacts" configfailurepolicy="continue" verbose="2"  parallel="tests" thread-count="10">
-
-  <test name="Test">
-    <classes>
-      <class 
-      name="CRUDExternalAPI">
-   			   <methods>
-				<!-- 	<include name="uploadArtifactOnVFViaExternalAPI" />
-					<include name="uploadArtifactOnServiceViaExternalAPI" />
-					<include name="uploadArtifactOnRIViaExternalAPI" />
-					<include name="uploadInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI" />
-					<include name="uploadArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset" />
-					<include name="uploadArtifactOnAssetWhichNotExist" />
-					<include name="uploadArtifactOnAssetWhichInInvalidStateForUploading" />
-					
-					
-					<include name="updateArtifactForServiceViaExternalAPI" />
-					<include name="updateArtifactForVFViaExternalAPI" />
-					<include name="updateArtifactOnRIViaExternalAPI" />
-					<include name="updateArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset" />
-					<include name="updateArtifactOnAssetWhichNotExist" />
-					<include name="updateArtifactOnAssetWhichInInvalidStateForUploading" />
-					<include name="updateInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI" />
-					
-					
-					<include name="deleteArtifactForServiceViaExternalAPI" />
-					<include name="deleteArtifactForVFViaExternalAPI" />
-					<include name="deleteArtifactOnRIViaExternalAPI" />
-					<include name="deleteArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset" />
-					<include name="deleteArtifactOnAssetWhichNotExist" />
-					<include name="deleteArtifactOnAssetWhichInInvalidStateForUploading" /> -->
-					
-					<include name="deleteArtifactForServiceViaExternalAPI" />
-				</methods>
-      
-      </class>
-      
-    </classes>
-  </test> <!-- Test -->
-</suite> <!-- Suite -->
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/ExternalApiSanity.xml b/test-apis-ci/src/main/resources/ci/testSuites/ExternalApiSanity.xml
deleted file mode 100644
index 633054fb13..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/ExternalApiSanity.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="CRUDArtifacts" configfailurepolicy="continue" verbose="2"  parallel="methods" thread-count="2" data-provider-thread-count="2">
-
-  <test name="Test">
-    <classes>
-      <class name="CRUDExternalAPI">
-   		<methods>
-			<include name="uploadArtifactOnVfcVlCpViaExternalAPI" invocation-numbers="0" />
-			<include name="uploadArtifactOnVFViaExternalAPI" invocation-numbers="0" />
-			<include name="uploadArtifactOnServiceViaExternalAPI" invocation-numbers="0" />
-			<include name="uploadArtifactOnRIViaExternalAPI" invocation-numbers="0" />
-			<include name="uploadArtifactOnVfcVlCpRIViaExternalAPI" invocation-numbers="0" />
-			<include name="updateArtifactForServiceViaExternalAPI" invocation-numbers="0" />
-			<include name="updateArtifactForVFViaExternalAPI" invocation-numbers="0" />
-			<include name="updateArtifactForVfcVlCpViaExternalAPI" invocation-numbers="0" />
-			<include name="updateArtifactOfVfcVlCpForVfciVliCpiViaExternalAPI" invocation-numbers="0" />
-			<include name="updateArtifactOnRIViaExternalAPI" invocation-numbers="0" />
-			<include name="updateArtifactOnVfcVlCpRIViaExternalAPI" invocation-numbers="0" />
-			<include name="deleteArtifactForServiceViaExternalAPI" invocation-numbers="0" />
-			<include name="deleteArtifactForVFViaExternalAPI" invocation-numbers="0" />
-			<include name="deleteArtifactOnRIViaExternalAPI" invocation-numbers="0" />
-			<include name="deleteArtifactOnVfcVlCpRIViaExternalAPI" invocation-numbers="0" />
-			<include name="deleteArtifactOnAssetWhichNotExist" />			
-		</methods>
-      </class>
-      <class name="DownloadComponentArt">
-        <methods>
-            <include name="downloadArtifactOfComponentInstanceFromServiceViaExternalAPI"/>
-        </methods>
-      </class>
-      <class name="GetFilteredAssetServlet">
-        <methods>
-            <include name="getResourceAssetBySpecifiedCategory"/>
-            <include name="getServiceAssetBySpecifiedCategory"/>
-        </methods>
-      </class>
-      <class name="SearchFilterCategoryExternalAPI">
-        <methods>
-            <include name="normativeResourceCategory" invocation-numbers="0"/>
-        </methods>
-      </class>      
-      <class name="GetCSARofVF">
-        <methods>
-            <include name="getServiceToscaModelCheckInState"/>
-            <include name="getRsourceToscaModelCertifyState"/>
-        </methods>
-      </class>
-      <class name="GetFilteredAssetServlet">
-        <methods>
-            <include name="getResourceAssetBySpecifiedCategory"/>
-            <include name="getServiceAssetBySpecifiedCategory"/>
-        </methods>
-      </class>
-      <class name="GetSpecificAssetMetadataServlet">
-        <methods>
-            <include name="getResourceAssetMetadataSuccess"/>
-            <include name="getServiceAssetMetadataWithResourceInstancesSuccess"/>
-        </methods>
-      </class>
-      <class name="AssetLifeCycle">
-        <methods>
-            <include name="theFlow"/>
-        </methods>
-      </class>
-    </classes>
-  </test> <!-- Test -->
-</suite> <!-- Suite -->
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/SearchExternalAPI.xml b/test-apis-ci/src/main/resources/ci/testSuites/SearchExternalAPI.xml
deleted file mode 100644
index 40c462a4cb..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/SearchExternalAPI.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="CRUDArtifacts" configfailurepolicy="continue" verbose="2"  parallel="tests" thread-count="10">
-
-  <test name="Test">
-    <classes>
-      <class 
-      name="org.openecomp.sdc.ci.tests.execute.devCI.SearchFilterCategoryExternalAPI">
-   			   <methods>
-
-					<include name="searchWithInvalidFilter" />
-					<include name="searchForResourceTypeNegativeTest" />
-					<include name="searchingForResouceFilterIncorrectResouceTypeUsingExternalAPI" />
-					<include name="searchingForSeveralResouceTypesUsingExternalAPI" />
-					<include name="searchingForSeveralResourcesOfTypeVFCMTUsingExternalAPI" />
-					<include name="normativeResourceCategory" />		
-				</methods>
-      
-      </class>
-      
-    </classes>
-  </test> <!-- Test -->
-</suite> <!-- Suite -->
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/artifacts.xml b/test-apis-ci/src/main/resources/ci/testSuites/artifacts.xml
deleted file mode 100644
index 6a018ab0f0..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/artifacts.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Artifacts">
-  <test name="Artifacts">
-    <classes>
-      <class name="DownloadComponentArt"/>
-      <class name="ValidateHeatArtFieldsTypes"/>
-      <class name="PlaceHolderValidations"/>
-    </classes>
-  </test>
-</suite> <!-- Artifacts -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/cap_req.xml b/test-apis-ci/src/main/resources/ci/testSuites/cap_req.xml
deleted file mode 100644
index 4fefeaf679..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/cap_req.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Cap_Req" >
-	<test name="Cap_Req">
-		<classes>
-			<class name="RequirementsTest"/>
-			<class name="CapabilitiesTest"/>
-		</classes>
-	</test>
-</suite> <!-- Artifacts -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/category.xml b/test-apis-ci/src/main/resources/ci/testSuites/category.xml
deleted file mode 100644
index b6f64fc9e8..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/category.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="category">
-  <test name="Test">
-    <classes>
-      <class name="GroupingTest"/>
-      <class name="SubCategoriesTest"/>
-    </classes>
-  </test> <!-- Test -->
-</suite> <!-- category -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/ciFull.xml b/test-apis-ci/src/main/resources/ci/testSuites/ciFull.xml
deleted file mode 100644
index 35239c7ce1..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/ciFull.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="ciFull" configfailurepolicy="continue" verbose="2">
-  <test name="Category">
-    <classes>
-      <class name="CatalogDataApiTest"/>
-      <class name="GroupingTest">
-        <methods>
-          <exclude name="createProductGroupForNonExistingCategory"/>
-          <exclude name="createProductGroupForNonExistingSunCategory"/>
-          <exclude name="getProductCategoryHierarchySuccessFlow"/>
-        </methods>
-      </class>
-
-      <class name="SubCategoriesTest">
-        <methods>
-          <exclude name="createProductSubCategoryForNonExistingCategory"/>
-          <exclude name="createResourceSubCategoryForNonExistingCategory"/>
-          <exclude name="getResourceCategoryHierarchySuccessFlow"/>
-        </methods>
-      </class>
-    </classes>
-  </test> <!-- Test -->
-  <test name="Distribution">
-    <classes>
-      <class
-        name="AuthanticationTests"/>
-      <class
-        name="DistributionDownloadArtifactTest">
-        <methods>
-          <exclude name="downloadServiceArtifact_ServiceVersionNotFound"/>
-        </methods>
-      </class>
-    </classes>
-  </test> <!-- Test -->
-  <test name="General">
-    <classes>
-      <class name="FeProxyTest"/>
-      <class name="UuidTest"/>
-    </classes>
-  </test>
-  <test name="Resource">
-    <classes>
-      <class name="SimultaneousApiTest"/>
-      <class name="UpdateResourceMetadataTest">
-        <methods>
-          <exclude name="UpdateResourceCategory_negativeFlow"/>
-        </methods>
-      </class>
-      <class name="VFResourceInstanceNameCRUD"/>
-      <class name="ResourceApiTest"/>
-      <class
-        name="ValidateExtendedVfData"/>
-    </classes>
-  </test>
-  <test name="Product">
-    <classes>
-      <class
-        name="ProductUndoCheckoutTest">
-        <methods>
-          <exclude name="undoCheckOutNotExist"/>
-        </methods>
-      </class>
-      <class
-        name="ProductGetFollowedTest"/>
-      <class
-        name="ProductToscaYamlGenerationTest"/>
-      <class name="ProductCheckinTest">
-        <methods>
-          <exclude name="checkInProductNotExist"/>
-        </methods>
-      </class>
-      <class name="ProductCheckoutTest"/>
-      <class
-        name="ProductCreateWithValidationsTest">
-        <methods>
-          <exclude name="createProductDescriptionRemoveSpacesFromBeginning"/>
-          <exclude name="createProductDescriptionRemoveSpacesFromTheEnd"/>
-          <exclude name="createProductDescriptionValidCharacters01"/>
-          <exclude name="createProductDescriptionValidCharacters02"/>
-        </methods>
-      </class>
-    </classes>
-  </test>
-  <test name="Service">
-    <classes>
-      <class
-        name="org.openecomp.sdc.ci.tests.execute.service.ChangeServiceDistributionStatusApiTest">
-        <methods>
-          <exclude name="approveCertifiedService_byDesigner"/>
-          <exclude name="approveCertifiedService_byOps"/>
-          <exclude name="approveCertifiedService_byTester"/>
-          <exclude
-            name="distributionStatusChange_approve_Reject_AprroveBysdncAdminDetails"/>
-          <exclude name="rejectCertifiedService_byDesigner"/>
-          <exclude name="rejectCertifiedService_byOps"/>
-          <exclude name="rejectCertifiedService_byTester"/>
-          <exclude name="rejectCertifiedService_bysdncAdminDetails"/>
-          <exclude name="rejectCertifiedService_bysdncGovernorDeatails"/>
-          <exclude name="rejectNotCertifiedService_checkedin"/>
-          <exclude name="rejectNotCertifiedService_checkeout"/>
-          <exclude name="rejectNotCertifiedService_inProgress"/>
-          <exclude name="rejectNotCertifiedService_readyForCer"/>
-          <exclude name="rejectServiceNotFound"/>
-        </methods>
-      </class>
-      <class name="GetAllServiceVersions"/>
-    </classes>
-  </test>
-  <test name="Artifacts">
-    <classes>
-      <class name="DownloadComponentArt"/>
-      <class name="ValidateHeatArtFieldsTypes"/>
-      <class name="PlaceHolderValidations"/>
-    </classes>
-  </test>
-</suite> 
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml b/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml
deleted file mode 100644
index b83761833e..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="externalApis" configfailurepolicy="continue" verbose="2" parallel="methods" thread-count="1" data-provider-thread-count="8">
-	<test name="ExternalApis"> 
-		<classes>	
-			
-			<class name="VFCMTExternalAPI"/>
-			<class name="CRUDExternalAPI"/>
-			<class name="DeploymentValiditaion"/>
- 			<class name="GetAssetServlet"/>
-			<class name="GetCSARofVF"/>
-			<class name="GetFilteredAssetServlet"/>
-			<class name="GetSpecificAssetMetadataServlet"/>
-			<class name="SearchFilterCategoryExternalAPI"/>
-			<class name="AssetLifeCycle"/>
-			<class name="UserAPIs"/>
-
-			<class name="AnnotationsTest"/>
-
-			
-<!-- 	      <class name="org.openecomp.sdc.ci.tests.execute.product.ChangeServiceInstanceVersionTest"/>
-			      <class name="ProductCheckinTest"/>
-			      <class name="ProductCheckoutTest"/>
-			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductComponentInstanceCRUDTest"/>
-			      <class name="ProductCreateWithValidationsTest"/>
-			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCrudTest"/>
-			      <class name="ProductGetFollowedTest"/>
-			      <class name="ProductUndoCheckoutTest"/>    -->
-			
-			
-		</classes>
-	</test>
-</suite> 
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/general.xml b/test-apis-ci/src/main/resources/ci/testSuites/general.xml
deleted file mode 100644
index 9b988d8b12..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/general.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="General">
-  <test name="Test">
-    <classes>
-      <class name="UuidTest"/>
-    </classes>
-  </test> <!-- Test -->
-</suite> <!-- General -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/imports.xml b/test-apis-ci/src/main/resources/ci/testSuites/imports.xml
deleted file mode 100644
index 3cf3b9833b..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/imports.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Imports">
-  <test name="Imports">
-    <classes>
-      <class name="ImportGenericResourceCITest"/>
-    </classes>
-  </test> <!-- Test -->
-</suite> <!-- Imports -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/normatives.xml b/test-apis-ci/src/main/resources/ci/testSuites/normatives.xml
deleted file mode 100644
index 9676e8f398..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/normatives.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright © 2018 European Support Limited
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="normatives" >
-	<test name="InterfaceLifecycleTypes">
-		<classes>
-			<class name="InterfaceLifecycleTypesTest"/>
-		</classes>
-	</test>
-</suite> 
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/onapApiSanity.xml b/test-apis-ci/src/main/resources/ci/testSuites/onapApiSanity.xml
deleted file mode 100644
index 00f60cb68e..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/onapApiSanity.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="externalApis" configfailurepolicy="continue" verbose="2" parallel="methods" thread-count="1" data-provider-thread-count="1">
-	<parameter name="makeDistribution"  value="false"/>
-	<parameter name="makeToscaValidation"  value="true"/>
-	<test name="ExternalApis"> 
-		<classes>
-			<class name="Onboard"/>
-		</classes>
-	</test>
-</suite>
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/pass.xml b/test-apis-ci/src/main/resources/ci/testSuites/pass.xml
deleted file mode 100644
index 02a314f8e9..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/pass.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="externalApis" configfailurepolicy="continue" verbose="2" parallel="methods" thread-count="1" data-provider-thread-count="1">
-    <parameter name="makeDistribution"  value="false"/>
-    <parameter name="makeToscaValidation"  value="true"/>
-    <test name="passTest">
-
- <classes>
-    <class
-            name="Onboard">
-        <methods>
-            <include name="passTest" />
-        </methods>
-    </class>
-
-    </classes>
-    </test>
-</suite>
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/product.xml b/test-apis-ci/src/main/resources/ci/testSuites/product.xml
deleted file mode 100644
index 72fb68b197..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/product.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Product">
-  <test name="Test">
-    <classes>
-      <class name="ProductLifecycleTest"/>
-      <class name="ProductUndoCheckoutTest"/>
-      <class name="ProductCheckinTest"/>
-      <class name="ProductCheckoutTest"/>
-    </classes>
-  </test> <!-- Test -->
-</suite> <!-- Product -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/productAPIs.xml b/test-apis-ci/src/main/resources/ci/testSuites/productAPIs.xml
deleted file mode 100644
index f3f7f912a1..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/productAPIs.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="productAPIs" configfailurepolicy="continue" verbose="2" parallel="tests"
-  thread-count="6">
-
-  <test name="Test">
-    <classes>
-      <class name="ProductCheckinTest"/>
-      <class name="ProductCheckoutTest"/>
-      <class name="ProductCreateWithValidationsTest"/>
-      <class name="ProductGetFollowedTest"/>
-      <class name="ProductUndoCheckoutTest"/>
-    </classes>
-  </test> <!-- Test -->
-</suite> <!-- Suite -->
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/property.xml b/test-apis-ci/src/main/resources/ci/testSuites/property.xml
deleted file mode 100644
index 2b90f9b2f6..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/property.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Property" >
-  <test name="Test">
-    <classes>
-      <class name="PropertyApisTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyServletTest"/>
-      <class name="AdditionalInformationServletTest"/>
-    </classes>
-  </test> <!-- Test -->
-</suite> <!-- Property -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/resource.xml b/test-apis-ci/src/main/resources/ci/testSuites/resource.xml
deleted file mode 100644
index c9f5558449..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/resource.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Sanity" configfailurepolicy="continue">
-
-  <test verbose="2" name="Sanity">
-    <classes>
-
-      <class name="CatalogDataApiTest"/>
-
-      <class name="AuthanticationTests">
-        <methods>
-          <include name="downloadServiceArtifactSuccessWithAutantication"/>
-        </methods>
-      </class>
-
-      <class
-        name="DistributionDownloadArtifactTest">
-        <methods>
-          <include name="downloadResourceArtifactSuccess"/>
-        </methods>
-      </class>
-
-      <class name="FeProxyTest"/>
-
-      <class name="UuidTest">
-        <methods>
-          <include name="testE2EUuidHeaderReturnedAndPreserved"/>
-        </methods>
-      </class>
-
-      <class name="ImportGenericResourceCITest">
-        <methods>
-          <include name="importAllTestResources"/>
-          <include name="testImportCheckoutAndUpdateUserResource"/>
-          <include name="testImportWithUpdateNormativeType"/>
-        </methods>
-      </class>
-
-      <class name="AdditionalInformationServletTest">
-        <methods>
-          <include name="createResourceAdditionalInformationTestDuringLifecycle"/>
-          <include name="updateResourceAdditionalInformationTest"/>
-          <include name="deleteResourceAdditionalInformationTest"/>
-        </methods>
-      </class>
-
-      <class name="PropertyApisTest">
-        <methods>
-          <include name="testPropertyApis"/>
-        </methods>
-      </class>
-
-      <class name="GetAllResourceVersions">
-        <methods>
-          <include name="getResourceAllVersions_version15"/>
-        </methods>
-      </class>
-
-      <class name="ResourceApiTest">
-        <methods>
-          <include name="updateResourceMetadataSuccess"/>
-        </methods>
-      </class>
-
-      <class name="UpdateResourceMetadataTest">
-        <methods>
-          <include name="UpdateDerivedFromSuccess"/>
-        </methods>
-      </class>
-
-      <class name="GetComponentAuditApiTest">
-        <methods>
-          <include name="testServiceAuditCertifiedVersion"/>
-        </methods>
-      </class>
-
-      <class name="ActivateDeActivateDeleteUser">
-        <methods>
-          <include name="authorizeDeActivatedUser"/>
-        </methods>
-      </class>
-
-      <!-- Product tests start-->
-      <class name="ProductCheckinTest">
-        <methods>
-          <include name="checkInProductByCreator"/>
-        </methods>
-      </class>
-
-      <class name="ProductCheckoutTest">
-        <methods>
-          <include name="checkOutProductByPmNotInContacts"/>
-        </methods>
-      </class>
-
-      <class name="ProductGetFollowedTest">
-        <methods>
-          <include name="followedPageTest"/>
-        </methods>
-      </class>
-      <class name="ProductUndoCheckoutTest">
-        <methods>
-          <include name="undoCheckOutProductByPm"/>
-        </methods>
-      </class>
-      <class name="InterfaceOperationsTest">
-        <methods>
-          <include name="addInterfaceOperationsOfGlobalTypeOnResource"/>
-          <include name="addInterfaceOperationsOnResource"/>
-          <include name="getInterfaceOperationsFromResource"/>
-          <include name="updateInterfaceOperationsOnResource"/>
-          <include name="deleteInterfaceOperationsFromResource"/>
-          <include name="addInterfaceOperationsOfGlobalTypeOnPNFResource"/>
-          <include name="addInterfaceOperationsOnPNFResource"/>
-          <include name="getInterfaceOperationsFromPNFResource"/>
-          <include name="updateInterfaceOperationsOnPNFResource"/>
-          <include name="deleteInterfaceOperationsFromPNFResource"/>
-        </methods>
-      </class>
-      <!-- Product tests end-->
-    </classes>
-  </test> <!-- Test -->
-</suite> <!-- Sanity -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/sanity.xml b/test-apis-ci/src/main/resources/ci/testSuites/sanity.xml
deleted file mode 100644
index 5d21455530..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/sanity.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Sanity" configfailurepolicy="continue" verbose="2">
-
-  <test name="sanityE2Eflows">
-    <classes>
-      <class name="CrudE2E"/>
-    </classes>
-  </test>
-
-  <test name="General">
-    <classes>
-      <class name="FeProxyTest"/>
-      <class name="UuidTest">
-        <methods>
-          <include name="testE2EUuidHeaderReturnedAndPreserved"/>
-        </methods>
-      </class>
-    </classes>
-  </test>
-
-  <test name="ArtifactOnInstance">
-    <classes>
-    </classes>
-  </test>
-
-  <test name="Artifact">
-    <classes>
-      <class
-        name="DownloadComponentArt">
-        <methods>
-          <include name="downloadArtifactFromResourceTest"/>
-          <include name="downloadArtifactFromServiceTest"/>
-        </methods>
-      </class>
-    </classes>
-  </test>
-
-  <test name="Service">
-    <classes>
-      <class
-        name="GetComponentAuditApiTest">
-        <methods>
-          <include name="testServiceAuditCertifiedVersion"/>
-        </methods>
-      </class>
-
-    </classes>
-  </test>
-
-  <test name="Resource">
-    <classes>
-      <class
-        name="GetAllResourceVersions">
-        <methods>
-          <include name="getResourceAllVersions_version15"/>
-        </methods>
-      </class>
-
-      <class name="ResourceApiTest">
-        <methods>
-          <include name="updateResourceMetadataSuccess"/>
-        </methods>
-      </class>
-
-      <class
-        name="UpdateResourceMetadataTest">
-        <methods>
-          <include name="UpdateDerivedFromSuccess"/>
-        </methods>
-      </class>
-    </classes>
-  </test>
-  <test name="Product">
-    <classes>
-      <class name="ProductCheckinTest">
-        <methods>
-          <include name="checkInProductByCreator"/>
-        </methods>
-      </class>
-      <class name="ProductCheckoutTest">
-        <methods>
-          <include name="checkOutProductByPmNotInContacts"/>
-        </methods>
-      </class>
-      <class
-        name="ProductGetFollowedTest">
-        <methods>
-          <include name="followedPageTest"/>
-        </methods>
-      </class>
-      <class
-        name="ProductUndoCheckoutTest">
-        <methods>
-          <include name="undoCheckOutProductByPm"/>
-        </methods>
-      </class>
-      <!-- Product tests end -->
-    </classes>
-  </test>
-  <test name="Catalog">
-    <classes>
-      <class name="CatalogDataApiTest"/>
-    </classes>
-  </test>
-
-  <test name="distribution">
-    <classes>
-      <class
-        name="AuthanticationTests">
-        <methods>
-          <include name="downloadServiceArtifactSuccessWithAutantication"/>
-        </methods>
-      </class>
-
-      <class
-        name="DistributionDownloadArtifactTest">
-        <methods>
-          <include name="downloadResourceArtifactSuccess"/>
-        </methods>
-      </class>
-    </classes>
-  </test>
-
-  <test name="Category">
-    <classes>
-    </classes>
-  </test>
-
-  <test name="Imports">
-    <classes>
-      <class
-        name="ImportGenericResourceCITest">
-        <methods>
-          <include name="importAllTestResources"/>
-          <include name="testImportCheckoutAndUpdateUserResource"/>
-          <include name="testImportWithUpdateNormativeType"/>
-        </methods>
-      </class>
-      <class
-        name="ImportToscaCapabilitiesWithProperties">
-        <methods>
-          <include name="importNodeTypeWithCapabilityWithPropertiesFromYmlSucceed"/>
-          <include
-            name="importResourceWithCapabilityWithPropertiesOverridingCapTypePropertiesSucceed"/>
-        </methods>
-      </class>
-    </classes>
-  </test> <!-- Test -->
-
-  <test name="attribute">
-    <classes>
-      <class
-        name="ComponentInstanceAttributeTest">
-        <methods>
-          <include name="testUpdateAttributeOnResourceInstance"/>
-        </methods>
-      </class>
-    </classes>
-  </test>
-
-  <test name="inputs">
-    <classes>
-      <class
-        name="InputsApiTests">
-        <methods>
-          <include name="testInputsMainFunctionality"/>
-        </methods>
-      </class>
-    </classes>
-  </test>
-
-  <test name="property">
-    <classes>
-      <class
-        name="AdditionalInformationServletTest">
-        <methods>
-          <include name="createResourceAdditionalInformationTestDuringLifecycle"/>
-          <include name="updateResourceAdditionalInformationTest"/>
-          <include name="deleteResourceAdditionalInformationTest"/>
-        </methods>
-      </class>
-
-      <class name="PropertyApisTest">
-        <methods>
-          <include name="testPropertyApis"/>
-        </methods>
-      </class>
-      <class name="ComponentInstancePropertyTest">
-        <methods>
-          <include name="nestedVfResourceProperty3Levels"/>
-        </methods>
-      </class>
-
-    </classes>
-  </test>
-
-  <test name="User">
-    <classes>
-
-    </classes>
-  </test>
-
-  <test name="ExternalApis">
-    <classes>
-      <class name="GetAssetServlet">
-        <methods>
-          <include name="getResourceAssetSuccess"/>
-        </methods>
-      </class>
-      <class name="GetFilteredAssetServlet">
-        <methods>
-          <include name="getResourceAssetBySpecifiedCategoryAndSubCategory"/>
-          <include name="getServiceAssetBySpecifiedCategoryAndDistributionStatus"/>
-        </methods>
-      </class>
-      <class name="GetSpecificAssetMetadataServlet">
-        <methods>
-          <include name="getResourceAssetMetadataWithResourceInstancesSuccess"/>
-          <include
-            name="getServiceAssetMetadataWithCertifiedResourceInstancesAndArtifactsOnRIsAndServiceSuccess"/>
-        </methods>
-      </class>
-    </classes>
-  </test>
-
-
-</suite>
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/service.xml b/test-apis-ci/src/main/resources/ci/testSuites/service.xml
deleted file mode 100644
index 89f4819cc1..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/service.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Service">
-  <test name="Service">
-    <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.service.ChangeServiceDistributionStatusApiTest"/>
-      <class name="GetAllServiceVersions"/>
-      <class name="InterfaceOperationsTest">
-        <methods>
-          <include name="addInterfaceOperationsOnService"/>
-          <include name="getInterfaceOperationsFromService"/>
-          <include name="updateInterfaceOperationsOnService"/>
-          <include name="deleteInterfaceOperationsFromService"/>
-          <include name="testCreateOperationWithLocalInterfaceAndDownloadArtifact"/>
-        </methods>
-      </class>
-    </classes>
-  </test>
-</suite> <!-- Service -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/testngLifeCycle.xml b/test-apis-ci/src/main/resources/ci/testSuites/testngLifeCycle.xml
deleted file mode 100644
index f65ef786e2..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/testngLifeCycle.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="lifeCycle">
-  <test name="Test">
-    <classes>
-      <class name="LCSbaseTest"/>
-    </classes>
-  </test> <!-- Test -->
-</suite> <!-- lifeCycle -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/user.xml b/test-apis-ci/src/main/resources/ci/testSuites/user.xml
deleted file mode 100644
index b4a5b932fd..0000000000
--- a/test-apis-ci/src/main/resources/ci/testSuites/user.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="User">
-  <test name="Test">
-    <classes>
-      <class name="ActivateDeActivateDeleteUser"/>
-    </classes>
-  </test> <!-- Test -->
-</suite> <!-- User -->