Set # of forks explicitly

Author: marko-bekhta

.github/workflows/ci.yml

@@ -116,7 +116,7 @@ jobs:
       - name: Build code and run unit tests and basic checks
         run: |
           ./mvnw $MAVEN_ARGS ${{ matrix.os.maven.args }} clean install \
-          -Pjqassistant -Pdist -Pci-build -Pparallel-tests -DskipITs
+          -Pjqassistant -Pdist -Pci-build -Pparallel-tests-github -DskipITs
         env:
           DEVELOCITY_ACCESS_KEY: "${{ secrets.DEVELOCITY_ACCESS_KEY || '' }}"
           DEVELOCITY_BASE_URL: "${{ env.DEVELOCITY_BASE_URL || 'https://develocity.commonhaus.dev' }}"
@@ -133,7 +133,7 @@ jobs:
       - name: Run integration tests in the default environment
         run: |
           ./mvnw $MAVEN_ARGS ${{ matrix.os.maven.args }} clean verify \
-          -Pskip-checks -Pparallel-tests \
+          -Pskip-checks -Pparallel-tests-github \
           ${{ github.event.pull_request.base.ref && format('-Dincremental -Dgib.referenceBranch=refs/remotes/origin/{0}', github.event.pull_request.base.ref) || '' }}
         env:
           DEVELOCITY_ACCESS_KEY: "${{ secrets.DEVELOCITY_ACCESS_KEY || '' }}"

Jenkinsfile

@@ -423,7 +423,7 @@ stage('Default build') {
 			String commonMavenArgs = """ \
 					--fail-at-end \
 					-Pcoverage \
-					-Pparallel-tests \
+					-Pparallel-tests-jenkins \
 					${toTestEnvironmentArgs(environments.content.jdk.default)} \
 			"""
 
@@ -1072,7 +1072,7 @@ void mavenNonDefaultBuild(BuildEnvironment buildEnv, String args, List<String> a
 	mvn """ \
 			clean install -Pci-build \
 					${toTestEnvironmentArgs(buildEnv)} \
-					-Pparallel-tests \
+					-Pparallel-tests-jenkins \
 					--fail-at-end \
 					$args \
 	"""

pom.xml

@@ -400,7 +400,7 @@
         <test.database.run.kind>h2</test.database.run.kind>
 
         <!-- Parallel test execution: number of forked JVMs. Default 1 (sequential).
-             Use -Pparallel-tests for 0.5C (half CPU cores), or set explicitly.
+             Use -Pparallel-tests for 0.6C (60% of CPU cores), or set explicitly.
              Backend-specific properties allow different parallelism for ES (I/O-bound, shared container)
              vs Lucene (CPU-bound, local). -->
         <test.parallel.forkCount>1</test.parallel.forkCount>
@@ -1283,9 +1283,25 @@
         <profile>
             <id>parallel-tests</id>
             <properties>
-                <test.parallel.forkCount>0.5C</test.parallel.forkCount>
+                <test.parallel.forkCount>0.6C</test.parallel.forkCount>
                 <test.parallel.forkCount.elasticsearch>4</test.parallel.forkCount.elasticsearch>
-                <test.parallel.forkCount.lucene>0.5C</test.parallel.forkCount.lucene>
+                <test.parallel.forkCount.lucene>0.6C</test.parallel.forkCount.lucene>
+            </properties>
+        </profile>
+        <profile>
+            <id>parallel-tests-github</id>
+            <properties>
+                <test.parallel.forkCount>2</test.parallel.forkCount>
+                <test.parallel.forkCount.elasticsearch>2</test.parallel.forkCount.elasticsearch>
+                <test.parallel.forkCount.lucene>2</test.parallel.forkCount.lucene>
+            </properties>
+        </profile>
+        <profile>
+            <id>parallel-tests-jenkins</id>
+            <properties>
+                <test.parallel.forkCount>4</test.parallel.forkCount>
+                <test.parallel.forkCount.elasticsearch>2</test.parallel.forkCount.elasticsearch>
+                <test.parallel.forkCount.lucene>4</test.parallel.forkCount.lucene>
             </properties>
         </profile>