Skip to content

Commit 7490f4b

Browse files
beikovsebersole
authored andcommitted
HHH-17982 Setup JPA 3.2 TCK testing automation for ORM 7
1 parent 84e7a61 commit 7490f4b

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

ci/jpa-3.1-tck.Jenkinsfile renamed to ci/jpa-3.2-tck.Jenkinsfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,31 @@ pipeline {
2424
label 'LongDuration'
2525
}
2626
tools {
27-
jdk 'OpenJDK 11 Latest'
27+
jdk 'OpenJDK 17 Latest'
2828
}
2929
options {
3030
rateLimitBuilds(throttle: [count: throttleCount, durationName: 'day', userBoost: true])
3131
buildDiscarder(logRotator(numToKeepStr: '3', artifactNumToKeepStr: '3'))
3232
disableConcurrentBuilds(abortPrevious: true)
3333
}
3434
parameters {
35-
choice(name: 'IMAGE_JDK', choices: ['jdk11'], description: 'The JDK base image version to use for the TCK image.')
36-
string(name: 'TCK_VERSION', defaultValue: '3.1.5', description: 'The version of the Jakarta JPA TCK i.e. `2.2.0` or `3.0.1`')
37-
string(name: 'TCK_SHA', defaultValue: '01072e6bdf56f0f8818290b8819f492ac95bb83fab14070d36aa7158a4f5eeed', 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')
38-
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.')
35+
choice(name: 'IMAGE_JDK', choices: ['jdk17'], description: 'The JDK base image version to use for the TCK image.')
36+
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`')
37+
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')
38+
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.')
3939
booleanParam(name: 'NO_SLEEP', defaultValue: true, description: 'Whether the NO_SLEEP patch should be applied to speed up the TCK execution')
4040
}
4141
stages {
4242
stage('Build') {
4343
steps {
4444
script {
4545
docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') {
46-
docker.image('openjdk:11-jdk').pull()
46+
docker.image('openjdk:17-jdk').pull()
4747
}
4848
}
4949
dir('hibernate') {
5050
checkout scm
51-
sh './gradlew publishToMavenLocal -PmavenMirror=nexus-load-balancer-c4cf05fd92f43ef8.elb.us-east-1.amazonaws.com -DjakartaJpaVersion=3.1.0'
51+
sh './gradlew publishToMavenLocal -PmavenMirror=nexus-load-balancer-c4cf05fd92f43ef8.elb.us-east-1.amazonaws.com'
5252
script {
5353
env.HIBERNATE_VERSION = sh (
5454
script: "grep hibernateVersion gradle/version.properties|cut -d'=' -f2",
@@ -60,10 +60,10 @@ pipeline {
6060
checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: '*/main']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/hibernate/jakarta-tck-runner.git']]]
6161
script {
6262
if ( params.TCK_URL == null || params.TCK_URL.isEmpty() ) {
63-
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} ."
63+
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} ."
6464
}
6565
else {
66-
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} --build-arg TCK_URL=${params.TCK_URL} ."
66+
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} --build-arg TCK_URL=${params.TCK_URL} ."
6767
}
6868
}
6969
}

local-build-plugins/src/main/java/org/hibernate/orm/env/JpaVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
public class JpaVersion {
1919
public static final String EXT_KEY = "jakartaJpaVersion";
2020
public static final String VERSION_KEY = "jakartaJpaVersionOverride";
21-
public static final String DEFAULT_VERSION = "3.2.0-B02";
21+
public static final String DEFAULT_VERSION = "3.2.0-M2";
2222

2323
private final String name;
2424
private final String osgiName;

0 commit comments

Comments
 (0)