Skip to content

Commit

Permalink
Run mvn verify with appropriate number of cores (#3790)
Browse files Browse the repository at this point in the history
The parallelism in this job (which runs in CI) has been set to 12 cores
for years; this is unlikely to be a globally optimal choice and so we
should instead look at how many cores are available when running the job
(using [this Maven
plugin](https://www.mojohaus.org/build-helper-maven-plugin/cpu-count-mojo.html)).

---------

Co-authored-by: devops <[email protected]>
Co-authored-by: rv-jenkins <[email protected]>
  • Loading branch information
3 people authored Nov 3, 2023
1 parent 2c0e42e commit 1dc1df7
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 1 deletion.
15 changes: 14 additions & 1 deletion k-distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,19 @@

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.4.0</version>
<executions>
<execution>
<id>get-cpu-count</id>
<goals>
<goal>cpu-count</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
Expand Down Expand Up @@ -108,7 +121,7 @@
<configuration>
<target>
<exec dir="${ktestDir}" executable="make" failonerror="true">
<arg value="-j12" />
<arg value="-j${cpu.count}" />
<arg line="${make.args}" />
</exec>
</target>
Expand Down
40 changes: 40 additions & 0 deletions nix/mavenix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1573,6 +1573,14 @@
"path": "org/antlr/stringtemplate/3.2/stringtemplate-3.2.pom",
"sha1": "a21993ca994a2927e1e43adfbb3a8d92d131fc80"
},
{
"path": "org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.jar",
"sha1": "fb418f9b33a0b951e9a2978b4b6ee93b2707e72f"
},
{
"path": "org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.pom",
"sha1": "ef6b86a126ae192d8639af6f5b3dbe5d4c6d7dde"
},
{
"path": "org/apache/ant/ant-launcher/1.8.1/ant-launcher-1.8.1.pom",
"sha1": "436b71817fb83bb7a162a22b1aadebe0a2910133"
Expand Down Expand Up @@ -4225,6 +4233,14 @@
"path": "org/apache/maven/shared/file-management/3.0.0/file-management-3.0.0.pom",
"sha1": "f6d55739cb1a70aef37b345b89cdd9d4f53ed637"
},
{
"path": "org/apache/maven/shared/file-management/3.1.0/file-management-3.1.0.jar",
"sha1": "f87a3a54c856714e4157b9ce7a5ff6ffc310d447"
},
{
"path": "org/apache/maven/shared/file-management/3.1.0/file-management-3.1.0.pom",
"sha1": "8c2dcedec327bbb9daf24ced48fc59ce228a6b1f"
},
{
"path": "org/apache/maven/shared/maven-artifact-transfer/0.13.1/maven-artifact-transfer-0.13.1.jar",
"sha1": "9f6d2088ae64dd926b8ec445afdb7e148eb08060"
Expand Down Expand Up @@ -5021,6 +5037,14 @@
"path": "org/codehaus/groovy/groovy-all/1.7.6/groovy-all-1.7.6.pom",
"sha1": "f9f2e45942b25bfded764cce615156228e7b8a3a"
},
{
"path": "org/codehaus/mojo/build-helper-maven-plugin/3.4.0/build-helper-maven-plugin-3.4.0.jar",
"sha1": "542285128a4510fbe9e59b43f11407e01e530edc"
},
{
"path": "org/codehaus/mojo/build-helper-maven-plugin/3.4.0/build-helper-maven-plugin-3.4.0.pom",
"sha1": "6bfad437d7b5848928c5610c931f8a6b53acd0f6"
},
{
"path": "org/codehaus/mojo/buildnumber-maven-plugin/1.3/buildnumber-maven-plugin-1.3.jar",
"sha1": "a87082dcc28b7ff61412c3e59dac2ae2748393a1"
Expand Down Expand Up @@ -5057,6 +5081,10 @@
"path": "org/codehaus/mojo/mojo-parent/40/mojo-parent-40.pom",
"sha1": "d2fa7c95447827e9bbcb8c60bd9484c51202732e"
},
{
"path": "org/codehaus/mojo/mojo-parent/74/mojo-parent-74.pom",
"sha1": "2ef0a93fea172659305d787e51dfd4af9247334c"
},
{
"path": "org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar",
"sha1": "b564a05aeecd4d81d6b81f57a1d495fc8c0f497f"
Expand Down Expand Up @@ -5741,6 +5769,14 @@
"path": "org/codehaus/plexus/plexus-utils/3.4.2/plexus-utils-3.4.2.pom",
"sha1": "2e7d0c48e7888250f5ecf22634fc7be5a9743e69"
},
{
"path": "org/codehaus/plexus/plexus-utils/3.5.1/plexus-utils-3.5.1.jar",
"sha1": "c6bfb17c97ecc8863e88778ea301be742c62b06d"
},
{
"path": "org/codehaus/plexus/plexus-utils/3.5.1/plexus-utils-3.5.1.pom",
"sha1": "9b1bf6967abaa0a516a04ea096da08ec8d8fe0d7"
},
{
"path": "org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar",
"sha1": "1440fc2552d1405b1c2d380ef3b96c4d9c6dbd0b"
Expand Down Expand Up @@ -6097,6 +6133,10 @@
"path": "org/junit/junit-bom/5.7.2/junit-bom-5.7.2.pom",
"sha1": "e8848369738c03e40af5507686216f9b8b44b6a3"
},
{
"path": "org/junit/junit-bom/5.9.2/junit-bom-5.9.2.pom",
"sha1": "645a08cbe455cad14d8bfb25a35d7f594c53cafd"
},
{
"path": "org/kframework/dependencies/nailgun-all/1.0.0-SNAPSHOT/nailgun-all-1.0.0-20230818.165756-2.pom",
"sha1": "81f6a397361513f34b26d5f43d329df888f2feaa"
Expand Down

0 comments on commit 1dc1df7

Please sign in to comment.