Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change directory of failsafe and surefire reports when not using GitHub Actions #1478

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ runs:

./mvnw -s .settings.xml \
-DtestsToRun=${tests_to_run_in_current_index} \
-DCURRENT_INSTANCE=${CURRENT_INDEX} \
-Dsurefire-reports-directory=surefire-reports/${CURRENT_INDEX} \
-Dfailsafe-reports-directory=failsafe-reports/${CURRENT_INDEX} \
-e clean install \
-P sonar -nsu --batch-mode \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
Expand Down
9 changes: 5 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,9 @@
<!-- in our github actions run, we save surefire/failsafe reports in a path that looks like this: -->
<!-- surefire-report/1/... , where "1" (and other numbers like this) are the index of the github matrix -->
<!-- where this is running. When outside the github actions, for example locally/jenkins, we will simply store -->
<!-- the reports in a directory: "surefire-reports/one/..." -->
<CURRENT_INSTANCE>one</CURRENT_INSTANCE>
<!-- the reports in a directory: "surefire-reports/..." -->
<surefire-reports-directory>surefire-reports</surefire-reports-directory>
<failsafe-reports-directory>failsafe-reports</failsafe-reports-directory>
<!-- Dependency Versions -->
<mockito-inline.version>4.8.1</mockito-inline.version>
<spring-cloud-commons.version>4.0.5-SNAPSHOT</spring-cloud-commons.version>
Expand Down Expand Up @@ -208,15 +209,15 @@
<includes>
<include>${testsToRun}</include>
</includes>
<reportsDirectory>${project.build.directory}/surefire-reports/${CURRENT_INSTANCE}</reportsDirectory>
<reportsDirectory>${project.build.directory}/${surefire-reports-directory}</reportsDirectory>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<reportsDirectory>${project.build.directory}/failsafe-reports/${CURRENT_INSTANCE}</reportsDirectory>
<reportsDirectory>${project.build.directory}/${failsafe-reports-directory}</reportsDirectory>
</configuration>
</plugin>

Expand Down
Loading