From ed64b5edff15e702493df21aa3230b81593e6133 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Fri, 9 Jun 2017 03:19:04 +0300 Subject: [SDC-29] catalog 1707 rebase commit. Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1 Signed-off-by: Michael Lando --- ui-ci/src/main/resources/ci/conf/credentials.yaml | 48 ----------- ui-ci/src/main/resources/ci/conf/log4j.properties | 34 -------- ui-ci/src/main/resources/ci/conf/sdc-packages.yaml | 2 - ui-ci/src/main/resources/ci/conf/sdc.yaml | 57 ------------- ui-ci/src/main/resources/ci/conf/titan.properties | 7 -- ui-ci/src/main/resources/ci/scripts/startTest.sh | 96 ---------------------- ui-ci/src/main/resources/ci/testSuites/ui-ci.xml | 16 ---- 7 files changed, 260 deletions(-) delete mode 100644 ui-ci/src/main/resources/ci/conf/credentials.yaml delete mode 100644 ui-ci/src/main/resources/ci/conf/log4j.properties delete mode 100644 ui-ci/src/main/resources/ci/conf/sdc-packages.yaml delete mode 100644 ui-ci/src/main/resources/ci/conf/sdc.yaml delete mode 100644 ui-ci/src/main/resources/ci/conf/titan.properties delete mode 100644 ui-ci/src/main/resources/ci/scripts/startTest.sh delete mode 100644 ui-ci/src/main/resources/ci/testSuites/ui-ci.xml (limited to 'ui-ci/src/main/resources/ci') diff --git a/ui-ci/src/main/resources/ci/conf/credentials.yaml b/ui-ci/src/main/resources/ci/conf/credentials.yaml deleted file mode 100644 index a30d8ce538..0000000000 --- a/ui-ci/src/main/resources/ci/conf/credentials.yaml +++ /dev/null @@ -1,48 +0,0 @@ - designer: { - username: cs0008, - password: demo, - firstname: ASDC, - lastname: KASPIN - } - admin: { - username: jh0003, - password: demo, - firstname: ASDC, - lastname: KASPIN - } - ops: { - username: op0001, - password: demo, - firstname: ASDC, - lastname: KASPIN - } - tester: { - username: jm0007, - password: demo, - firstname: ASDC, - lastname: KASPIN - } - governor: { - username: gv0001, - password: demo, - firstname: ASDC, - lastname: KASPIN - } - product_strategist: { - username: ps0001, - password: demo, - firstname: ASDC, - lastname: KASPIN - } - product_manager: { - username: pm0001, - password: demo, - firstname: ASDC, - lastname: KASPIN - } - product_local: { - username: pm0001, - password: 123123a, - firstname: ASDC, - lastname: KASPIN - } \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/conf/log4j.properties b/ui-ci/src/main/resources/ci/conf/log4j.properties deleted file mode 100644 index 3e159ec8df..0000000000 --- a/ui-ci/src/main/resources/ci/conf/log4j.properties +++ /dev/null @@ -1,34 +0,0 @@ -# Define the root logger with appender file -log4j.rootLogger = DEBUG, 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=DEBUG -log4j.logger.com.thinkaurelius.titan.diskstorage.cassandra.CassandraTransaction=INFO, FILE, stdout - -log4j.logger.org.openecomp.sdc.ci.tests.utils=TRACE, FILE, stdout -log4j.additivity.org.openecomp.sdc.ci.tests.utils=false - - diff --git a/ui-ci/src/main/resources/ci/conf/sdc-packages.yaml b/ui-ci/src/main/resources/ci/conf/sdc-packages.yaml deleted file mode 100644 index dcb78eefc1..0000000000 --- a/ui-ci/src/main/resources/ci/conf/sdc-packages.yaml +++ /dev/null @@ -1,2 +0,0 @@ -packages: - - org.openecomp.sdc.ci.tests.execute.resourceui \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/conf/sdc.yaml b/ui-ci/src/main/resources/ci/conf/sdc.yaml deleted file mode 100644 index 8e84fecf3b..0000000000 --- a/ui-ci/src/main/resources/ci/conf/sdc.yaml +++ /dev/null @@ -1,57 +0,0 @@ -outputFolder: target -reportName: index.html -catalogBeHost: localhost -catalogFeHost: localhost -esHost: eshost -disributionClientHost: disClient -catalogFePort: 8181 -catalogBePort: 8080 -disributionClientPort: 8181 -esPort: 9200 -neoHost: neoHost -neoPort: 7474 -neoDBusername: neo4j -neoDBpassword: 123456 -url: http://localhost:8285/sdc1 -remoteTestingMachineIP: 1.2.3.4 -remoteTestingMachinePort: 5555 -remoteTesting: false - -resourceConfigDir: src/test/resources/CI/tests -componentsConfigDir: src/test/resources/CI/components -importResourceConfigDir: src/test/resources/CI/importResource -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 - -stopOnClassFailure: false - -#List of non-abstract resources to keep during titan cleanup between tests -#Only 1.0 version will be kept -resourcesNotToDelete: - - tosca.nodes.Compute - - tosca.nodes.Database - - tosca.nodes.ObjectStorage - - tosca.nodes.BlockStorage - - tosca.nodes.LoadBalancer - - org.openecomp.resource.cp.Port - - org.openecomp.resource.vl.Network - -#Resource categories to keep (including all their subcategories) -resourceCategoriesNotToDelete: - - Generic - - Network L2-3 - - Network L4+ - - Application L4+ - - Network Connectivity - -#Service categories to keep -serviceCategoriesNotToDelete: - - Mobility - - Network L1-3 - - Network L4 - - VoIP Call Control \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/conf/titan.properties b/ui-ci/src/main/resources/ci/conf/titan.properties deleted file mode 100644 index 94d12cfba0..0000000000 --- a/ui-ci/src/main/resources/ci/conf/titan.properties +++ /dev/null @@ -1,7 +0,0 @@ -storage.backend=cassandra -storage.hostname=cassandrahost -storage.port=9160 - -cache.db-cache-clean-wait = 20 -cache.db-cache-time = 180000 -cache.db-cache-size = 0.5 \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/scripts/startTest.sh b/ui-ci/src/main/resources/ci/scripts/startTest.sh deleted file mode 100644 index b4b2cb114e..0000000000 --- a/ui-ci/src/main/resources/ci/scripts/startTest.sh +++ /dev/null @@ -1,96 +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/sdc.yaml - -DEBUG=true -MainClass=org.openecomp.sdc.ci.tests.run.StartTest - -JAR_FILE=$1 -SUITE_FILE=$2 -FILES_TEST=$3 - -if [ -z "$3" ] -then - FILES_TEST=${FULL_PATH}/Files - echo "$3" -fi - -#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="nohup java $JAVA_OPTION -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -Dfilepath=${FILES_TEST} -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/ui-ci/src/main/resources/ci/testSuites/ui-ci.xml b/ui-ci/src/main/resources/ci/testSuites/ui-ci.xml deleted file mode 100644 index a6c2584a2c..0000000000 --- a/ui-ci/src/main/resources/ci/testSuites/ui-ci.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file -- cgit 1.2.3-korg