Skip to content

Commit

Permalink
HSEARCH-4649 Make sure orm6/jakarta test reports have distinct test r…
Browse files Browse the repository at this point in the history
…eport names

Otherwise they get confused with their "vanilla" counterpart.
  • Loading branch information
yrodiere committed Jul 26, 2022
1 parent 3762984 commit 2f44411
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 1 deletion.
2 changes: 2 additions & 0 deletions jakarta/parents/integrationtest/pom.xml
Expand Up @@ -21,6 +21,8 @@
<description>Common build configuration for all Jakarta EE integration test artifacts (including documentation)</description>

<properties>
<surefire.integration>jakarta</surefire.integration>

<!-- JQAssistant does not seem to work correctly on these artifacts for some reason -->
<jqassistant.skip>true</jqassistant.skip>
<!-- Prevent these modules from artificially affecting Sonar metrics -->
Expand Down
2 changes: 2 additions & 0 deletions jakarta/parents/internal/pom.xml
Expand Up @@ -21,6 +21,8 @@
<description>Common build configuration for all internal (non-published) artifacts - Jakarta EE version</description>

<properties>
<surefire.integration>jakarta</surefire.integration>

<!-- JQAssistant does not seem to work correctly on these artifacts for some reason -->
<jqassistant.skip>true</jqassistant.skip>
<!-- Prevent these modules from artificially affecting Sonar metrics -->
Expand Down
2 changes: 2 additions & 0 deletions jakarta/parents/public/pom.xml
Expand Up @@ -21,6 +21,8 @@
<description>Common build configuration for all Jakarta EE public artifacts</description>

<properties>
<surefire.integration>jakarta</surefire.integration>

<!-- JQAssistant does not seem to work correctly on these artifacts for some reason -->
<jqassistant.skip>true</jqassistant.skip>
<!-- Prevent these modules from artificially affecting Sonar metrics -->
Expand Down
2 changes: 2 additions & 0 deletions orm6/parents/integrationtest/pom.xml
Expand Up @@ -21,6 +21,8 @@
<description>Common build configuration for all ORM6 integration test artifacts (including documentation)</description>

<properties>
<surefire.integration>orm6</surefire.integration>

<!-- JQAssistant does not seem to work correctly on these artifacts for some reason -->
<jqassistant.skip>true</jqassistant.skip>
<!-- Forbiddenapis fails when some forbidden methods are not found, and some forbidden methods were removed in ORM 6 -->
Expand Down
2 changes: 2 additions & 0 deletions orm6/parents/internal/pom.xml
Expand Up @@ -21,6 +21,8 @@
<description>Common build configuration for all internal (non-published) artifacts - ORM6 version</description>

<properties>
<surefire.integration>orm6</surefire.integration>

<!-- JQAssistant does not seem to work correctly on these artifacts for some reason -->
<jqassistant.skip>true</jqassistant.skip>
<!-- Forbiddenapis fails when some forbidden methods are not found, and some forbidden methods were removed in ORM 6 -->
Expand Down
2 changes: 2 additions & 0 deletions orm6/parents/public/pom.xml
Expand Up @@ -21,6 +21,8 @@
<description>Common build configuration for all ORM6 public artifacts</description>

<properties>
<surefire.integration>orm6</surefire.integration>

<!-- JQAssistant does not seem to work correctly on these artifacts for some reason -->
<jqassistant.skip>true</jqassistant.skip>
<!-- Forbiddenapis fails when some forbidden methods are not found, and some forbidden methods were removed in ORM 6 -->
Expand Down
5 changes: 4 additions & 1 deletion pom.xml
Expand Up @@ -550,12 +550,15 @@
<failsafe.spring.skip>${skipITs}</failsafe.spring.skip>

<!-- This allows us to distinguish between multiple executions of the same test in test reports. -->
<surefire.reportNameSuffix>${surefire.module}-${surefire.environment}</surefire.reportNameSuffix>
<surefire.reportNameSuffix>${surefire.module}-${surefire.integration}-${surefire.environment}</surefire.reportNameSuffix>
<!-- This should be set from the command line by CI jobs that execute the same tests in multiple environments -->
<surefire.environment>default</surefire.environment>
<!-- This should be set in modules that re-execute tests imported from a dependency (using <dependenciesToScan>)
to differentiate multiple executions of the same tests in multiple modules. -->
<surefire.module>default</surefire.module>
<!-- This should be set in modules that transform Hibernate Search code for a different integration
(Jakarta EE, ORM 6, ...). -->
<surefire.integration>default</surefire.integration>

<!-- Containers executions tests properties -->
<test.containers.run.skip>false</test.containers.run.skip>
Expand Down

0 comments on commit 2f44411

Please sign in to comment.