Skip to content

Commit 66efe55

Browse files
committed
HSEARCH-5289 Test against Elasticsearch 8.17.0 by default
1 parent 18b4f02 commit 66efe55

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

Jenkinsfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,8 @@ stage('Configure') {
269269
new LocalElasticsearchBuildEnvironment(version: '8.13.4', condition: TestCondition.ON_DEMAND),
270270
new LocalElasticsearchBuildEnvironment(version: '8.14.3', condition: TestCondition.ON_DEMAND),
271271
new LocalElasticsearchBuildEnvironment(version: '8.15.4', condition: TestCondition.ON_DEMAND),
272-
new LocalElasticsearchBuildEnvironment(version: '8.16.1', condition: TestCondition.BEFORE_MERGE, isDefault: true),
272+
new LocalElasticsearchBuildEnvironment(version: '8.16.1', condition: TestCondition.ON_DEMAND),
273+
new LocalElasticsearchBuildEnvironment(version: '8.17.0', condition: TestCondition.BEFORE_MERGE, isDefault: true),
273274
// IMPORTANT: Make sure to update the documentation for any newly supported Elasticsearch versions
274275
// See version.org.elasticsearch.compatible.expected.text
275276
// 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:8.16.1
8+
FROM docker.io/elastic/elasticsearch:8.17.0

build/parents/build/pom.xml

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

ci/dependency-update/Jenkinsfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ Map settings() {
4646
updateProperties: [],
4747
onlyRunTestDependingOn: ['hibernate-search-backend-elasticsearch'],
4848
// We want to use the snapshot version of an image from the ES registry since that's where they are publishing their snapshots.
49-
additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=8.16.2-SNAPSHOT',
50-
// This job won't change the versions in the pom. We are passing the latest Elasticsearch version through an additional maven argument `-D`
49+
additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=8.17.1-SNAPSHOT', // This job won't change the versions in the pom. We are passing the latest Elasticsearch version through an additional maven argument `-D`
5150
skipSourceModifiedCheck: true
5251
]
5352
// Targets the next major/minor release of the of Elasticsearch
@@ -58,7 +57,7 @@ Map settings() {
5857
updateProperties: [],
5958
onlyRunTestDependingOn: ['hibernate-search-backend-elasticsearch'],
6059
// We want to use the snapshot version of an image from the ES registry since that's where they are publishing their snapshots.
61-
additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=8.17.0-SNAPSHOT',
60+
additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=8.18.0-SNAPSHOT',
6261
// This job won't change the versions in the pom. We are passing the latest Elasticsearch version through an additional maven argument `-D`
6362
skipSourceModifiedCheck: true
6463
]

pom.xml

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

378378
<!-- Container images for various integration tests -->
379379
<!-- The latest version of Elasticsearch tested against by default -->
380-
<version.org.elasticsearch.latest>8.16.1</version.org.elasticsearch.latest>
380+
<version.org.elasticsearch.latest>8.17.0</version.org.elasticsearch.latest>
381381
<test.elasticsearch.version></test.elasticsearch.version>
382382
<test.elasticsearch.distribution>elastic</test.elasticsearch.distribution>
383383

0 commit comments

Comments
 (0)