Disable parallel testing for DB2 11.5

Author: beikov

hibernate-core/hibernate-core.gradle

@@ -274,7 +274,14 @@ tasks.withType( Test.class ).each { test ->
         // Most systems have multi-threading and maxing out a core on both threads will hurt performance
         // Also, as soon as we hit 16+ threads, the returns are diminishing, so divide by 4
         def threadCount = Runtime.runtime.availableProcessors()
-        test.maxParallelForks = threadCount >= 16 ? threadCount.intdiv( 4 ) : (threadCount.intdiv( 2 ) ?: 1)
+        def testThreads = project.getProperties().get( "test.threads" )
+        if ( testThreads == null ) {
+            testThreads = threadCount >= 16 ? threadCount.intdiv( 4 ) : (threadCount.intdiv( 2 ) ?: 1)
+        }
+        else {
+            testThreads = Integer.parseInt( testThreads.toString() )
+        }
+        test.maxParallelForks = testThreads
         test.systemProperty 'maxParallelForks', test.maxParallelForks
     }
     else if ( project.db == "oracle_test_pilot_database" ) {

hibernate-envers/hibernate-envers.gradle

@@ -66,7 +66,14 @@ tasks.withType( Test.class ).each { test ->
         // Most systems have multi-threading and maxing out a core on both threads will hurt performance
         // Also, as soon as we hit 16+ threads, the returns are diminishing, so divide by 4
         def threadCount = Runtime.runtime.availableProcessors()
-        test.maxParallelForks = threadCount >= 16 ? threadCount.intdiv( 4 ) : (threadCount.intdiv( 2 ) ?: 1)
+        def testThreads = project.getProperties().get( "test.threads" )
+        if ( testThreads == null ) {
+            testThreads = threadCount >= 16 ? threadCount.intdiv( 4 ) : (threadCount.intdiv( 2 ) ?: 1)
+        }
+        else {
+            testThreads = Integer.parseInt( testThreads.toString() )
+        }
+        test.maxParallelForks = testThreads
         test.systemProperty 'maxParallelForks', test.maxParallelForks
     }
     else if ( project.db == "oracle_test_pilot_database" ) {

nightly.Jenkinsfile

@@ -126,6 +126,9 @@ stage('Build') {
 								case "db2_11_5":
 									sh "./docker_db.sh db2_11_5"
 									state[buildEnv.tag]['containerName'] = "db2"
+									// The tenant feature was only added in DB2 12, so disable parallel testing
+									state[buildEnv.tag]['additionalOptions'] = state[buildEnv.tag]['additionalOptions'] +
+										" -Ptest.threads=1"
 									break;
 								case "mssql_2017":
 									sh "./docker_db.sh mssql_2017"