Skip to content

Commit dc129a4

Browse files
JelleHoffmanJelleHoffman
authored
FDP-3055: Fixing logback configuration cucumber tests (#1562)
* FDP-3055: Fixing logback configuration cucumber tests Signed-off-by: Jelle Hoffman jelle.hoffman@hotmail.com * FDP-3055: Not using the target logback file Signed-off-by: Jelle Hoffman jelle.hoffman@hotmail.com --------- Signed-off-by: Jelle Hoffman jelle.hoffman@hotmail.com
1 parent 29fb506 commit dc129a4

File tree

5 files changed

+40
-29
lines changed

5 files changed

+40
-29
lines changed

‎integration-tests/cucumber-tests-platform-common/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM eclipse-temurin:17
22
WORKDIR /
33
COPY target/cucumber-*-test-jar-with-dependencies.jar /
4+
COPY src/test/resources/logback.xml /logback.xml
45
RUN wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.12/org.jacoco.agent-0.8.12-runtime.jar
56
CMD java -javaagent:org.jacoco.agent-0.8.12-runtime.jar=destfile=/target/code-coverage/jacoco-it.exec \
67
-Dcucumber.execution.strict=true\
@@ -9,4 +10,5 @@ CMD java -javaagent:org.jacoco.agent-0.8.12-runtime.jar=destfile=/target/code-co
910
-Dtimeout=30\
1011
-DskipITCoverage=false\
1112
-DrunHeadless=true\
13+
-Dlogback.configurationFile=/logback.xml\
1214
-jar cucumber-*-test-jar-with-dependencies.jar -report /target/output/osgp-cucumber-tests-platform-common

‎integration-tests/cucumber-tests-platform-publiclighting/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM eclipse-temurin:17
22
WORKDIR /
33
COPY target/cucumber-*-test-jar-with-dependencies.jar /
4+
COPY src/test/resources/logback.xml /logback.xml
45
RUN wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.12/org.jacoco.agent-0.8.12-runtime.jar
56
CMD java -javaagent:org.jacoco.agent-0.8.12-runtime.jar=destfile=/target/code-coverage/jacoco-it.exec \
67
-Dcucumber.execution.strict=true\
@@ -9,4 +10,5 @@ CMD java -javaagent:org.jacoco.agent-0.8.12-runtime.jar=destfile=/target/code-co
910
-Dtimeout=30\
1011
-DskipITCoverage=false\
1112
-DrunHeadless=true\
13+
-Dlogback.configurationFile=/logback.xml\
1214
-jar cucumber-*-test-jar-with-dependencies.jar -report /target/output/osgp-cucumber-tests-platform-publiclighting

‎integration-tests/cucumber-tests-platform-publiclighting/src/test/resources/logback.xml

+28-29
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,38 @@ SPDX-FileCopyrightText: Contributors to the GXF project
44
55
SPDX-License-Identifier: Apache-2.0
66
-->
7-
87
<configuration>
98

10-
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
11-
<!-- encoders are assigned the type
12-
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
13-
<encoder>
14-
<pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] [${HOSTNAME}] [%thread] %level %logger{36}@%method:%line - %msg%n</pattern>
15-
</encoder>
16-
</appender>
9+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
10+
<!-- encoders are assigned the type
11+
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
12+
<encoder>
13+
<pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] [${HOSTNAME}] [%thread] %level %logger{36}@%method:%line - %msg%n</pattern>
14+
</encoder>
15+
</appender>
1716

18-
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
19-
<file>/target/output/osgp-cucumber-tests-platform-publiclighting/logs/cucumber-tests-platform-publiclighting-test.log</file>
20-
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
21-
<fileNamePattern>/target/output/osgp-cucumber-tests-platform-publiclighting/logs/cucumber-tests-platform-publiclighting-test.log.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
22-
<maxFileSize>100MB</maxFileSize>
23-
<maxHistory>10</maxHistory>
24-
<totalSizeCap>20GB</totalSizeCap>
25-
</rollingPolicy>
26-
<encoder>
27-
<pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] [${HOSTNAME}] [%thread] %level %logger{36}@%method:%line - %msg%n</pattern>
28-
</encoder>
29-
</appender>
17+
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
18+
<file>/target/output/osgp-cucumber-tests-platform-publiclighting/logs/cucumber-tests-platform-publiclighting-test.log</file>
19+
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
20+
<fileNamePattern>/target/output/osgp-cucumber-tests-platform-publiclighting/logs/cucumber-tests-platform-publiclighting-test.log.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
21+
<maxFileSize>100MB</maxFileSize>
22+
<maxHistory>10</maxHistory>
23+
<totalSizeCap>20GB</totalSizeCap>
24+
</rollingPolicy>
25+
<encoder>
26+
<pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] [${HOSTNAME}] [%thread] %level %logger{36}@%method:%line - %msg%n</pattern>
27+
</encoder>
28+
</appender>
3029

31-
<logger name="org.springframework" level="ERROR" />
32-
<logger name="org.apache.http.wire" level="ERROR" />
33-
<logger name="cucumber.runtime.java.spring" level="ERROR" />
34-
<logger name="com.zaxxer.hikari" level="ERROR" />
35-
<logger name="org.reflections.Reflections" level="ERROR" />
30+
<logger name="org.springframework" level="ERROR" />
31+
<logger name="org.apache.http.wire" level="ERROR" />
32+
<logger name="cucumber.runtime.java.spring" level="ERROR" />
33+
<logger name="com.zaxxer.hikari" level="ERROR" />
34+
<logger name="org.reflections.Reflections" level="ERROR" />
3635

37-
<root level="INFO">
38-
<appender-ref ref="STDOUT" />
39-
<appender-ref ref="FILE"/>
40-
</root>
36+
<root level="INFO">
37+
<appender-ref ref="STDOUT" />
38+
<appender-ref ref="FILE"/>
39+
</root>
4140

4241
</configuration>

‎integration-tests/cucumber-tests-platform-smartmetering/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM eclipse-temurin:17
22
WORKDIR /
33
COPY target/cucumber-*-test-jar-with-dependencies.jar /
4+
COPY src/test/resources/logback.xml /logback.xml
45
RUN wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.12/org.jacoco.agent-0.8.12-runtime.jar
56
CMD java -javaagent:org.jacoco.agent-0.8.12-runtime.jar=destfile=/target/code-coverage/jacoco-it.exec \
67
-Dcucumber.execution.strict=true\
@@ -9,4 +10,5 @@ CMD java -javaagent:org.jacoco.agent-0.8.12-runtime.jar=destfile=/target/code-co
910
-Dtimeout=30\
1011
-DskipITCoverage=false\
1112
-DrunHeadless=true\
13+
-Dlogback.configurationFile=/logback.xml\
1214
-jar cucumber-*-test-jar-with-dependencies.jar -report /target/output/osgp-cucumber-tests-platform-smartmetering

‎integration-tests/parent-integration-tests/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,12 @@ SPDX-License-Identifier: Apache-2.0
265265
</goals>
266266
</execution>
267267
</executions>
268+
<configuration>
269+
<!-- exclude logback.xml -->
270+
<excludes>
271+
<exclude>**/logback*.xml</exclude>
272+
</excludes>
273+
</configuration>
268274
</plugin>
269275
<plugin>
270276
<groupId>org.jacoco</groupId>

0 commit comments

Comments
 (0)