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 --- .../main/resources/ci/conf/attsdc-packages.yaml | 12 --- .../src/main/resources/ci/conf/attsdc.yaml | 101 --------------------- .../src/main/resources/ci/conf/credentials.yaml | 48 ---------- .../src/main/resources/ci/conf/extent-config.xml | 50 ---------- .../main/resources/ci/conf/janusgraph.properties | 11 --- .../src/main/resources/ci/conf/log4j2.properties | 46 ---------- test-apis-ci/src/main/resources/ci/conf/log4j2.xml | 13 --- .../src/main/resources/ci/conf/testngLifeCycle.xml | 9 -- test-apis-ci/src/main/resources/ci/conf/truststore | Bin 971 -> 0 bytes 9 files changed, 290 deletions(-) delete mode 100644 test-apis-ci/src/main/resources/ci/conf/attsdc-packages.yaml delete mode 100644 test-apis-ci/src/main/resources/ci/conf/attsdc.yaml delete mode 100644 test-apis-ci/src/main/resources/ci/conf/credentials.yaml delete mode 100644 test-apis-ci/src/main/resources/ci/conf/extent-config.xml delete mode 100644 test-apis-ci/src/main/resources/ci/conf/janusgraph.properties delete mode 100644 test-apis-ci/src/main/resources/ci/conf/log4j2.properties delete mode 100644 test-apis-ci/src/main/resources/ci/conf/log4j2.xml delete mode 100644 test-apis-ci/src/main/resources/ci/conf/testngLifeCycle.xml delete mode 100644 test-apis-ci/src/main/resources/ci/conf/truststore (limited to 'test-apis-ci/src/main/resources/ci/conf') 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 @@ - - - - - - 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/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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - 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 Binary files a/test-apis-ci/src/main/resources/ci/conf/truststore and /dev/null differ -- cgit 1.2.3-korg