From 61663b92910868a4de51c6fe9a7cef7da96da7e9 Mon Sep 17 00:00:00 2001 From: JulienBe Date: Thu, 3 Sep 2020 17:09:46 +0200 Subject: Optimize Build Optimize the log output Issue-ID: SDC-3232 Signed-off-by: JulienBe Change-Id: I50cfb7119b1e9087d3e2db56a81fe47df4ad6254 --- ui-ci/src/main/resources/Downloads/CP_WAN.yml | 23 --- .../resources/Downloads/Fortigate02_vFW_VFC.yml | 63 ------- ui-ci/src/main/resources/META-INF/aop-ajc.xml | 15 -- .../main/resources/ci/conf/attsdc-packages.yaml | 2 - ui-ci/src/main/resources/ci/conf/attsdc.yaml | 69 -------- ui-ci/src/main/resources/ci/conf/extent-config.xml | 50 ------ .../main/resources/ci/conf/janusgraph.properties | 7 - ui-ci/src/main/resources/ci/conf/log4j2.properties | 49 ------ .../resources/ci/scripts/addUsersFromList_new.sh | 80 --------- .../src/main/resources/ci/scripts/copyToStorage.sh | 55 ------- ui-ci/src/main/resources/ci/scripts/sendMail.sh | 50 ------ ui-ci/src/main/resources/ci/scripts/startTest.sh | 181 --------------------- .../main/resources/ci/testSuites/PortMirroring.xml | 9 - .../main/resources/ci/testSuites/andreyPara.xml | 31 ---- .../ci/testSuites/archiveRestoreSanity.xml | 15 -- .../resources/ci/testSuites/arifactsSanity.xml | 19 --- .../ci/testSuites/complexServiceSanity.xml | 10 -- .../ci/testSuites/devOnboardE2EOneFileSanity.xml | 14 -- .../resources/ci/testSuites/extendedSanity.xml | 52 ------ ui-ci/src/main/resources/ci/testSuites/fullCI.xml | 34 ---- .../src/main/resources/ci/testSuites/gabSanity.xml | 13 -- .../main/resources/ci/testSuites/onapUiSanity.xml | 30 ---- .../testSuites/onboardVNFWithoutDistribution.xml | 16 -- .../resources/ci/testSuites/onboardingVNFs.xml | 20 --- .../ci/testSuites/onboardingVNFsShortFlow.xml | 18 -- .../ci/testSuites/propertyAssignmentSanity.xml | 19 --- ui-ci/src/main/resources/ci/testSuites/sanity.xml | 30 ---- .../ci/testSuites/toscaValidationSuite.xml | 24 --- .../ci/testSuites/vspValidationAllFlows.xml | 23 --- ui-ci/src/main/resources/images/gizmorambo.jpg | Bin 16605 -> 0 bytes ui-ci/src/main/resources/log4j2.xml | 38 ----- ui-ci/src/main/resources/reportportal.properties | 5 - 32 files changed, 1064 deletions(-) delete mode 100644 ui-ci/src/main/resources/Downloads/CP_WAN.yml delete mode 100644 ui-ci/src/main/resources/Downloads/Fortigate02_vFW_VFC.yml delete mode 100644 ui-ci/src/main/resources/META-INF/aop-ajc.xml delete mode 100644 ui-ci/src/main/resources/ci/conf/attsdc-packages.yaml delete mode 100644 ui-ci/src/main/resources/ci/conf/attsdc.yaml delete mode 100644 ui-ci/src/main/resources/ci/conf/extent-config.xml delete mode 100644 ui-ci/src/main/resources/ci/conf/janusgraph.properties delete mode 100644 ui-ci/src/main/resources/ci/conf/log4j2.properties delete mode 100644 ui-ci/src/main/resources/ci/scripts/addUsersFromList_new.sh delete mode 100644 ui-ci/src/main/resources/ci/scripts/copyToStorage.sh delete mode 100644 ui-ci/src/main/resources/ci/scripts/sendMail.sh delete mode 100644 ui-ci/src/main/resources/ci/scripts/startTest.sh delete mode 100644 ui-ci/src/main/resources/ci/testSuites/PortMirroring.xml delete mode 100644 ui-ci/src/main/resources/ci/testSuites/andreyPara.xml delete mode 100644 ui-ci/src/main/resources/ci/testSuites/archiveRestoreSanity.xml delete mode 100644 ui-ci/src/main/resources/ci/testSuites/arifactsSanity.xml delete mode 100644 ui-ci/src/main/resources/ci/testSuites/complexServiceSanity.xml delete mode 100644 ui-ci/src/main/resources/ci/testSuites/devOnboardE2EOneFileSanity.xml delete mode 100644 ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml delete mode 100644 ui-ci/src/main/resources/ci/testSuites/fullCI.xml delete mode 100644 ui-ci/src/main/resources/ci/testSuites/gabSanity.xml delete mode 100644 ui-ci/src/main/resources/ci/testSuites/onapUiSanity.xml delete mode 100644 ui-ci/src/main/resources/ci/testSuites/onboardVNFWithoutDistribution.xml delete mode 100644 ui-ci/src/main/resources/ci/testSuites/onboardingVNFs.xml delete mode 100644 ui-ci/src/main/resources/ci/testSuites/onboardingVNFsShortFlow.xml delete mode 100644 ui-ci/src/main/resources/ci/testSuites/propertyAssignmentSanity.xml delete mode 100644 ui-ci/src/main/resources/ci/testSuites/sanity.xml delete mode 100644 ui-ci/src/main/resources/ci/testSuites/toscaValidationSuite.xml delete mode 100644 ui-ci/src/main/resources/ci/testSuites/vspValidationAllFlows.xml delete mode 100644 ui-ci/src/main/resources/images/gizmorambo.jpg delete mode 100644 ui-ci/src/main/resources/log4j2.xml delete mode 100644 ui-ci/src/main/resources/reportportal.properties (limited to 'ui-ci/src/main/resources') diff --git a/ui-ci/src/main/resources/Downloads/CP_WAN.yml b/ui-ci/src/main/resources/Downloads/CP_WAN.yml deleted file mode 100644 index eeabbb8490..0000000000 --- a/ui-ci/src/main/resources/Downloads/CP_WAN.yml +++ /dev/null @@ -1,23 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 - -node_types: - org.openecomp.resource.cp.WANTedy: derived_from: org.openecomp.resource.cp.CPTedy - properties: - type: - type: string - required: false - requirements: - - virtualLink_in: - capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo - - virtualLink_out: - capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo - - virtualLink_in1: - capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo - - virtualLink_out1: - capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo - - virtualLink_in2: - capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo - - virtualLink_out2: - capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo - - virtualbinding: - capability: tosca.capabilities.network.Bindable relationship: tosca.relationships.network.BindsTo \ No newline at end of file diff --git a/ui-ci/src/main/resources/Downloads/Fortigate02_vFW_VFC.yml b/ui-ci/src/main/resources/Downloads/Fortigate02_vFW_VFC.yml deleted file mode 100644 index a24d004929..0000000000 --- a/ui-ci/src/main/resources/Downloads/Fortigate02_vFW_VFC.yml +++ /dev/null @@ -1,63 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 - -node_types: - - org.openecomp.resource.vfc.vFW.Fortigate02Tedy: - derived_from: org.openecomp.resource.vfc.vFWTedy - - properties: - att-part-number: - type: string - default: "ATT-FortiGate-VM02" - vendor-name: - type: string - default: “FORTINET” - vendor-model: - type: string - default: "VM02" - vendor-model-description: - type: string - vcpu-default: - type: integer - default: 2 - vcpu-min: - type: integer - default: 1 - vcpu-max: - type: integer - default: 2 - vmemory-default: - default: 4 - type: integer - vmemory-units: - type: string - default: "GB" - vmemory-min: - type: integer - default: 1 - vmemory-max: - type: integer - default: 4 - vdisk-default: - type: integer - default: 20 - vdisk-units: - type: string - default: "GB" - vdisk-min: - type: integer - default: 2 - vdisk-max: - type: integer - default: 20 - vnf-type: - type: string - default: “Advanced FW” - software-version: - type: string - default: “5.2.4” - software-file-name: - type: string - vnf-feature: - type: string - default: “IPS, AntiVirus, URL Filter, APPID” \ No newline at end of file diff --git a/ui-ci/src/main/resources/META-INF/aop-ajc.xml b/ui-ci/src/main/resources/META-INF/aop-ajc.xml deleted file mode 100644 index 8587abb2e1..0000000000 --- a/ui-ci/src/main/resources/META-INF/aop-ajc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/conf/attsdc-packages.yaml b/ui-ci/src/main/resources/ci/conf/attsdc-packages.yaml deleted file mode 100644 index dcb78eefc1..0000000000 --- a/ui-ci/src/main/resources/ci/conf/attsdc-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/attsdc.yaml b/ui-ci/src/main/resources/ci/conf/attsdc.yaml deleted file mode 100644 index e7dfa39570..0000000000 --- a/ui-ci/src/main/resources/ci/conf/attsdc.yaml +++ /dev/null @@ -1,69 +0,0 @@ -outputFolder: target -reportName: index.html -catalogBeHost: localhost -esHost: eshost -disributionClientHost: disClient -catalogFePort: 8181 -catalogBePort: 8284 -disributionClientPort: 8181 -esPort: 9200 -neoHost: neoHost -neoPort: 7474 -neoDBusername: neo4j -neoDBpassword: 123456 -url: http://localhost:8285/sdc1 -#url: https://www.e-access.att.com/QA-AUTOMATE1/sdc1/portal -#url: https://www.e-access.att.com/AA-IFT-testing/sdc1/portal -#url: https://www.e-access.att.com/QA-SCRUM1/sdc1/portal -remoteTestingMachineIP: 0.0.0.0 -remoteTestingMachinePort: 5566 -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 -browser: FireFox -windowsDownloadDirectory: "c:\\apache-ftpserver-1.1.0\\res\\home\\" -systemUnderDebug: true -reportDBhost: dbhost -reportDBport: 27017 -sdcHttpMethod: http -localDataCenter: DC-Automate01 - -useBrowserMobProxy: false -captureTraffic: false - -janusGraphPropertiesFile: src/main/resources/ci/conf/janusgraph.properties - -stopOnClassFailure: false -#todo -onboardingBeHost: localhost -onboardingBePort: 8283 -#List of non-abstract resources to keep during JanusGraph 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/extent-config.xml b/ui-ci/src/main/resources/ci/conf/extent-config.xml deleted file mode 100644 index 4eb7f681aa..0000000000 --- a/ui-ci/src/main/resources/ci/conf/extent-config.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - standard - - - - UTF-8 - - - - https - - - ASDC Automation Report - - - ASDC Automation Report - - - - - - - yyyy-MM-dd - - - - HH:mm:ss - - - - - - - - - - - - \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/conf/janusgraph.properties b/ui-ci/src/main/resources/ci/conf/janusgraph.properties deleted file mode 100644 index 9d67ed2f2f..0000000000 --- a/ui-ci/src/main/resources/ci/conf/janusgraph.properties +++ /dev/null @@ -1,7 +0,0 @@ -storage.backend=cql -storage.hostname=cassandrahost -storage.port=9042 - -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/conf/log4j2.properties b/ui-ci/src/main/resources/ci/conf/log4j2.properties deleted file mode 100644 index ec22601d6a..0000000000 --- a/ui-ci/src/main/resources/ci/conf/log4j2.properties +++ /dev/null @@ -1,49 +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 - -loggers=org.apache.cassandra.service.StorageProxy,org.janusgraph.diskstorage.cassandra.CassandraTransaction,org.openecomp.sdc.ci.tests.utils - -logger.org.apache.cassandra.service.StorageProxy.name = org.apache.cassandra.service.StorageProxy -logger.org.apache.cassandra.service.StorageProxy.level=info -logger.org.apache.cassandra.service.StorageProxy.appendRef.rolling.ref = RollingFile -logger.org.apache.cassandra.service.StorageProxy.appendRef.stdout.ref = STDOUT - -logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction.name = org.janusgraph.diskstorage.cassandra.CassandraTransaction -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.name = org.openecomp.sdc.ci.tests.utils -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 \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/scripts/addUsersFromList_new.sh b/ui-ci/src/main/resources/ci/scripts/addUsersFromList_new.sh deleted file mode 100644 index e695db26b2..0000000000 --- a/ui-ci/src/main/resources/ci/scripts/addUsersFromList_new.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -function help_usage () -{ - echo "$0 -ip -f " - 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/ui-ci/src/main/resources/ci/scripts/copyToStorage.sh b/ui-ci/src/main/resources/ci/scripts/copyToStorage.sh deleted file mode 100644 index a113c54e60..0000000000 --- a/ui-ci/src/main/resources/ci/scripts/copyToStorage.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -REPORT_NAME=$1 -VERSION=$2 -ENV=$3 - - -if [ -z "$REPORT_NAME" ] - then - source ExtentReport/versions.info - now=$(date +'%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 - -/usr/bin/expect << EOF -spawn ssh admin@${IP} mkdir -p -m 775 /home/admin/reports/${ENV}/${VERSION}/UI/ - -expect { - -re ".*es.*o.*" { - exp_send "yes\r" - exp_continue - } - -re ".*sword.*" { - exp_send ${PASS}\r - } -} - -expect eof - -spawn scp -pr ExtentReport admin@${IP}:/home/admin/reports/${ENV}/${VERSION}/UI/${REPORT_NAME}/ - -expect { - -re ".*es.*o.*" { - exp_send "yes\r" - exp_continue - } - -re ".*sword.*" { - exp_send ${PASS}\r - } -} - -expect eof -EOF diff --git a/ui-ci/src/main/resources/ci/scripts/sendMail.sh b/ui-ci/src/main/resources/ci/scripts/sendMail.sh deleted file mode 100644 index 932b624a33..0000000000 --- a/ui-ci/src/main/resources/ci/scripts/sendMail.sh +++ /dev/null @@ -1,50 +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@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 - source ExtentReport/versions.info - now=$(date +'%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}'/UI/'${REPORT_NAME}'/SDC_UI_Extent_Report.html \n\nThanks, \nASDC 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 'E2E Automation '$ENV' results - SDC '$VERSION -r 'ASDC@Automation.team' $RECIPIENTS 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 20afd86414..0000000000 --- a/ui-ci/src/main/resources/ci/scripts/startTest.sh +++ /dev/null @@ -1,181 +0,0 @@ -#!/bin/bash -REMOTE_DEBUG=false -RERUN=true -JAVA_OPTION="" -debug_port=8000 -TEST_SUITES=testSuites -fileName=testng-failed.xml - -function help_usage () -{ - echo - echo "$0 ( ) [-r/rerun -d/debug ]" - 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 '/ ${FULL_PATH}/${TEST_SUITES}/${fileName} - sed -i 's/thread-count="[0-9]\+"/thread-count="1"/g' ${FULL_PATH}/${TEST_SUITES}/${fileName} - if [ -s "ExtentReport/ShortReport.csv" ] - then - SKIP_TESTS_LIST=$(cat ExtentReport/ShortReport.csv |awk -F, '{print $2}' | sed 's/&.*//g' | uniq) - for SKIP_TEST in ${SKIP_TESTS_LIST}; do - sed -i "s/.*\"${SKIP_TEST}\".*//g" ${FULL_PATH}/${TEST_SUITES}/${fileName}; - done; - fi -} - -function setUpdatedTimeToReport () -{ - LINE_NUMBER_OF_START_REPORT_DATE=`grep -A1 -nw "Start" ExtentReport/SDC_UI_Extent_Report.html | tail -1 | awk '{print $1}' | tr -d -` - END_REPORT_DATE=`grep -A1 -nw "End" ExtentReport/SDC_UI_Extent_Report.html | tail -1 | awk -F'[>|<]' '{print $3}'` - EPOCH_START_REPORT_DATE=`date --date="${1}" +%s` - EPOCH_END_REPORT_DATE=`date --date="${END_REPORT_DATE}" +%s` - let DIFF_EPOCH_TIME=${EPOCH_END_REPORT_DATE}-${EPOCH_START_REPORT_DATE} - TAKEN_TIME_IN_MINUTES=`echo $((${DIFF_EPOCH_TIME}/60))` - LINE_NUMBER_OF_TAKEN_REPORT_TIME=`grep -A1 -nw "Time Taken" ExtentReport/SDC_UI_Extent_Report.html | tail -1 | awk '{print $1}' | tr -d -` - PATTERN="div class='panel-lead'>"; - sed -i "${LINE_NUMBER_OF_START_REPORT_DATE}s/${PATTERN}.*\> /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} -REPORT_START_DATE=${reportStartTime} - -if [ ${RERUN} == "true" ]; then - setUpdatedTimeToReport "${REPORT_START_DATE}"; -fi - -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/ui-ci/src/main/resources/ci/testSuites/PortMirroring.xml b/ui-ci/src/main/resources/ci/testSuites/PortMirroring.xml deleted file mode 100644 index da03e8285e..0000000000 --- a/ui-ci/src/main/resources/ci/testSuites/PortMirroring.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/testSuites/andreyPara.xml b/ui-ci/src/main/resources/ci/testSuites/andreyPara.xml deleted file mode 100644 index 3e3efdd9cd..0000000000 --- a/ui-ci/src/main/resources/ci/testSuites/andreyPara.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/testSuites/archiveRestoreSanity.xml b/ui-ci/src/main/resources/ci/testSuites/archiveRestoreSanity.xml deleted file mode 100644 index e712730d59..0000000000 --- a/ui-ci/src/main/resources/ci/testSuites/archiveRestoreSanity.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/testSuites/arifactsSanity.xml b/ui-ci/src/main/resources/ci/testSuites/arifactsSanity.xml deleted file mode 100644 index 3a637065ca..0000000000 --- a/ui-ci/src/main/resources/ci/testSuites/arifactsSanity.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/testSuites/complexServiceSanity.xml b/ui-ci/src/main/resources/ci/testSuites/complexServiceSanity.xml deleted file mode 100644 index 02eb27f9a8..0000000000 --- a/ui-ci/src/main/resources/ci/testSuites/complexServiceSanity.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/testSuites/devOnboardE2EOneFileSanity.xml b/ui-ci/src/main/resources/ci/testSuites/devOnboardE2EOneFileSanity.xml deleted file mode 100644 index acf4be4be3..0000000000 --- a/ui-ci/src/main/resources/ci/testSuites/devOnboardE2EOneFileSanity.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml b/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml deleted file mode 100644 index 00b98c9f23..0000000000 --- a/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/testSuites/fullCI.xml b/ui-ci/src/main/resources/ci/testSuites/fullCI.xml deleted file mode 100644 index 940026d30c..0000000000 --- a/ui-ci/src/main/resources/ci/testSuites/fullCI.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/testSuites/gabSanity.xml b/ui-ci/src/main/resources/ci/testSuites/gabSanity.xml deleted file mode 100644 index 035bf695ea..0000000000 --- a/ui-ci/src/main/resources/ci/testSuites/gabSanity.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/ui-ci/src/main/resources/ci/testSuites/onapUiSanity.xml b/ui-ci/src/main/resources/ci/testSuites/onapUiSanity.xml deleted file mode 100644 index 546f26981e..0000000000 --- a/ui-ci/src/main/resources/ci/testSuites/onapUiSanity.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ui-ci/src/main/resources/ci/testSuites/onboardVNFWithoutDistribution.xml b/ui-ci/src/main/resources/ci/testSuites/onboardVNFWithoutDistribution.xml deleted file mode 100644 index 54c4ea854b..0000000000 --- a/ui-ci/src/main/resources/ci/testSuites/onboardVNFWithoutDistribution.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/testSuites/onboardingVNFs.xml b/ui-ci/src/main/resources/ci/testSuites/onboardingVNFs.xml deleted file mode 100644 index c55da4274c..0000000000 --- a/ui-ci/src/main/resources/ci/testSuites/onboardingVNFs.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/testSuites/onboardingVNFsShortFlow.xml b/ui-ci/src/main/resources/ci/testSuites/onboardingVNFsShortFlow.xml deleted file mode 100644 index 4a4628a9ed..0000000000 --- a/ui-ci/src/main/resources/ci/testSuites/onboardingVNFsShortFlow.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/testSuites/propertyAssignmentSanity.xml b/ui-ci/src/main/resources/ci/testSuites/propertyAssignmentSanity.xml deleted file mode 100644 index 0a7e30edf7..0000000000 --- a/ui-ci/src/main/resources/ci/testSuites/propertyAssignmentSanity.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/testSuites/sanity.xml b/ui-ci/src/main/resources/ci/testSuites/sanity.xml deleted file mode 100644 index c8fd8f14b1..0000000000 --- a/ui-ci/src/main/resources/ci/testSuites/sanity.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/testSuites/toscaValidationSuite.xml b/ui-ci/src/main/resources/ci/testSuites/toscaValidationSuite.xml deleted file mode 100644 index 96c538dfc9..0000000000 --- a/ui-ci/src/main/resources/ci/testSuites/toscaValidationSuite.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/testSuites/vspValidationAllFlows.xml b/ui-ci/src/main/resources/ci/testSuites/vspValidationAllFlows.xml deleted file mode 100644 index 71677a95a5..0000000000 --- a/ui-ci/src/main/resources/ci/testSuites/vspValidationAllFlows.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui-ci/src/main/resources/images/gizmorambo.jpg b/ui-ci/src/main/resources/images/gizmorambo.jpg deleted file mode 100644 index c9a8fe8a64..0000000000 Binary files a/ui-ci/src/main/resources/images/gizmorambo.jpg and /dev/null differ diff --git a/ui-ci/src/main/resources/log4j2.xml b/ui-ci/src/main/resources/log4j2.xml deleted file mode 100644 index 5a92e611b0..0000000000 --- a/ui-ci/src/main/resources/log4j2.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - [%d{HH:mm:ss,SSS}] %-5p (%F:%L) - %m%n - %m%n - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui-ci/src/main/resources/reportportal.properties b/ui-ci/src/main/resources/reportportal.properties deleted file mode 100644 index 373610ef62..0000000000 --- a/ui-ci/src/main/resources/reportportal.properties +++ /dev/null @@ -1,5 +0,0 @@ -rp.endpoint = http://reportportal.intl.att.com:8080 -rp.uuid = 4be0a132-e2ea-4a8c-a0d4-54367259d8d2 -rp.project= ASDC -rp.mode = DEBUG -rp.enable = true \ No newline at end of file -- cgit 1.2.3-korg