HHH-17982 Setup JPA 3.2 TCK testing automation for ORM 7

hibernate · Apr 23, 2024 · 124b0bf · 124b0bf
1 parent b50c679
commit 124b0bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/ci/jpa-3.1-tck.Jenkinsfile → ci/jpa-3.2-tck.Jenkinsfile b/ci/jpa-3.1-tck.Jenkinsfile → ci/jpa-3.2-tck.Jenkinsfile
@@ -24,31 +24,31 @@ pipeline {
         label 'LongDuration'
     }
     tools {
-        jdk 'OpenJDK 11 Latest'
+        jdk 'OpenJDK 17 Latest'
     }
     options {
   		rateLimitBuilds(throttle: [count: throttleCount, durationName: 'day', userBoost: true])
         buildDiscarder(logRotator(numToKeepStr: '3', artifactNumToKeepStr: '3'))
         disableConcurrentBuilds(abortPrevious: true)
     }
     parameters {
-        choice(name: 'IMAGE_JDK', choices: ['jdk11'], description: 'The JDK base image version to use for the TCK image.')
-        string(name: 'TCK_VERSION', defaultValue: '3.1.3', description: 'The version of the Jakarta JPA TCK i.e. `2.2.0` or `3.0.1`')
-        string(name: 'TCK_SHA', defaultValue: '502b931882a9f7d0a074df86f25333a5676a39ff318d0aad1a746999e9c27eae', description: 'The SHA256 of the Jakarta JPA TCK that is distributed under https://download.eclipse.org/jakartaee/persistence/3.1/jakarta-persistence-tck-${TCK_VERSION}.zip.sha256')
-		string(name: 'TCK_URL', defaultValue: '', description: 'The URL from which to download the TCK ZIP file. Only needed for testing staged builds. Ensure the TCK_VERSION variable matches the ZIP file name suffix.')
+        choice(name: 'IMAGE_JDK', choices: ['jdk17'], description: 'The JDK base image version to use for the TCK image.')
+        string(name: 'TCK_VERSION', defaultValue: '3.2.0', description: 'The version of the Jakarta JPA TCK i.e. `2.2.0` or `3.0.1`')
+        string(name: 'TCK_SHA', defaultValue: '', description: 'The SHA256 of the Jakarta JPA TCK that is distributed under https://download.eclipse.org/jakartaee/persistence/3.1/jakarta-persistence-tck-${TCK_VERSION}.zip.sha256')
+		string(name: 'TCK_URL', defaultValue: 'https://www.eclipse.org/downloads/download.php?file=/ee4j/jakartaee-tck/jakartaee11/staged/eftl/jakarta-persistence-tck-3.2.0.zip&mirror_id=1', description: 'The URL from which to download the TCK ZIP file. Only needed for testing staged builds. Ensure the TCK_VERSION variable matches the ZIP file name suffix.')
         booleanParam(name: 'NO_SLEEP', defaultValue: true, description: 'Whether the NO_SLEEP patch should be applied to speed up the TCK execution')
 	}
     stages {
         stage('Build') {
         	steps {
 				script {
 					docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') {
-						docker.image('openjdk:11-jdk').pull()
+						docker.image('openjdk:17-jdk').pull()
 					}
 				}
 				dir('hibernate') {
 					checkout scm
-					sh './gradlew publishToMavenLocal -PmavenMirror=nexus-load-balancer-c4cf05fd92f43ef8.elb.us-east-1.amazonaws.com -DjakartaJpaVersion=3.1.0'
+					sh './gradlew publishToMavenLocal -PmavenMirror=nexus-load-balancer-c4cf05fd92f43ef8.elb.us-east-1.amazonaws.com'
 					script {
 						env.HIBERNATE_VERSION = sh (
 							script: "grep hibernateVersion gradle/version.properties|cut -d'=' -f2",
@@ -60,10 +60,10 @@ pipeline {
 					checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: '*/main']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/hibernate/jakarta-tck-runner.git']]]
 					script {
 						if ( params.TCK_URL == null || params.TCK_URL.isEmpty() ) {
-							sh "cd jpa-3.1; docker build -f Dockerfile.${params.IMAGE_JDK} -t jakarta-tck-runner --build-arg TCK_VERSION=${params.TCK_VERSION} --build-arg TCK_SHA=${params.TCK_SHA} ."
+							sh "cd jpa-3.2; docker build -f Dockerfile.${params.IMAGE_JDK} -t jakarta-tck-runner --build-arg TCK_VERSION=${params.TCK_VERSION} --build-arg TCK_SHA=${params.TCK_SHA} ."
 						}
 						else {
-							sh "cd jpa-3.1; docker build -f Dockerfile.${params.IMAGE_JDK} -t jakarta-tck-runner --build-arg TCK_VERSION=${params.TCK_VERSION} --build-arg TCK_URL=${params.TCK_URL} ."
+							sh "cd jpa-3.2; docker build -f Dockerfile.${params.IMAGE_JDK} -t jakarta-tck-runner --build-arg TCK_VERSION=${params.TCK_VERSION} --build-arg TCK_URL=${params.TCK_URL} ."
 						}
 					}
 				}

diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/env/JpaVersion.java b/local-build-plugins/src/main/java/org/hibernate/orm/env/JpaVersion.java
@@ -18,7 +18,7 @@
 public class JpaVersion {
 	public static final String EXT_KEY = "jakartaJpaVersion";
 	public static final String VERSION_KEY = "jakartaJpaVersionOverride";
-	public static final String DEFAULT_VERSION = "3.2.0-B02";
+	public static final String DEFAULT_VERSION = "3.2.0-M2";
 
 	private final String name;
 	private final String osgiName;