diff --git a/Jenkinsfile b/Jenkinsfile index 1b88ce897194..6314366e710c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,13 +45,13 @@ stage('Configure') { // We want to enable preview features when testing newer builds of OpenJDK: // even if we don't use these features, just enabling them can cause side effects // and it's useful to test that. - new BuildEnvironment( testJdkVersion: '23', testJdkLauncherArgs: '--enable-preview' ), - new BuildEnvironment( testJdkVersion: '24', testJdkLauncherArgs: '--enable-preview' ), + new BuildEnvironment( testJdkVersion: '23', testJdkLauncherArgs: '--enable-preview', skipJacoco: true ), + new BuildEnvironment( testJdkVersion: '24', testJdkLauncherArgs: '--enable-preview', skipJacoco: true ), // The following JDKs aren't supported by Hibernate ORM out-of-the box yet: // they require the use of -Dnet.bytebuddy.experimental=true. // Make sure to remove that argument as soon as possible // -- generally that requires upgrading bytebuddy after the JDK goes GA. - new BuildEnvironment( testJdkVersion: '25', testJdkLauncherArgs: '--enable-preview -Dnet.bytebuddy.experimental=true' ) + new BuildEnvironment( testJdkVersion: '25', testJdkLauncherArgs: '--enable-preview -Dnet.bytebuddy.experimental=true', skipJacoco: true ), ]; if ( env.CHANGE_ID ) { @@ -130,6 +130,10 @@ stage('Build') { state[buildEnv.tag]['additionalOptions'] = state[buildEnv.tag]['additionalOptions'] + " -Pci.node=${buildEnv.node}" } + if ( buildEnv.skipJacoco ) { + state[buildEnv.tag]['additionalOptions'] = state[buildEnv.tag]['additionalOptions'] + + " -PskipJacoco=true" + } state[buildEnv.tag]['containerName'] = null; stage('Checkout') { checkout scm @@ -215,6 +219,7 @@ class BuildEnvironment { String additionalOptions String notificationRecipients boolean longRunning + boolean skipJacoco String toString() { getTag() } String getTag() { "${node ? node + "_" : ''}${testJdkVersion ? 'jdk_' + testJdkVersion + '_' : '' }${dbName}" } diff --git a/local-build-plugins/src/main/groovy/local.java-module.gradle b/local-build-plugins/src/main/groovy/local.java-module.gradle index 40499736c718..6f777838adfc 100644 --- a/local-build-plugins/src/main/groovy/local.java-module.gradle +++ b/local-build-plugins/src/main/groovy/local.java-module.gradle @@ -16,7 +16,6 @@ plugins { id "org.hibernate.orm.database-service" id "org.hibernate.orm.build.java-module" - id "jacoco" id "build-dashboard" id "project-report" } @@ -27,6 +26,11 @@ def jpaVersion = ormBuildDetails.jpaVersion def java9ModuleNameBase = project.name.startsWith( 'hibernate-' ) ? name.drop( 'hibernate-'.length() ): name def java9ModuleName = "org.hibernate.orm.$java9ModuleNameBase".replace('-','.') +def skipJacoco = project.hasProperty('skipJacoco') ? project.getProperty('skipJacoco').toBoolean() : false +if (!skipJacoco) { + plugins.apply('jacoco') +} + sourceSets { test { resources {