Skip to content

Commit 15572c1

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 e659f30 commit 15572c1

File tree

2 files changed

+131
-12
lines changed

2 files changed

+131
-12
lines changed

‎Jenkinsfile‎

Lines changed: 76 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,38 +54,107 @@ pipeline {
5454
}
5555

5656
parallel {
57-
stage("test: java.next (hibernate 6.1)") {
57+
stage("test: baseline (hibernate 6.4)") {
5858
agent {
5959
label 'data'
6060
}
6161
options { timeout(time: 30, unit: 'MINUTES')}
6262
environment {
6363
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
64+
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
65+
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
6466
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
6567
}
6668
steps {
6769
script {
6870
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
69-
sh 'PROFILE=all-dbs,hibernate-61 ci/test.sh'
70-
sh "ci/clean.sh"
71+
sh "PROFILE=all-dbs,hibernate-64 " +
72+
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
73+
"ci/test.sh"
7174
}
7275
}
7376
}
7477
}
75-
stage("test: baseline (hibernate 6.3)") {
78+
stage("test: baseline (hibernate 6.4 snapshots)") {
7679
agent {
7780
label 'data'
7881
}
7982
options { timeout(time: 30, unit: 'MINUTES')}
8083
environment {
8184
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
85+
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
86+
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
8287
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
8388
}
8489
steps {
8590
script {
86-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
87-
sh 'PROFILE=all-dbs,hibernate-63 ci/test.sh'
88-
sh "ci/clean.sh"
91+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
92+
sh "PROFILE=all-dbs,hibernate-64-snapshots " +
93+
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
94+
"ci/test.sh"
95+
}
96+
}
97+
}
98+
}
99+
stage("test: baseline (hibernate 6.5)") {
100+
agent {
101+
label 'data'
102+
}
103+
options { timeout(time: 30, unit: 'MINUTES')}
104+
environment {
105+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
106+
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
107+
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
108+
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
109+
}
110+
steps {
111+
script {
112+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
113+
sh "PROFILE=all-dbs,hibernate-65 " +
114+
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
115+
"ci/test.sh"
116+
}
117+
}
118+
}
119+
}
120+
stage("test: baseline (hibernate 6.5 snapshots)") {
121+
agent {
122+
label 'data'
123+
}
124+
options { timeout(time: 30, unit: 'MINUTES')}
125+
environment {
126+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
127+
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
128+
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
129+
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
130+
}
131+
steps {
132+
script {
133+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
134+
sh "PROFILE=all-dbs,hibernate-65-snapshots " +
135+
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
136+
"ci/test.sh"
137+
}
138+
}
139+
}
140+
}
141+
stage("test: baseline (hibernate 6.6 snapshots)") {
142+
agent {
143+
label 'data'
144+
}
145+
options { timeout(time: 30, unit: 'MINUTES')}
146+
environment {
147+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
148+
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
149+
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
150+
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
151+
}
152+
steps {
153+
script {
154+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
155+
sh "PROFILE=all-dbs,hibernate-66-snapshots " +
156+
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
157+
"ci/test.sh"
89158
}
90159
}
91160
}

‎pom.xml‎

Lines changed: 55 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@
2929
<properties>
3030
<antlr>4.10.1</antlr> <!-- align with Hibernate's parser -->
3131
<eclipselink>3.0.4</eclipselink>
32-
<hibernate>6.2.4.Final</hibernate>
32+
<hibernate>6.2.24.Final</hibernate>
33+
<hibernate-64>6.4.4.Final</hibernate-64>
34+
<hibernate-64-snapshots>6.4.5-SNAPSHOT</hibernate-64-snapshots>
35+
<hibernate-65>6.5.0.CR1</hibernate-65>
36+
<hibernate-65-snapshots>6.5.0-SNAPSHOT</hibernate-65-snapshots>
37+
<hibernate-66-snapshots>6.6.0-SNAPSHOT</hibernate-66-snapshots>
3338
<hsqldb>2.7.1</hsqldb>
3439
<h2>2.1.214</h2>
3540
<jsqlparser>4.5</jsqlparser>
@@ -53,16 +58,61 @@
5358

5459
<profiles>
5560
<profile>
56-
<id>hibernate-61</id>
61+
<id>hibernate-64</id>
5762
<properties>
58-
<hibernate>6.1.7.Final</hibernate>
63+
<hibernate>${hibernate-64}</hibernate>
5964
</properties>
6065
</profile>
6166
<profile>
62-
<id>hibernate-63</id>
67+
<id>hibernate-64-snapshots</id>
6368
<properties>
64-
<hibernate>6.3.0.CR1</hibernate>
69+
<hibernate>${hibernate-64-snapshots}</hibernate>
6570
</properties>
71+
<repositories>
72+
<repository>
73+
<id>sonatype-oss</id>
74+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
75+
<releases>
76+
<enabled>false</enabled>
77+
</releases>
78+
</repository>
79+
</repositories>
80+
</profile>
81+
<profile>
82+
<id>hibernate-65</id>
83+
<properties>
84+
<hibernate>${hibernate-65}</hibernate>
85+
</properties>
86+
</profile>
87+
<profile>
88+
<id>hibernate-65-snapshots</id>
89+
<properties>
90+
<hibernate>${hibernate-65-snapshots}</hibernate>
91+
</properties>
92+
<repositories>
93+
<repository>
94+
<id>sonatype-oss</id>
95+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
96+
<releases>
97+
<enabled>false</enabled>
98+
</releases>
99+
</repository>
100+
</repositories>
101+
</profile>
102+
<profile>
103+
<id>hibernate-66-snapshots</id>
104+
<properties>
105+
<hibernate>${hibernate-66-snapshots}</hibernate>
106+
</properties>
107+
<repositories>
108+
<repository>
109+
<id>sonatype-oss</id>
110+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
111+
<releases>
112+
<enabled>false</enabled>
113+
</releases>
114+
</repository>
115+
</repositories>
66116
</profile>
67117
<profile>
68118
<id>all-dbs</id>

0 commit comments

Comments
 (0)