Skip to content

Commit

Permalink
Broaden integration test builds against Hibernate 6 versions.
Browse files Browse the repository at this point in the history 
Set up build profiles for all supported Hibernate 6 versions. Also trigger them in CI as compatibility builds.

Ticket: GH-3413.
  • Loading branch information
@odrotbohm
odrotbohm committed Apr 2, 2024
1 parent e659f30 commit 15572c1
Show file tree
Hide file tree
Showing 2 changed files with 131 additions and 12 deletions.
83 changes: 76 additions & 7 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,38 +54,107 @@ pipeline {
}

parallel {
stage("test: java.next (hibernate 6.1)") {
stage("test: baseline (hibernate 6.4)") {
agent {
label 'data'
}
options { timeout(time: 30, unit: 'MINUTES')}
environment {
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
}
steps {
script {
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
sh 'PROFILE=all-dbs,hibernate-61 ci/test.sh'
sh "ci/clean.sh"
sh "PROFILE=all-dbs,hibernate-64 " +
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
"ci/test.sh"
}
}
}
}
stage("test: baseline (hibernate 6.3)") {
stage("test: baseline (hibernate 6.4 snapshots)") {
agent {
label 'data'
}
options { timeout(time: 30, unit: 'MINUTES')}
environment {
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
}
steps {
script {
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
sh 'PROFILE=all-dbs,hibernate-63 ci/test.sh'
sh "ci/clean.sh"
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
sh "PROFILE=all-dbs,hibernate-64-snapshots " +
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
"ci/test.sh"
}
}
}
}
stage("test: baseline (hibernate 6.5)") {
agent {
label 'data'
}
options { timeout(time: 30, unit: 'MINUTES')}
environment {
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
}
steps {
script {
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
sh "PROFILE=all-dbs,hibernate-65 " +
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
"ci/test.sh"
}
}
}
}
stage("test: baseline (hibernate 6.5 snapshots)") {
agent {
label 'data'
}
options { timeout(time: 30, unit: 'MINUTES')}
environment {
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
}
steps {
script {
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
sh "PROFILE=all-dbs,hibernate-65-snapshots " +
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
"ci/test.sh"
}
}
}
}
stage("test: baseline (hibernate 6.6 snapshots)") {
agent {
label 'data'
}
options { timeout(time: 30, unit: 'MINUTES')}
environment {
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
}
steps {
script {
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
sh "PROFILE=all-dbs,hibernate-66-snapshots " +
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
"ci/test.sh"
}
}
}
Expand Down
60 changes: 55 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@
<properties>
<antlr>4.10.1</antlr> <!-- align with Hibernate's parser -->
<eclipselink>3.0.4</eclipselink>
<hibernate>6.2.4.Final</hibernate>
<hibernate>6.2.24.Final</hibernate>
<hibernate-64>6.4.4.Final</hibernate-64>
<hibernate-64-snapshots>6.4.5-SNAPSHOT</hibernate-64-snapshots>
<hibernate-65>6.5.0.CR1</hibernate-65>
<hibernate-65-snapshots>6.5.0-SNAPSHOT</hibernate-65-snapshots>
<hibernate-66-snapshots>6.6.0-SNAPSHOT</hibernate-66-snapshots>
<hsqldb>2.7.1</hsqldb>
<h2>2.1.214</h2>
<jsqlparser>4.5</jsqlparser>
Expand All @@ -53,16 +58,61 @@

<profiles>
<profile>
<id>hibernate-61</id>
<id>hibernate-64</id>
<properties>
<hibernate>6.1.7.Final</hibernate>
<hibernate>${hibernate-64}</hibernate>
</properties>
</profile>
<profile>
<id>hibernate-63</id>
<id>hibernate-64-snapshots</id>
<properties>
<hibernate>6.3.0.CR1</hibernate>
<hibernate>${hibernate-64-snapshots}</hibernate>
</properties>
<repositories>
<repository>
<id>sonatype-oss</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>
</profile>
<profile>
<id>hibernate-65</id>
<properties>
<hibernate>${hibernate-65}</hibernate>
</properties>
</profile>
<profile>
<id>hibernate-65-snapshots</id>
<properties>
<hibernate>${hibernate-65-snapshots}</hibernate>
</properties>
<repositories>
<repository>
<id>sonatype-oss</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>
</profile>
<profile>
<id>hibernate-66-snapshots</id>
<properties>
<hibernate>${hibernate-66-snapshots}</hibernate>
</properties>
<repositories>
<repository>
<id>sonatype-oss</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>
</profile>
<profile>
<id>all-dbs</id>
Expand Down

0 comments on commit 15572c1

Please sign in to comment.