Optimize Build

Optimize the log output

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

34 files changed, 0 insertions, 1452 deletions

diff --git a/test-apis-ci/src/main/resources/ci/conf/attsdc-packages.yaml b/test-apis-ci/src/main/resources/ci/conf/attsdc-packages.yaml
deleted file mode 100644
index 5d1a3e1537..0000000000
--- a/test-apis-ci/src/main/resources/ci/conf/attsdc-packages.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-packages:
- - org.openecomp.sdc.ci.tests.execute.general
- - org.openecomp.sdc.ci.tests.execute.user
- - org.openecomp.sdc.ci.tests.execute.property
- - org.openecomp.sdc.ci.tests.execute.lifecycle
- - org.openecomp.sdc.ci.tests.execute.resource
- - org.openecomp.sdc.ci.tests.execute.service
- - org.openecomp.sdc.ci.tests.execute.artifacts
- - org.openecomp.sdc.ci.tests.execute.imports
- - org.openecomp.sdc.ci.tests.execute.category
- - org.openecomp.sdc.ci.tests.execute.distribution  
- - org.openecomp.sdc.ci.tests.execute.product
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/conf/attsdc.yaml b/test-apis-ci/src/main/resources/ci/conf/attsdc.yaml
deleted file mode 100644
index 4ef9ce4ccd..0000000000
--- a/test-apis-ci/src/main/resources/ci/conf/attsdc.yaml
+++ /dev/null
@@ -1,101 +0,0 @@
-outputFolder: target
-reportName: index.html
-catalogBeHost: 192.168.33.10
-catalogFeHost: fehost
-#QA-SCRUM1
-#catalogBeHost: 135.21.125.97
-#catalogFeHost: 135.21.125.89
-#Automate
-#catalogBeHost: 135.63.125.67
-#catalogFeHost: 135.63.125.63
-esHost: eshost
-disributionClientHost: disClient
-catalogFePort: 8181
-catalogBePort: 8080
-disributionClientPort: 8181
-isDistributionClientRunning: true
-esPort: 9200
-neoHost: neoHost
-neoPort: 7474
-neoDBusername: neo4j	
-neoDBpassword: 123456
-windowsDownloadDirectory: "c:\\apache-ftpserver-1.1.0\\res\\home"
-systemUnderDebug: false
-resourceConfigDir: src/test/resources/CI/tests
-componentsConfigDir: src/test/resources/CI/components
-importResourceConfigDir: ../catalog-be/src/main/resources/import/tosca/capability-types
-importResourceTestsConfigDir: src/test/resources/CI/importResourceTests
-errorConfigurationFile: ../catalog-be/src/main/resources/config/error-configuration.yaml
-configurationFile: ../catalog-be/src/main/resources/config/configuration.yaml
-importTypesConfigDir: src/test/resources/CI/importTypesTest
-
-
-janusGraphPropertiesFile: src/main/resources/ci/conf/janusgraph.properties
-cassandraHost: 127.0.0.1
-cassandraAuthenticate: false
-cassandraUsername: koko
-cassandraPassword: bobo
-cassandraSsl: false
-cassandraTruststorePath : /path/path
-cassandraTruststorePassword : 123123
-cassandraAuditKeySpace: sdcaudit
-cassandraArtifactKeySpace: sdcartifact
-url: http://localhost:8285/sdc1
-
-sdcHttpMethod: http
-localDataCenter: DC-Automate01
-
-stopOnClassFailure: false
-
-#List of non-abstract resources to keep during janus graph cleanup between tests
-#Only 1.0 version will be kept
-resourcesNotToDelete:
-     - Compute
-     - Database
-     - ObjectStorage
-     - BlockStorage
-     - LoadBalancer
-     - Port
-     - Network
-     - Root
-     - ContainerApplication
-     - ContainerRuntime
-     - DBMS
-     - SoftwareComponent
-     - WebApplication
-     - WebServer
-     - CinderVolume
-     - ContrailVirtualNetwork
-     - NeutronNet
-     - NeutronPort
-     - NovaServer
-     - AbstractSubstitute
-     - ContrailAbstractSubstitute
-     - ContrailCompute
-     - ContrailNetworkRules
-     - ContrailPort
-     - ContrailV2NetworkRules
-     - ContrailV2VirtualMachineInterface
-     - ContrailV2VirtualNetwork
-     - ContrailVirtualNetwork
-     - VL ELINE
-     - SecurityRules
-     - VL
-
-#Resource categories to keep (including all their subcategories)
-resourceCategoriesNotToDelete:
-     - Generic
-     - Network L2-3
-     - Network L4+
-     - Application L4+
-     - Network Connectivity
-     - DCAE Component
-     - Template
-     - Allotted Resource
-
-#Service categories to keep
-serviceCategoriesNotToDelete:
-     - Mobility
-     - Network L1-3
-     - Network L4+
-     - VoIP Call Control
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/conf/credentials.yaml b/test-apis-ci/src/main/resources/ci/conf/credentials.yaml
deleted file mode 100644
index 19dc605a1f..0000000000
--- a/test-apis-ci/src/main/resources/ci/conf/credentials.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-    designer: {
-        username: cs0008,
-        password: 123123a,
-        firstname: SDC,
-        lastname: SDC2
-    }
-    admin: {
-        username: jh0003,
-        password: 123123a,
-        firstname: SDC,
-        lastname: SDC2
-    }
-    ops: {
-        username: af0006,
-        password: 123123a,
-        firstname: SDC,
-        lastname: SDC2
-    }
-    tester: {
-        username: kb0004,
-        password: 123123a,
-        firstname: SDC,
-        lastname: SDC2
-    }
-    governor: {
-        username: ah0002,
-        password: 123123a,
-        firstname: SDC,
-        lastname: SDC2
-    }
-    product_strategist: {
-        username: m99126,
-        password: 1910-FruitGum,
-        firstname: SDC,
-        lastname: SDC2
-    }
-    product_manager: {
-        username: m99127,
-        password: 747-Airplane,
-        firstname: SDC,
-        lastname: SDC2
-    }
-    product_local: {
-        username: pm0001,
-        password: 123123a,
-        firstname: SDC,
-        lastname: SDC2
-    }
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/conf/extent-config.xml b/test-apis-ci/src/main/resources/ci/conf/extent-config.xml
deleted file mode 100644
index 4eb7f681aa..0000000000
--- a/test-apis-ci/src/main/resources/ci/conf/extent-config.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<extentreports>
-    <configuration>
-        <!-- report theme -->
-        <!-- standard, dark -->
-        <theme>standard</theme>
-    
-        <!-- document encoding -->
-        <!-- defaults to UTF-8 -->
-        <encoding>UTF-8</encoding>
-        
-        <!-- protocol for script and stylesheets -->
-        <!-- defaults to https -->
-        <protocol>https</protocol>
-        
-        <!-- title of the document -->
-        <documentTitle>ASDC Automation Report</documentTitle>
-        
-        <!-- report name - displayed at top-nav -->
-        <reportName> ASDC Automation Report </reportName>
-        
-        <!-- report headline - displayed at top-nav, after reportHeadline -->
-        <reportHeadline></reportHeadline>
-        
-        <!-- global date format override -->
-        <!-- defaults to yyyy-MM-dd -->
-        <dateFormat>yyyy-MM-dd</dateFormat>
-        
-        <!-- global time format override -->
-        <!-- defaults to HH:mm:ss -->
-        <timeFormat>HH:mm:ss</timeFormat>
-        
-        <!-- custom javascript -->
-        <scripts>
-            <![CDATA[
-                $(document).ready(function() {
-                    $('.logo-content' ).remove();
-                    $('.charts div:nth-child(2)').remove();  
-                });
-            ]]>
-        </scripts>
-        
-        <!-- custom styles -->
-        <styles>
-            <![CDATA[
-                .report-name {padding-top: 1px; font-size: 15px; font-weight: bold;}
-            ]]>
-        </styles>
-    </configuration>
-</extentreports>
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/conf/janusgraph.properties b/test-apis-ci/src/main/resources/ci/conf/janusgraph.properties
deleted file mode 100644
index ea498bb7da..0000000000
--- a/test-apis-ci/src/main/resources/ci/conf/janusgraph.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-storage.backend=cql
-storage.hostname=localhost
-storage.port=9042
-
-cache.db-cache = false
-cache.db-cache-clean-wait = 20
-cache.db-cache-time = 180000
-cache.db-cache-size = 0.5
-
-cache.tx-cache-size = 500000
-storage.cql.keyspace=sdctitan
diff --git a/test-apis-ci/src/main/resources/ci/conf/log4j2.properties b/test-apis-ci/src/main/resources/ci/conf/log4j2.properties
deleted file mode 100644
index a8944dba13..0000000000
--- a/test-apis-ci/src/main/resources/ci/conf/log4j2.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-status = error
-dest = err
-name = PropertiesConfig
-
-property.filename = ${targetlog}logs/ci-log.out
-
-#filter.threshold.type = ThresholdFilter
-#filter.threshold.level = debug
-
-appender.rolling.type = RollingFile
-appender.rolling.name = RollingFile
-appender.rolling.fileName = ${filename}
-appender.rolling.filePattern = ${targetlog}logs/ci-%d{MM-dd-yy-HH-mm-ss}-%i.log.gz
-appender.rolling.layout.type = PatternLayout
-appender.rolling.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %5p [%10c] : %m%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size=5MB
-appender.rolling.strategy.type = DefaultRolloverStrategy
-appender.rolling.strategy.max = 10
-
-appender.console.type = Console
-appender.console.name = STDOUT
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %5p %10c:%L - %m%n
-appender.console.filter.threshold.type = ThresholdFilter
-appender.console.filter.threshold.level = info
-
-logger.rolling.name = RollingAppender
-logger.rolling.level = info
-logger.rolling.additivity = false
-logger.rolling.appenderRef.rolling.ref = RollingFile
-
-logger.org.apache.cassandra.service.StorageProxy.level=info
-logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction.level =info
-logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction.appendRef.rolling.ref = RollingFile
-logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction.appendRef.stdout.ref = STDOUT
-
-logger.org.openecomp.sdc.ci.tests.utils.level = info
-logger.org.openecomp.sdc.ci.tests.utils.appendRef.rolling.ref = RollingFile
-logger.org.openecomp.sdc.ci.tests.utils.appendRef.stdout.ref = STDOUT
-logger.org.openecomp.sdc.ci.tests.utils.additivity = false
-
-rootLogger.level = info
-rootLogger.appenderRef.stdout.ref = STDOUT
-rootLogger.appenderRef.rolling.ref = RollingFile
diff --git a/test-apis-ci/src/main/resources/ci/conf/log4j2.xml b/test-apis-ci/src/main/resources/ci/conf/log4j2.xml
deleted file mode 100644
index 5295d45a47..0000000000
--- a/test-apis-ci/src/main/resources/ci/conf/log4j2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="ERROR">
-	<Appenders>
-		<File name="fileAppender" fileName="logfile.log" append="false">
-			<PatternLayout pattern="%d %-5p [%c{1}] %m %n"/>
-		</File>
-	</Appenders>
-	<Loggers>
-		<Root level="info">
-			<AppenderRef ref="fileAppender"/>
-		</Root>
-	</Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/conf/testngLifeCycle.xml b/test-apis-ci/src/main/resources/ci/conf/testngLifeCycle.xml
deleted file mode 100644
index 6188116210..0000000000
--- a/test-apis-ci/src/main/resources/ci/conf/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" parallel="none">
-  <test name="Test">
-    <classes>
-      <class name="LCSbaseTest"/>
-    </classes>
-  </test> <!-- Test -->
-</suite> <!-- lifeCycle -->
diff --git a/test-apis-ci/src/main/resources/ci/conf/truststore b/test-apis-ci/src/main/resources/ci/conf/truststore
deleted file mode 100644
index bdec93d862..0000000000
--- a/test-apis-ci/src/main/resources/ci/conf/truststore
+++ /dev/null
diff --git a/test-apis-ci/src/main/resources/ci/scripts/addUsersFromList_new.sh b/test-apis-ci/src/main/resources/ci/scripts/addUsersFromList_new.sh
deleted file mode 100644
index e695db26b2..0000000000
--- a/test-apis-ci/src/main/resources/ci/scripts/addUsersFromList_new.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-function help_usage ()
-{
-	echo "$0 -ip <ip> -f <userToAdd_file>"
-	echo "for example: -ip 127.0.0.1 -f /var/tmp/userToAdd.txt"
-	exit
-}
-
-function check_file_existance ()
-{
-echo "check_file_existance $1"
-if [ $1 == "" ]; then
-        echo "Please provide full path to user file"
-        exit;
-elif [ -f $1 ]; then
-        source $1
-	USERS=("${USER_LIST[@]}")
-        echo "file exist" $1
-else
-        echo "Provided user file does not exist"
-        exit
-fi
-}
-
-function check_ip_existance ()
-{
-if [ $1 == "" ]; then
-        echo "Please provide ip address"
-        exit;
-fi
-}
-
-function addUser ()
-{
-	#for user in "${USER_LIST[@]}"; do
-	for user in "${USERS[@]}"; do
-		PING=`ping -c 1 $IP  > /var/tmp/ping.log`
-		pattern1='100% packet loss'
-		pattern2='Host Unreachable'
-		COUNT=`egrep -c "$pattern1|$pattern2" /var/tmp/ping.log`
-		if [ $COUNT -eq 0 ]; then
-		#	curl -i -X post -d '{ "userId" : "kk1123", "role" : "ADMIN" }'  -H "Content-Type: application/json" -H "USER_ID: jh0003" http://192.168.111.9:8080/sdc2/rest/v1/user
-			userId=`echo $user|awk '{print $1}'`
-			role=`echo $user|awk '{print $2}'`
-            firstName=`echo $user|awk '{print $3}'`
-            lastName=`echo $user|awk '{print $4}'`
-            email=`echo $user|awk '{print $5}'`
-			curl --noproxy '*' -i -X post -d '{ "userId" : "'${userId}'", "role" : "'${role}'", "firstName" : "'${firstName}'", "lastName" : "'${lastName}'", "email" : "'${email}'" }'  -H "Content-Type: application/json" -H "USER_ID: jh0003" https://${IP}:8443/sdc2/rest/v1/user
-		else
-			echo "Host" $IP "Is Unreachable"
-		fi
-	done
-curl --noproxy '*' -i -X post -d '{"consumerName": "ci","consumerSalt": "2a1f887d607d4515d4066fe0f5452a50","consumerPassword": "0a0dc557c3bf594b1a48030e3e99227580168b21f44e285c69740b8d5b13e33b"}'  -H "Content-Type: application/json" -H "USER_ID: jh0003" -H "Authorization:Basic Y2k6MTIzNDU2" https://${IP}:8443/sdc2/rest/v1/consumers
-	
-}
-
-#main
-[ $# -eq 0 ] && help_usage
-while [ $# -ne 0 ]; do
-	case $1 in
-		"-f")
-			USER_FILE=$2
-			shift 1
-			shift 1
-		;;	
-		-ip)
-			IP=$2
-			shift 1
-			shift 1
-		;;
-		*)
-#			help_usage
-		;;
-	esac
-done
-
-check_file_existance $USER_FILE
-check_ip_existance $IP
-addUser
diff --git a/test-apis-ci/src/main/resources/ci/scripts/copyToStorage.sh b/test-apis-ci/src/main/resources/ci/scripts/copyToStorage.sh
deleted file mode 100644
index b7b8c09715..0000000000
--- a/test-apis-ci/src/main/resources/ci/scripts/copyToStorage.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-REPORT_NAME=$1
-VERSION=$2
-ENV=$3
-
-if [ -z "$REPORT_NAME" ]
- then
-        source ExtentReport/versions.info
-        now=$(date -d '+7 hour' "+%Y-%m-%d_%H_%M")
-        REPORT_NAME="${now}"
-        VERSION="${osVersion}"
-                if [[ $env == *"DEV20"* ]]
-                        then
-                                ENV="Nightly"
-                        else
-                                ENV=""
-                        fi
-
- fi
- 
-source conf/attInternal.info
-IP=$automationResutlsRepo
-PASS=$automationResutlsRepoPass
-
-echo ${IP}
-
-/usr/bin/expect  << EOF
-spawn ssh admin@${IP} mkdir -p -m 775 /home/admin/reports/${ENV}/${VERSION}/APIs/
-
-expect {
-  -re ".*es.*o.*" {
-    exp_send "yes\r"
-    exp_continue
-  }
-  -re ".*sword.*" {
-    exp_send ${PASS}\r
-  }
-}
-
-expect eof
-
-spawn scp -r ExtentReport admin@${IP}:/home/admin/reports/${ENV}/${VERSION}/APIs/${REPORT_NAME}/
-
-expect {
-  -re ".*es.*o.*" {
-    exp_send "yes\r"
-    exp_continue
-  }
-  -re ".*sword.*" {
-    exp_send ${PASS}\r
-  }
-}
-
-expect eof
-
-spawn ssh admin@${IP} chmod -R 775 /home/admin/reports/${ENV}/${VERSION}/APIs/${REPORT_NAME}/
-
-expect {
-  -re ".*es.*o.*" {
-    exp_send "yes\r"
-    exp_continue
-  }
-  -re ".*sword.*" {
-    exp_send ${PASS}\r
-  }
-}
-
-expect eof
-
-EOF
diff --git a/test-apis-ci/src/main/resources/ci/scripts/sendMail.sh b/test-apis-ci/src/main/resources/ci/scripts/sendMail.sh
deleted file mode 100644
index 979d091d00..0000000000
--- a/test-apis-ci/src/main/resources/ci/scripts/sendMail.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-now=$(date +'%Y%-m%d%H%M')
-
-REPORT_NAME=$1
-VERSION=$2
-ENV=$3
-
-RECIPIENTS1="md9897@att.com,NETCOM_ASDC_DEV@att.com,IL-D2-QA-Alex@att.com,bs5719@att.com,yg356h@att.com,yr9970@att.com,sl615n@att.com,yn813h@att.com,as221v@att.com,ms172g@att.com,ma2244@att.com,el489u@att.com,gg980r@att.com,ak991p@att.com,bv095y@att.com,ms656r@att.com,df502y@att.com,bt750h@att.com,ln699k@att.com,hm104p@att.com"
-#RECIPIENTS2="dl-asdcqa@intl.att.com"
-RECIPIENTS2="md9897@att.com,NETCOM_ASDC_DEV@att.com,IL-D2-QA-Alex@att.com,bs5719@att.com,yg356h@att.com,yr9970@att.com,sl615n@att.com,yn813h@att.com,as221v@att.com,ms172g@att.com,ma2244@att.com,el489u@att.com,gg980r@att.com,ak991p@att.com,bv095y@att.com,ms656r@att.com,df502y@att.com,bt750h@att.com,ln699k@att.com,hm104p@att.com"
-source ExtentReport/versions.info
-if [ -z "$REPORT_NAME" ]
- then
-        now=$(date -d '+7 hour' "+%Y-%m-%d_%H_%M")
-        REPORT_NAME="${now}"
-        VERSION="${osVersion}"
-fi
-
-if [[ $env == *"DEV20"* ]]
-    then
-       ENV="Nightly"
-       RECIPIENTS=$RECIPIENTS1
-    else
-       ENV=""
-       RECIPIENTS=$RECIPIENTS2
-fi
-
-
-#REPORT_ZIP_FILE=ExtentReport_${now}.zip
-REPORT_FOLDER='ExtentReport'
-REPORT_HTML_FILE=${REPORT_FOLDER}/*Report.html
-BODY_MESSAGE='Hello, \n\n Please find automation results on following link: \n\n http://asdc-srv-210-45.tlv.intl.att.com/'${ENV}'/'${VERSION}'/APIs/'${REPORT_NAME}'/SDC_CI_Extent_Report.html \n\nThanks, \nSDC QA Team\n\n '
-
-#OLD_FILE=$(find ./ -type f -name ${REPORT_ZIP_FILE} -print)
-#if [ ! -z ${OLD_FILE} ]
-#then
-#        rm -f ${REPORT_ZIP_FILE}
-#        echo "Removing old zip file............"
-#fi
-
-#echo "Creating new zip file"
-#zip -r ${REPORT_ZIP_FILE} ./${REPORT_FOLDER}
-
-
-echo -e ${BODY_MESSAGE} | mail -s 'External APIs Automation '$ENV' results - ASDC '$VERSION -r 'ASDC@Automation.team' $RECIPIENTS
diff --git a/test-apis-ci/src/main/resources/ci/scripts/startTest.sh b/test-apis-ci/src/main/resources/ci/scripts/startTest.sh
deleted file mode 100644
index f8285ef506..0000000000
--- a/test-apis-ci/src/main/resources/ci/scripts/startTest.sh
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/bin/bash
-REMOTE_DEBUG=false
-RERUN=false
-JAVA_OPTION=""
-debug_port=8000
-TEST_SUITES=testSuites
-fileName=testng-failed.xml
-
-function help_usage ()
-{
-	echo
-	echo "$0 (<jar_file_name> <suite file name>) [-r/rerun <true/false> -d/debug <true/false>]"
-	echo "nohup ./startTest.sh ui-ci-1707.0.5-SNAPSHOT-jar-with-dependencies.jar extendedSanity.xml -r false -d true &"
-	echo "by default rerun is true and remote debug is false."
-	echo
-	exit 2
-}
-
-function isBoolean ()
-{
-	PARAM_NAME=$1
-	VALUE=$2
-	if [[ ${VALUE} != "true" ]] && [[ ${VALUE} != "false" ]]; then
-		echo "Valid parameter" ${PARAM_NAME} "values are: true/false"
-	        help_usage
-	fi	
-}
-
-function prepareFailedXmlFile ()
-{	
-	echo "1="$1 "2="$2 "fileName="${fileName}
-	PATTERN=`grep -w "test name=" ${FULL_PATH}/${TEST_SUITES}/$2 | awk -F'"' '{print $2}'`
-	sed '/<test name="'${PATTERN}'"/,/<!-- '${PATTERN}' --/d' $1 > ${FULL_PATH}/${TEST_SUITES}/${fileName}
-    sed -i 's/thread-count="[0-9]\+"/thread-count="1"/g' ${FULL_PATH}/${TEST_SUITES}/${fileName}
-}
-
-#main
-[ $# -lt 2 ] && help_usage
-
-JAR_FILE=$1
-SUITE_FILE=$2
-
-while [ $# -ne 0 ]; do
-	case $1 in
-		-r|rerun)
-			RERUN=$2
-            		isBoolean $1 ${RERUN}
-			shift 1
-			shift 1
-		;;
-		-d|debug)
-			REMOTE_DEBUG=$2
-           		isBoolean $1 ${REMOTE_DEBUG}
-			shift 1
-			shift 1
-		;;		
-		*)
-			shift 1
-		;;
-	esac
-done
-
-CURRENT_DIR=`pwd`
-BASEDIR=$(dirname $0)
-
-if [ ${BASEDIR:0:1} = "/" ]
-then
-        FULL_PATH=$BASEDIR
-else
-        FULL_PATH=$CURRENT_DIR/$BASEDIR
-fi
-LOGS_PROP_FILE=file:${FULL_PATH}/conf/log4j2.properties
-#############################################
-TARGET_DIR=${FULL_PATH}/target
-CONF_FILE=${FULL_PATH}/conf/attsdc.yaml
-
-DEBUG=true
-MainClass=org.openecomp.sdc.ci.tests.run.StartTest
-
-TESTS_DIR=/opt/app/sdc/ci/resources/tests
-COMPONENTS_DIR=/opt/app/sdc/ci/resources/components
-
-
-TARGET_LOG_DIR="${TARGET_DIR}/"
-
-######ADD USERS################
-
-BE_IP=`cat conf/attsdc.yaml | grep catalogBeHost| awk '{print $2}'`
-
-ADD_USERS_SCRIPT="addUsersFromList_new.sh"
-USER_LIST="conf/userList.txt"
-chmod +x ${ADD_USERS_SCRIPT}
-echo "add users..."
-./${ADD_USERS_SCRIPT} -ip ${BE_IP} -f ${USER_LIST}
-
-
-
-if [ ${REMOTE_DEBUG} == "true" ]; then
-    echo "Debug mode, Listen on port $debug_port";
-    JAVA_OPTION="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${debug_port}" ;
-fi  
-
-cmd="java -Xmx2048m -Xms1024m $JAVA_OPTION -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -Dfilepath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -Dorg.freemarker.loggerLibrary=none -cp $JAR_FILE ${MainClass} $SUITE_FILE &"
-
-
-if [ $DEBUG == "true" ]
-then
-	$cmd
-else
-	$cmd >> /dev/null
-fi
-
-if [ ${RERUN} == "true" ]; then
-    if [ -f ${TARGET_DIR}/${fileName} ]; then
-        echo "Prepare" ${TARGET_DIR}/${fileName} "file to rerun all failed tests ...";
-        prepareFailedXmlFile ${TARGET_DIR}/${fileName} $SUITE_FILE;
-        SUITE_FILE=${fileName};
-	cmd="java -Xmx2048m -Xms1024m $JAVA_OPTION -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -Dfilepath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -Dorg.freemarker.loggerLibrary=none -cp $JAR_FILE ${MainClass} $SUITE_FILE &"
-        $cmd;
-    fi
-fi
-
-status=`echo $?`
-
-source ExtentReport/versions.info
-now=$(date +'%Y-%m-%d_%H_%M')
-REPORT_NAME=${now}
-VERSION=${osVersion}
-
-if [[ $env == *"DEV20"* ]]
-then
-        MYENV="Nightly"
-else
-	MYENV=""
-fi
-
-COPY_REPORT_SCRIPT="copyToStorage.sh"
-chmod +x ${COPY_REPORT_SCRIPT}
-echo "copy report to storage..."
-( ./${COPY_REPORT_SCRIPT} ${REPORT_NAME} ${VERSION} ${MYENV} )
-
-
-MAILING_SCRIPT_NAME="sendMail.sh"
-chmod +x ${MAILING_SCRIPT_NAME}
-echo "Sending report via mail..."
-`./${MAILING_SCRIPT_NAME} ${REPORT_NAME} ${VERSION} ${MYENV}`
-
-
-echo "##################################################"
-echo "################# status is ${status} #################" 
-echo "##################################################"
-
-exit $status
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 -->