From a5445100050e49e83f73424198d73cd72d672a4d Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 4 Mar 2018 14:53:33 +0200 Subject: Sync Integ to Master Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74 Issue-ID: SDC-977 Signed-off-by: Gitelman, Tal (tg851x) --- .../main/resources/ci/conf/attsdc-packages.yaml | 11 - asdc-tests/src/main/resources/ci/conf/attsdc.yaml | 91 ------ .../src/main/resources/ci/conf/log4j.properties | 34 --- .../src/main/resources/ci/conf/testngLifeCycle.xml | 27 -- .../src/main/resources/ci/conf/titan.properties | 8 - asdc-tests/src/main/resources/ci/conf/truststore | Bin 971 -> 0 bytes .../src/main/resources/ci/scripts/startTest.sh | 88 ------ .../main/resources/ci/testSuites/CRUDArtifacts.xml | 40 --- .../resources/ci/testSuites/SearchExternalAPI.xml | 23 -- .../src/main/resources/ci/testSuites/artifacts.xml | 19 -- .../src/main/resources/ci/testSuites/category.xml | 11 - .../src/main/resources/ci/testSuites/ciFull.xml | 174 ----------- .../main/resources/ci/testSuites/externalApis.xml | 14 - .../src/main/resources/ci/testSuites/general.xml | 11 - .../src/main/resources/ci/testSuites/imports.xml | 12 - .../src/main/resources/ci/testSuites/property.xml | 11 - .../src/main/resources/ci/testSuites/resource.xml | 320 -------------------- .../src/main/resources/ci/testSuites/sanity.xml | 330 --------------------- .../src/main/resources/ci/testSuites/service.xml | 15 - .../resources/ci/testSuites/testngLifeCycle.xml | 27 -- .../src/main/resources/ci/testSuites/user.xml | 18 -- 21 files changed, 1284 deletions(-) delete mode 100644 asdc-tests/src/main/resources/ci/conf/attsdc-packages.yaml delete mode 100644 asdc-tests/src/main/resources/ci/conf/attsdc.yaml delete mode 100644 asdc-tests/src/main/resources/ci/conf/log4j.properties delete mode 100644 asdc-tests/src/main/resources/ci/conf/testngLifeCycle.xml delete mode 100644 asdc-tests/src/main/resources/ci/conf/titan.properties delete mode 100644 asdc-tests/src/main/resources/ci/conf/truststore delete mode 100644 asdc-tests/src/main/resources/ci/scripts/startTest.sh delete mode 100644 asdc-tests/src/main/resources/ci/testSuites/CRUDArtifacts.xml delete mode 100644 asdc-tests/src/main/resources/ci/testSuites/SearchExternalAPI.xml delete mode 100644 asdc-tests/src/main/resources/ci/testSuites/artifacts.xml delete mode 100644 asdc-tests/src/main/resources/ci/testSuites/category.xml delete mode 100644 asdc-tests/src/main/resources/ci/testSuites/ciFull.xml delete mode 100644 asdc-tests/src/main/resources/ci/testSuites/externalApis.xml delete mode 100644 asdc-tests/src/main/resources/ci/testSuites/general.xml delete mode 100644 asdc-tests/src/main/resources/ci/testSuites/imports.xml delete mode 100644 asdc-tests/src/main/resources/ci/testSuites/property.xml delete mode 100644 asdc-tests/src/main/resources/ci/testSuites/resource.xml delete mode 100644 asdc-tests/src/main/resources/ci/testSuites/sanity.xml delete mode 100644 asdc-tests/src/main/resources/ci/testSuites/service.xml delete mode 100644 asdc-tests/src/main/resources/ci/testSuites/testngLifeCycle.xml delete mode 100644 asdc-tests/src/main/resources/ci/testSuites/user.xml (limited to 'asdc-tests/src/main/resources/ci') diff --git a/asdc-tests/src/main/resources/ci/conf/attsdc-packages.yaml b/asdc-tests/src/main/resources/ci/conf/attsdc-packages.yaml deleted file mode 100644 index fae7ab7ece..0000000000 --- a/asdc-tests/src/main/resources/ci/conf/attsdc-packages.yaml +++ /dev/null @@ -1,11 +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 \ No newline at end of file diff --git a/asdc-tests/src/main/resources/ci/conf/attsdc.yaml b/asdc-tests/src/main/resources/ci/conf/attsdc.yaml deleted file mode 100644 index 10bf38f89d..0000000000 --- a/asdc-tests/src/main/resources/ci/conf/attsdc.yaml +++ /dev/null @@ -1,91 +0,0 @@ -outputFolder: target -reportName: index.html -catalogBeHost: behost -catalogFeHost: fehost -esHost: eshost -disributionClientHost: disClient -catalogFePort: 8181 -catalogBePort: 8080 -disributionClientPort: 8181 -isDistributionClientRunning: true -esPort: 9200 -neoHost: neoHost -neoPort: 7474 -neoDBusername: neo4j -neoDBpassword: 123456 - -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 - - -titanPropertiesFile: src/main/resources/ci/conf/titan.properties -cassandraHost: 127.0.0.1 -cassandraAuthenticate: false -cassandraUsername: koko -cassandraPassword: bobo -cassandraSsl: false -cassandraTruststorePath : /path/path -cassandraTruststorePassword : 123123 -cassandraAuditKeySpace: sdcaudit -cassandraArtifactKeySpace: sdcartifact - - -stopOnClassFailure: false - -#List of non-abstract resources to keep during titan 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 diff --git a/asdc-tests/src/main/resources/ci/conf/log4j.properties b/asdc-tests/src/main/resources/ci/conf/log4j.properties deleted file mode 100644 index d313e92b55..0000000000 --- a/asdc-tests/src/main/resources/ci/conf/log4j.properties +++ /dev/null @@ -1,34 +0,0 @@ -# Define the root logger with appender file -log4j.rootLogger = INFO, FILE, stdout - -# Define the file appender -log4j.appender.FILE=org.apache.log4j.RollingFileAppender -log4j.appender.FILE.File=${targetlog}logs/ci-log.out - -# Define the layout for file appender -log4j.appender.FILE.layout=org.apache.log4j.PatternLayout -log4j.appender.FILE.layout.conversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p [%10c] : %m%n - -# Set the maximum file size before rollover -log4j.appender.FILE.maxFileSize=5MB - -# Set the the backup index -log4j.appender.FILE.maxBackupIndex=10 - - -############################################################# - -# Direct log messages to stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -#log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p %10c:%L - %m%n - -log4j.logger.org.apache.cassandra.service.StorageProxy=INFO -log4j.logger.com.thinkaurelius.titan.diskstorage.cassandra.CassandraTransaction=INFO, FILE, stdout - -log4j.logger.org.openecomp.sdc.ci.tests.utils=INFO, FILE, stdout -log4j.additivity.org.openecomp.sdc.ci.tests.utils=false - - diff --git a/asdc-tests/src/main/resources/ci/conf/testngLifeCycle.xml b/asdc-tests/src/main/resources/ci/conf/testngLifeCycle.xml deleted file mode 100644 index aa390dc213..0000000000 --- a/asdc-tests/src/main/resources/ci/conf/testngLifeCycle.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/asdc-tests/src/main/resources/ci/conf/titan.properties b/asdc-tests/src/main/resources/ci/conf/titan.properties deleted file mode 100644 index 0fe7888b9e..0000000000 --- a/asdc-tests/src/main/resources/ci/conf/titan.properties +++ /dev/null @@ -1,8 +0,0 @@ -storage.backend=cassandra -#storage.hostname=cassandrahost -storage.hostname=localhost -storage.port=9160 - -cache.db-cache = false -storage.cassandra.keyspace=sdctitan - diff --git a/asdc-tests/src/main/resources/ci/conf/truststore b/asdc-tests/src/main/resources/ci/conf/truststore deleted file mode 100644 index bdec93d862..0000000000 Binary files a/asdc-tests/src/main/resources/ci/conf/truststore and /dev/null differ diff --git a/asdc-tests/src/main/resources/ci/scripts/startTest.sh b/asdc-tests/src/main/resources/ci/scripts/startTest.sh deleted file mode 100644 index 01b8979781..0000000000 --- a/asdc-tests/src/main/resources/ci/scripts/startTest.sh +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -function usage { - echo "Usage: $0 " -} - -function exitOnError() { - if [ $1 -ne 0 ] - then - echo "Failed running task $2" - exit 2 - fi -} - -if [ $# -lt 1 ] -then - usage - exit 2 -fi - -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/log4j.properties -############################################# -TARGET_DIR=${FULL_PATH}/target -CONF_FILE=${FULL_PATH}/conf/attsdc.yaml -DEBUG=true -MainClass=org.openecomp.sdc.ci.tests.run.StartTest - -JAR_FILE=$1 -SUITE_FILE=$2 - -#TARGET_DIR=`echo ${TARGET_DIR} | sed 's/\//\//g'` -#echo $TARGET_DIR - -TESTS_DIR=/opt/app/sdc/ci/resources/tests -COMPONENTS_DIR=/opt/app/sdc/ci/resources/components - -#sed -i 's#\(outputFolder:\).*#\1 '${TARGET_DIR}'#g' $CONF_FILE -#sed -i 's#\(resourceConfigDir:\).*#\1 '${TESTS_DIR}'#g' $CONF_FILE -#sed -i 's#\(componentsConfigDir:\).*#\1 '${COMPONENTS_DIR}'#g' $CONF_FILE -TARGET_LOG_DIR="${TARGET_DIR}/" - -# mkdir -p ${TARGET_DIR} -#if [ -d ${TARGET_DIR} ] -#then -# rm -rf ${TARGET_DIR}/* -#exitOnError $? "Failed_to_delete_target_dir" -#fi - -debug_port=8800 -#JAVA_OPTION="-javaagent:/var/tmp/jacoco/lib/jacocoagent.jar=destfile=jacoco-it.exec" -JAVA_OPTION="" -case "$2" in - -debug) echo "Debug mode, Listen on port $debug_port"; JAVA_OPTION="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${debug_port}" ;; - "") echo "Standard mode";; - *) echo "USAGE: startTest.sh [-debug]";; -esac - -cmd="java $JAVA_OPTION -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE" - -#echo $cmd -#console=`$cmd` - -if [ $DEBUG == "true" ] -then - $cmd -else - $cmd >> /dev/null -fi -status=`echo $?` - - - -echo "##################################################" -echo "################# status is ${status} #################" -echo "##################################################" - -exit $status - diff --git a/asdc-tests/src/main/resources/ci/testSuites/CRUDArtifacts.xml b/asdc-tests/src/main/resources/ci/testSuites/CRUDArtifacts.xml deleted file mode 100644 index e53da8da8a..0000000000 --- a/asdc-tests/src/main/resources/ci/testSuites/CRUDArtifacts.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/asdc-tests/src/main/resources/ci/testSuites/SearchExternalAPI.xml b/asdc-tests/src/main/resources/ci/testSuites/SearchExternalAPI.xml deleted file mode 100644 index 40c462a4cb..0000000000 --- a/asdc-tests/src/main/resources/ci/testSuites/SearchExternalAPI.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/asdc-tests/src/main/resources/ci/testSuites/artifacts.xml b/asdc-tests/src/main/resources/ci/testSuites/artifacts.xml deleted file mode 100644 index 24229b8586..0000000000 --- a/asdc-tests/src/main/resources/ci/testSuites/artifacts.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - diff --git a/asdc-tests/src/main/resources/ci/testSuites/category.xml b/asdc-tests/src/main/resources/ci/testSuites/category.xml deleted file mode 100644 index f2a0b3790c..0000000000 --- a/asdc-tests/src/main/resources/ci/testSuites/category.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/asdc-tests/src/main/resources/ci/testSuites/ciFull.xml b/asdc-tests/src/main/resources/ci/testSuites/ciFull.xml deleted file mode 100644 index 1d81e0f689..0000000000 --- a/asdc-tests/src/main/resources/ci/testSuites/ciFull.xml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/asdc-tests/src/main/resources/ci/testSuites/externalApis.xml b/asdc-tests/src/main/resources/ci/testSuites/externalApis.xml deleted file mode 100644 index 393d3b1a3e..0000000000 --- a/asdc-tests/src/main/resources/ci/testSuites/externalApis.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/asdc-tests/src/main/resources/ci/testSuites/general.xml b/asdc-tests/src/main/resources/ci/testSuites/general.xml deleted file mode 100644 index bd7e6b6650..0000000000 --- a/asdc-tests/src/main/resources/ci/testSuites/general.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/asdc-tests/src/main/resources/ci/testSuites/imports.xml b/asdc-tests/src/main/resources/ci/testSuites/imports.xml deleted file mode 100644 index ae4a5bc1f8..0000000000 --- a/asdc-tests/src/main/resources/ci/testSuites/imports.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/asdc-tests/src/main/resources/ci/testSuites/property.xml b/asdc-tests/src/main/resources/ci/testSuites/property.xml deleted file mode 100644 index f94f89737a..0000000000 --- a/asdc-tests/src/main/resources/ci/testSuites/property.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/asdc-tests/src/main/resources/ci/testSuites/resource.xml b/asdc-tests/src/main/resources/ci/testSuites/resource.xml deleted file mode 100644 index 64f4377420..0000000000 --- a/asdc-tests/src/main/resources/ci/testSuites/resource.xml +++ /dev/null @@ -1,320 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/asdc-tests/src/main/resources/ci/testSuites/sanity.xml b/asdc-tests/src/main/resources/ci/testSuites/sanity.xml deleted file mode 100644 index 21b7043ad3..0000000000 --- a/asdc-tests/src/main/resources/ci/testSuites/sanity.xml +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/asdc-tests/src/main/resources/ci/testSuites/service.xml b/asdc-tests/src/main/resources/ci/testSuites/service.xml deleted file mode 100644 index 18d5630c4e..0000000000 --- a/asdc-tests/src/main/resources/ci/testSuites/service.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/asdc-tests/src/main/resources/ci/testSuites/testngLifeCycle.xml b/asdc-tests/src/main/resources/ci/testSuites/testngLifeCycle.xml deleted file mode 100644 index 54f1868470..0000000000 --- a/asdc-tests/src/main/resources/ci/testSuites/testngLifeCycle.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/asdc-tests/src/main/resources/ci/testSuites/user.xml b/asdc-tests/src/main/resources/ci/testSuites/user.xml deleted file mode 100644 index 948993c144..0000000000 --- a/asdc-tests/src/main/resources/ci/testSuites/user.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - -- cgit 1.2.3-korg