From 9e5f8cfdd3ee067b2f7d94fa4046c90eb741c215 Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Wed, 14 Aug 2024 09:53:14 +0200 Subject: [PATCH] HSEARCH-5222 Replace testing of elasticsearch-latest --- ci/dependency-update/Jenkinsfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ci/dependency-update/Jenkinsfile b/ci/dependency-update/Jenkinsfile index 5322fa3f571..79fb21273c9 100644 --- a/ci/dependency-update/Jenkinsfile +++ b/ci/dependency-update/Jenkinsfile @@ -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 ] @@ -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.') @@ -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 {