Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Always build main code with JDK 11 in Jenkinsfile 

So that we test ORM with the main bytecode as close as possible to
actual releases.

This is what we do in other projects (Search, Validator, Reactive).
This commit is contained in:
Yoann Rodière 2022-06-09 14:25:35 +02:00 committed by Christian Beikov
parent 49f3345d15
commit 075eb51500
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Jenkinsfile vendored
View File

@ -17,6 +17,7 @@ import org.jenkinsci.plugins.workflow.support.steps.build.RunWrapper
import org.hibernate.jenkins.pipeline.helpers.job.JobHelper import org.hibernate.jenkins.pipeline.helpers.job.JobHelper
@Field final String DEFAULT_JDK_VERSION = '11' @Field final String DEFAULT_JDK_VERSION = '11'
@Field final String DEFAULT_JDK_TOOL = "OpenJDK ${DEFAULT_JDK_VERSION} Latest"
@Field final String NODE_PATTERN_BASE = 'Worker&&Containers' @Field final String NODE_PATTERN_BASE = 'Worker&&Containers'
@Field List<BuildEnvironment> environments @Field List<BuildEnvironment> environments
@ -43,9 +44,9 @@ stage('Configure') {
new BuildEnvironment( dbName: 'tidb', node: 'tidb', notificationRecipients: 'tidb_hibernate@pingcap.com' ), new BuildEnvironment( dbName: 'tidb', node: 'tidb', notificationRecipients: 'tidb_hibernate@pingcap.com' ),
// Disable EDB for now as the image is not available anymore // Disable EDB for now as the image is not available anymore
// new BuildEnvironment( dbName: 'edb' ), // new BuildEnvironment( dbName: 'edb' ),
new BuildEnvironment( jdkVersion: '17' ), new BuildEnvironment( testJdkVersion: '17' ),
new BuildEnvironment( jdkVersion: '18' ), new BuildEnvironment( testJdkVersion: '18' ),
new BuildEnvironment( jdkVersion: '19' ) new BuildEnvironment( testJdkVersion: '19' )
]; ];
helper.configure { helper.configure {
@ -81,7 +82,7 @@ stage('Build') {
Map<String, Map<String, String>> state = [:] Map<String, Map<String, String>> state = [:]
environments.each { BuildEnvironment buildEnv -> environments.each { BuildEnvironment buildEnv ->
// Don't build environments for newer JDKs when this is a PR // Don't build environments for newer JDKs when this is a PR
if ( helper.scmSource.pullRequest && buildEnv.jdkVersion ) { if ( helper.scmSource.pullRequest && buildEnv.testJdkVersion ) {
return return
} }
state[buildEnv.tag] = [:] state[buildEnv.tag] = [:]
@ -91,7 +92,7 @@ stage('Build') {
if ( buildEnv.testJdkVersion ) { if ( buildEnv.testJdkVersion ) {
testJavaHome = tool(name: "OpenJDK ${buildEnv.testJdkVersion} Latest", type: 'jdk') testJavaHome = tool(name: "OpenJDK ${buildEnv.testJdkVersion} Latest", type: 'jdk')
} }
def javaHome = tool(name: "OpenJDK ${buildEnv.jdkVersion ?: DEFAULT_JDK_VERSION} Latest", type: 'jdk') def javaHome = tool(name: "OpenJDK ${DEFAULT_JDK_VERSION} Latest", type: 'jdk')
// Use withEnv instead of setting env directly, as that is global! // Use withEnv instead of setting env directly, as that is global!
// See https://github.com/jenkinsci/pipeline-plugin/blob/master/TUTORIAL.md // See https://github.com/jenkinsci/pipeline-plugin/blob/master/TUTORIAL.md
withEnv(["JAVA_HOME=${javaHome}", "PATH+JAVA=${javaHome}/bin"]) { withEnv(["JAVA_HOME=${javaHome}", "PATH+JAVA=${javaHome}/bin"]) {
@ -235,7 +236,6 @@ stage('Build') {
// Job-specific helpers // Job-specific helpers
class BuildEnvironment { class BuildEnvironment {
String jdkVersion
String testJdkVersion String testJdkVersion
String dbName = 'h2' String dbName = 'h2'
String node String node
@ -243,7 +243,6 @@ class BuildEnvironment {
String toString() { getTag() } String toString() { getTag() }
String getTag() { "${testJdkVersion ? 'jdk_' + testJdkVersion + '_' : '' }${dbName}" } String getTag() { "${testJdkVersion ? 'jdk_' + testJdkVersion + '_' : '' }${dbName}" }
String getTestJdkVersion() { testJdkVersion ?: jdkVersion }
} }
void runBuildOnNode(String label, Closure body) { void runBuildOnNode(String label, Closure body) {