From a4e013f83327d820808bd565d2356a7a87689ee8 Mon Sep 17 00:00:00 2001 From: sebdet Date: Wed, 5 Aug 2020 17:12:51 +0200 Subject: Fix broken UI & API tests Due to issues in the log4j files, the tests can't be started and crash Issue-ID: SDC-3223 Signed-off-by: sebdet Change-Id: I77909d98c716a8a232f5cc8ae8baddebb4ee581f --- .../files/default/conf/log4j2.properties | 11 +++++++---- .../sdc-api-tests/files/default/startTest.sh | 3 +-- test-apis-ci/src/main/resources/log4j2.properties | 14 ++------------ .../sdc-ui-tests/files/default/conf/log4j2.properties | 19 +++++++++++-------- .../cookbooks/sdc-ui-tests/files/default/startTest.sh | 2 +- ui-ci/src/main/resources/ci/conf/log4j2.properties | 19 +++++++++++-------- 6 files changed, 33 insertions(+), 35 deletions(-) diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/conf/log4j2.properties b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/conf/log4j2.properties index a0ed4f0c42..ec22601d6a 100644 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/conf/log4j2.properties +++ b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/conf/log4j2.properties @@ -26,16 +26,19 @@ 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 +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 diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/startTest.sh b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/startTest.sh index a5ad7e239a..32f927ddb0 100644 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/startTest.sh +++ b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/startTest.sh @@ -86,14 +86,13 @@ 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 +LOGS_PROP_FILE=conf/log4j2.properties ############################################# TARGET_DIR=${FULL_PATH}/target CONF_FILE=${FULL_PATH}/conf/sdc.yaml diff --git a/test-apis-ci/src/main/resources/log4j2.properties b/test-apis-ci/src/main/resources/log4j2.properties index 242714cb78..77acad8915 100644 --- a/test-apis-ci/src/main/resources/log4j2.properties +++ b/test-apis-ci/src/main/resources/log4j2.properties @@ -2,7 +2,7 @@ status = error dest = err name = PropertiesConfig -property.filename = ${targetlog}logs/ci-log.out +property.filename = logs/ws-log.out #filter.threshold.type = ThresholdFilter #filter.threshold.level = debug @@ -10,7 +10,7 @@ property.filename = ${targetlog}logs/ci-log.out 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.filePattern = logs/ws-%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 @@ -31,16 +31,6 @@ 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.cql.CassandraTransaction.level =info -logger.org.janusgraph.diskstorage.cql.CassandraTransaction.appendRef.rolling.ref = RollingFile -logger.org.janusgraph.diskstorage.cql.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 \ No newline at end of file diff --git a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/conf/log4j2.properties b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/conf/log4j2.properties index 4735d086a0..ec22601d6a 100644 --- a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/conf/log4j2.properties +++ b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/conf/log4j2.properties @@ -26,16 +26,19 @@ 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 +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.janusgraph.diskstorage.cql.CassandraTransaction.level =info -logger.org.janusgraph.diskstorage.cql.CassandraTransaction.appendRef.rolling.ref = RollingFile -logger.org.janusgraph.diskstorage.cql.CassandraTransaction.appendRef.stdout.ref = STDOUT +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 @@ -43,4 +46,4 @@ logger.org.openecomp.sdc.ci.tests.utils.additivity = false rootLogger.level = info rootLogger.appenderRef.stdout.ref = STDOUT -rootLogger.appenderRef.rolling.ref = RollingFile +rootLogger.appenderRef.rolling.ref = RollingFile \ No newline at end of file diff --git a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/startTest.sh b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/startTest.sh index 42153251f4..d16d05400f 100644 --- a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/startTest.sh +++ b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/startTest.sh @@ -93,7 +93,7 @@ then else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -LOGS_PROP_FILE=file:${FULL_PATH}/conf/log4j2.properties +LOGS_PROP_FILE=conf/log4j2.properties ############################################# TARGET_DIR=${FULL_PATH}/target CONF_FILE=${FULL_PATH}/conf/sdc.yaml diff --git a/ui-ci/src/main/resources/ci/conf/log4j2.properties b/ui-ci/src/main/resources/ci/conf/log4j2.properties index 0dde1c99c3..ec22601d6a 100644 --- a/ui-ci/src/main/resources/ci/conf/log4j2.properties +++ b/ui-ci/src/main/resources/ci/conf/log4j2.properties @@ -26,21 +26,24 @@ 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 +loggers=org.apache.cassandra.service.StorageProxy,org.janusgraph.diskstorage.cassandra.CassandraTransaction,org.openecomp.sdc.ci.tests.utils -logger.org.apache.cassandra.service.StorageProxy.level=debug +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.level = trace +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 = debug +rootLogger.level = info rootLogger.appenderRef.stdout.ref = STDOUT -rootLogger.appenderRef.rolling.ref = RollingFile +rootLogger.appenderRef.rolling.ref = RollingFile \ No newline at end of file -- cgit 1.2.3-korg