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.

Sign up for GitHub

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

Jump to bottom

Let the CI pass the appropriate forkCount #7110

Merged
merged 4 commits into from
Sep 17, 2022
Merged

Let the CI pass the appropriate forkCount #7110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e80100a
Let the CI pass the appropriate forkCount
Vlatombe Sep 15, 2022
416aa48
Remove forkCount from core as well and set it in Jenkinsfile
Vlatombe Sep 15, 2022
a087f0f
Apply suggestions from code review
Vlatombe Sep 15, 2022
de8ff2d
Merge branch 'master' into fix-defaults
basil Sep 16, 2022
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
1 change: 1 addition & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ for (i = 0; i < buildTypes.size(); i++) {
'--update-snapshots',
"-Dmaven.repo.local=$m2repo",
'-Dmaven.test.failure.ignore',
'-DforkCount=2',
'-Dspotbugs.failOnError=false',
'-Dcheckstyle.failOnViolation=false',
'-Dset.changelist',
Expand Down
1 change: 0 additions & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,6 @@ THE SOFTWARE.
<configuration>
<!-- Make sure to keep the directives in test/pom.xml and war/pom.xml in sync with these. -->
<argLine>@{jacocoSurefireArgs} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.desktop/com.sun.beans.introspect=ALL-UNNAMED</argLine>
<forkCount>0.5C</forkCount>
<reuseForks>false</reuseForks>
</configuration>
</plugin>
Expand Down
3 changes: 0 additions & 3 deletions test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ THE SOFTWARE.
<description>Functional tests for Jenkins core</description>

<properties>
<!-- may use e.g. 2C for 2 × (number of cores) -->
<concurrency>2</concurrency>
<mavenDebug>false</mavenDebug>
<!-- Filled in by jacoco-maven-plugin -->
<jacocoSurefireArgs />
Expand Down Expand Up @@ -276,7 +274,6 @@ THE SOFTWARE.
<buildDirectory>${project.build.directory}</buildDirectory>
</systemPropertyVariables>
<reuseForks>false</reuseForks>
<forkCount>${concurrency}</forkCount>
</configuration>
<executions>
<!-- Unbind the default execution so that it does not run before test-runtime. -->
Expand Down