Skip to content

Commit 249991f

Browse files
odrotbohmodrotbohm
committed
Broaden integration test builds against Hibernate 6 versions.
Set up build profiles for all supported Hibernate 6 versions. Also trigger them in CI as compatibility builds. Ticket: GH-3413.
1 parent 7fae8c5 commit 249991f

File tree

2 files changed

+131
-29
lines changed

2 files changed

+131
-29
lines changed

‎Jenkinsfile‎

Lines changed: 86 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ pipeline {
5757
}
5858

5959
parallel {
60-
stage("test: baseline (hibernate 6.4.x snapshots)") {
60+
stage("test: hibernate 6.2 (LTS)") {
6161
agent {
6262
label 'data'
6363
}
@@ -71,34 +71,97 @@ pipeline {
7171
steps {
7272
script {
7373
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
74-
sh "PROFILE=all-dbs,hibernate-64-next " +
74+
sh "PROFILE=all-dbs,hibernate-62 " +
75+
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
76+
"ci/test.sh"
77+
}
78+
}
79+
}
80+
}
81+
stage("test: baseline (hibernate 6.4 snapshots)") {
82+
agent {
83+
label 'data'
84+
}
85+
options { timeout(time: 30, unit: 'MINUTES')}
86+
environment {
87+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
88+
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
89+
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
90+
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
91+
}
92+
steps {
93+
script {
94+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
95+
sh "PROFILE=all-dbs,hibernate-64-snapshots " +
96+
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
97+
"ci/test.sh"
98+
}
99+
}
100+
}
101+
}
102+
stage("test: baseline (hibernate 6.5)") {
103+
agent {
104+
label 'data'
105+
}
106+
options { timeout(time: 30, unit: 'MINUTES')}
107+
environment {
108+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
109+
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
110+
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
111+
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
112+
}
113+
steps {
114+
script {
115+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
116+
sh "PROFILE=all-dbs,hibernate-65 " +
117+
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
118+
"ci/test.sh"
119+
}
120+
}
121+
}
122+
}
123+
stage("test: baseline (hibernate 6.5 snapshots)") {
124+
agent {
125+
label 'data'
126+
}
127+
options { timeout(time: 30, unit: 'MINUTES')}
128+
environment {
129+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
130+
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
131+
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
132+
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
133+
}
134+
steps {
135+
script {
136+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
137+
sh "PROFILE=all-dbs,hibernate-65-snapshots " +
138+
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
139+
"ci/test.sh"
140+
}
141+
}
142+
}
143+
}
144+
stage("test: baseline (hibernate 6.6 snapshots)") {
145+
agent {
146+
label 'data'
147+
}
148+
options { timeout(time: 30, unit: 'MINUTES')}
149+
environment {
150+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
151+
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
152+
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
153+
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
154+
}
155+
steps {
156+
script {
157+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
158+
sh "PROFILE=all-dbs,hibernate-66-snapshots " +
75159
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
76160
"ci/test.sh"
77161
}
78162
}
79163
}
80164
}
81-
stage("test: hibernate 6.2 (LTS)") {
82-
agent {
83-
label 'data'
84-
}
85-
options { timeout(time: 30, unit: 'MINUTES')}
86-
environment {
87-
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
88-
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
89-
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
90-
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
91-
}
92-
steps {
93-
script {
94-
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
95-
sh "PROFILE=all-dbs,hibernate-62 " +
96-
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
97-
"ci/test.sh"
98-
}
99-
}
100-
}
101-
}
102165
stage("test: java.next (next)") {
103166
agent {
104167
label 'data'

‎pom.xml‎

100644100755
Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,11 @@
3131
<eclipselink>3.0.4</eclipselink>
3232
<eclipselink-next>4.0.2</eclipselink-next>
3333
<hibernate>6.4.4.Final</hibernate>
34-
<hibernate-64-next-snapshots>6.4.5-SNAPSHOT</hibernate-64-next-snapshots>
35-
<hibernate-62>6.2.22.Final</hibernate-62>
34+
<hibernate-62>6.2.24.Final</hibernate-62>
35+
<hibernate-64-snapshots>6.4.5-SNAPSHOT</hibernate-64-snapshots>
36+
<hibernate-65>6.5.0.CR1</hibernate-65>
37+
<hibernate-65-snapshots>6.5.0-SNAPSHOT</hibernate-65-snapshots>
38+
<hibernate-66-snapshots>6.6.0-SNAPSHOT</hibernate-66-snapshots>
3639
<hsqldb>2.7.1</hsqldb>
3740
<h2>2.2.220</h2>
3841
<jakarta-persistence-api>3.1.0</jakarta-persistence-api>
@@ -56,9 +59,15 @@
5659

5760
<profiles>
5861
<profile>
59-
<id>hibernate-64-next</id>
62+
<id>hibernate-62</id>
6063
<properties>
61-
<hibernate>${hibernate-64-next-snapshots}</hibernate>
64+
<hibernate>${hibernate-62}</hibernate>
65+
</properties>
66+
</profile>
67+
<profile>
68+
<id>hibernate-64-snapshots</id>
69+
<properties>
70+
<hibernate>${hibernate-64-snapshots}</hibernate>
6271
</properties>
6372
<repositories>
6473
<repository>
@@ -71,10 +80,40 @@
7180
</repositories>
7281
</profile>
7382
<profile>
74-
<id>hibernate-62</id>
83+
<id>hibernate-65</id>
7584
<properties>
76-
<hibernate>${hibernate-62}</hibernate>
85+
<hibernate>${hibernate-65}</hibernate>
86+
</properties>
87+
</profile>
88+
<profile>
89+
<id>hibernate-65-snapshots</id>
90+
<properties>
91+
<hibernate>${hibernate-65-snapshots}</hibernate>
92+
</properties>
93+
<repositories>
94+
<repository>
95+
<id>sonatype-oss</id>
96+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
97+
<releases>
98+
<enabled>false</enabled>
99+
</releases>
100+
</repository>
101+
</repositories>
102+
</profile>
103+
<profile>
104+
<id>hibernate-66-snapshots</id>
105+
<properties>
106+
<hibernate>${hibernate-66-snapshots}</hibernate>
77107
</properties>
108+
<repositories>
109+
<repository>
110+
<id>sonatype-oss</id>
111+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
112+
<releases>
113+
<enabled>false</enabled>
114+
</releases>
115+
</repository>
116+
</repositories>
78117
</profile>
79118
<profile>
80119
<id>all-dbs</id>

0 commit comments

Comments
 (0)