Skip to content

Commit

Permalink
HSEARCH-5222 Replace testing of elasticsearch-latest
Browse files Browse the repository at this point in the history
  • Loading branch information
marko-bekhta committed Aug 14, 2024
1 parent 12ecad2 commit 9e5f8cf
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions ci/dependency-update/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@ Map settings() {
onlyRunTestDependingOn: ['hibernate-search-backend-lucene'],
additionalMavenArgs: '-Dtest.elasticsearch.skip=true'
]
case 'elasticsearch-latest':
// Targets the next micro release of the latest/currently integrated version of Elasticsearch
// (previous minor version is already published)
case 'elasticsearch-current':
return [
// There are no properties to update in this case.
updateProperties: [],
onlyRunTestDependingOn: ['hibernate-search-backend-elasticsearch'],
// We want to use the snapshot version of an image from the ES registry since that's where they are publishing their snapshots.
additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=master-SNAPSHOT',
additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=8.13.5-SNAPSHOT',
// This job won't change the versions in the pom. We are passing the latest Elasticsearch version through an additional maven argument `-D`
skipSourceModifiedCheck: true
]
Expand Down Expand Up @@ -88,7 +90,7 @@ pipeline {
parameters {
// choice parameter doesn't have a default, but the first value should be treated as a default, if it wasn't specified manually.
// Make sure tp update axis and settings() when adding new choice parameter.
choice(name: 'UPDATE_JOB', choices: ['all', 'orm6.4', 'orm6.5', 'lucene9.9','elasticsearch-latest'], description: 'Select which update jobs to run. `All` will include all configured update jobs.')
choice(name: 'UPDATE_JOB', choices: ['all', 'orm6.4', 'orm6.5', 'lucene9.9','elasticsearch-current'], description: 'Select which update jobs to run. `All` will include all configured update jobs.')
string(name: 'ORM_REPOSITORY', defaultValue: '', description: 'Git URL to Hibernate ORM repository. If provided, Hibernate ORM will be built locally. Works only in pair with ORM_BRANCH. Provide an http repository URL rather than an ssh one.')
string(name: 'ORM_BRANCH', defaultValue: '', description: 'Hibernate ORM branch to build from. If provided, Hibernate ORM will be built locally. Works only in pair with ORM_REPOSITORY. Either a pull request ID or a branch name should be provided, but not both at the same time. Use branch if you want to build from a fork repository.')
string(name: 'ORM_PULL_REQUEST_ID', defaultValue: '', description: 'Hibernate ORM pull request id to build from. If provided, Hibernate ORM will be built locally. Works only in pair with ORM_REPOSITORY. Either a pull request ID or a branch name should be provided, but not both at the same time.')
Expand Down Expand Up @@ -183,7 +185,7 @@ pipeline {
name 'DEPENDENCY_UPDATE_NAME'
// NOTE: Remember to update the settings() method above when changing this.
// And also add a new choice parameter in the parameters {} section of the pipeline
values 'orm6.4', 'orm6.5', 'lucene9.9', 'elasticsearch-latest'
values 'orm6.4', 'orm6.5', 'lucene9.9', 'elasticsearch-current'
}
}
stages {
Expand Down

0 comments on commit 9e5f8cf

Please sign in to comment.