Skip to content

Commit

Permalink
HSEARCH-5210 Update ci update jobs to address Lucene 9.12 upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
marko-bekhta committed Sep 30, 2024
1 parent 24c5adf commit 249f847
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
11 changes: 5 additions & 6 deletions ci/dependency-update/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,13 @@ Map settings() {
// just rebuild all dependants since ORM7 upgrade will affect all mappers
additionalMavenArgs: '-am'
]
case 'lucene9.11':
case 'lucene9.12':
return [
updateProperties: ['version.org.apache.lucene'],
onlyRunTestDependingOn: ['hibernate-search-backend-lucene'],
additionalMavenArgs: '-Dtest.elasticsearch.skip=true',
// With Lucene adding 9.12 Snapshot the 11 branch seems stale, and we are not getting any updates,
// resulting in the update step failing. Let's allow the build continue,
// just in case there are any new snapshots for 9.11 branch:
// Usually the "current-version"snapshots get stale,
// but just in case there are any new snapshots for 9.12 branch:
skipSourceModifiedCheck: true
]
case 'lucene9':
Expand Down Expand Up @@ -133,7 +132,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.6plus', 'orm7', 'lucene9.11','lucene9', 'lucene10', 'elasticsearch-current', 'elasticsearch-next'], description: 'Select which update jobs to run. `All` will include all configured update jobs.')
choice(name: 'UPDATE_JOB', choices: ['all', 'orm6.6plus', 'orm7', 'lucene9.12','lucene9', 'lucene10', 'elasticsearch-current', 'elasticsearch-next'], 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 @@ -231,7 +230,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.6plus', 'orm7', 'lucene9.11','lucene9', 'lucene10', 'elasticsearch-current', 'elasticsearch-next'
values 'orm6.6plus', 'orm7', 'lucene9.12','lucene9', 'lucene10', 'elasticsearch-current', 'elasticsearch-next'
}
}
stages {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<ignoreVersions>
<!-- Restrict allowed versions to a particular major/range-of-minors, because forbidding major/minor upgrades
in the version-maven-plugin configuration doesn't always work for some reason. -->
<ignoreVersion type="regex">(?!9\.11\.).*</ignoreVersion>
<ignoreVersion type="regex">(?!9\.12\.).*</ignoreVersion>
</ignoreVersions>
</ruleset>

0 comments on commit 249f847

Please sign in to comment.