Skip to content

Commit 3f4cc4a

Browse files
committed
HSEARCH-5438 Test against Elasticsearch 9.1.0 by default
1 parent 4acd431 commit 3f4cc4a

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

Jenkinsfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,8 @@ stage('Configure') {
260260
new LocalElasticsearchBuildEnvironment(version: '8.16.1', condition: TestCondition.ON_DEMAND),
261261
new LocalElasticsearchBuildEnvironment(version: '8.17.6', condition: TestCondition.ON_DEMAND),
262262
new LocalElasticsearchBuildEnvironment(version: '8.18.4', condition: TestCondition.AFTER_MERGE),
263-
new LocalElasticsearchBuildEnvironment(version: '9.0.4', condition: TestCondition.BEFORE_MERGE, isDefault: true),
263+
new LocalElasticsearchBuildEnvironment(version: '9.0.4', condition: TestCondition.ON_DEMAND),
264+
new LocalElasticsearchBuildEnvironment(version: '9.1.0', condition: TestCondition.BEFORE_MERGE, isDefault: true),
264265
// IMPORTANT: Make sure to update the documentation for any newly supported Elasticsearch versions
265266
// See version.org.elasticsearch.compatible.expected.text
266267
// and version.org.elasticsearch.compatible.regularly-tested.text in POMs.

build/container/search-backend/elastic.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# * update `version.org.elasticsearch.latest` property in a POM file.
66
# * update the tags for 'elasticsearch-current' and 'elasticsearch-next' builds in ci/dependency-update/Jenkinsfile
77
#
8-
FROM docker.io/elastic/elasticsearch:9.0.4
8+
FROM docker.io/elastic/elasticsearch:9.1.0

build/parents/build/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<!-- The versions of Elasticsearch advertised as compatible with Hibernate Search -->
5858
<!-- Make sure to only mention tested versions here -->
5959
<!-- Make sure that 7.10 stays explicitly mentioned here, because that's the last open-source version -->
60-
<version.org.elasticsearch.compatible.regularly-tested.text>7.10, 7.17, 8.18 or 9.0</version.org.elasticsearch.compatible.regularly-tested.text>
60+
<version.org.elasticsearch.compatible.regularly-tested.text>7.10, 7.17, 8.18 or 9.1</version.org.elasticsearch.compatible.regularly-tested.text>
6161
<!-- These are the versions same as above, but pointing only to the major part (used in compatibility section of ES backend documentation
6262
as versions that Hibernate Search is compatible with. -->
6363
<!-- NOTE: Adding new major versions would require to update the compatibility table in `backend-elasticsearch-compatibility` section of `backend-elasticsearch.adoc`. -->

ci/dependency-update/Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Map settings() {
6060
updateProperties: [],
6161
onlyRunTestDependingOn: ['hibernate-search-backend-elasticsearch'],
6262
// We want to use the snapshot version of an image from the ES registry since that's where they are publishing their snapshots.
63-
additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=9.0.5-SNAPSHOT',
63+
additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=9.1.1-SNAPSHOT',
6464
// This job won't change the versions in the pom. We are passing the latest Elasticsearch version through an additional maven argument `-D`
6565
skipSourceModifiedCheck: true
6666
]
@@ -72,7 +72,7 @@ Map settings() {
7272
updateProperties: [],
7373
onlyRunTestDependingOn: ['hibernate-search-backend-elasticsearch'],
7474
// We want to use the snapshot version of an image from the ES registry since that's where they are publishing their snapshots.
75-
additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=9.1.0-SNAPSHOT',
75+
additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=9.2.0-SNAPSHOT',
7676
// This job won't change the versions in the pom. We are passing the latest Elasticsearch version through an additional maven argument `-D`
7777
skipSourceModifiedCheck: true
7878
]

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@
389389

390390
<!-- Container images for various integration tests -->
391391
<!-- The latest version of Elasticsearch tested against by default -->
392-
<version.org.elasticsearch.latest>9.0.4</version.org.elasticsearch.latest>
392+
<version.org.elasticsearch.latest>9.1.0</version.org.elasticsearch.latest>
393393
<test.elasticsearch.version></test.elasticsearch.version>
394394
<test.elasticsearch.distribution>elastic</test.elasticsearch.distribution>
395395

0 commit comments

Comments
 (0)