Skip to content

merge main into lucene_snapshot resolving conflicts #136096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2025
Merged

merge main into lucene_snapshot resolving conflicts #136096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .buildkite/pipelines/intake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ steps:
timeout_in_minutes: 300
matrix:
setup:
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.5", "9.2.0"]
BWC_VERSION: ["8.18.9", "8.19.6", "9.0.9", "9.1.6", "9.2.0", "9.3.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2404
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/periodic-fwc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ steps:
buildDirectory: /dev/shm/bk
matrix:
setup:
FWC_VERSION: ["9.3.0"]
FWC_VERSION: []
env:
FWC_VERSION: "{{matrix.FWC_VERSION}}"
26 changes: 13 additions & 13 deletions .buildkite/pipelines/periodic-java-ea.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,8 @@ steps:
- signal_reason: agent_stop
limit: 3

- label: 8.18.8 / bwc
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.18.8#bwcTest
- label: 8.18.9 / bwc
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.18.9#bwcTest
timeout_in_minutes: 300
agents:
provider: gcp
Expand All @@ -357,7 +357,7 @@ steps:
buildDirectory: /dev/shm/bk
preemptible: true
env:
BWC_VERSION: 8.18.8
BWC_VERSION: 8.18.9
retry:
automatic:
- exit_status: "-1"
Expand All @@ -366,8 +366,8 @@ steps:
- signal_reason: agent_stop
limit: 3

- label: 8.19.5 / bwc
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.19.5#bwcTest
- label: 8.19.6 / bwc
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.19.6#bwcTest
timeout_in_minutes: 300
agents:
provider: gcp
Expand All @@ -376,7 +376,7 @@ steps:
buildDirectory: /dev/shm/bk
preemptible: true
env:
BWC_VERSION: 8.19.5
BWC_VERSION: 8.19.6
retry:
automatic:
- exit_status: "-1"
Expand All @@ -385,8 +385,8 @@ steps:
- signal_reason: agent_stop
limit: 3

- label: 9.0.8 / bwc
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.0.8#bwcTest
- label: 9.0.9 / bwc
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.0.9#bwcTest
timeout_in_minutes: 300
agents:
provider: gcp
Expand All @@ -395,7 +395,7 @@ steps:
buildDirectory: /dev/shm/bk
preemptible: true
env:
BWC_VERSION: 9.0.8
BWC_VERSION: 9.0.9
retry:
automatic:
- exit_status: "-1"
Expand All @@ -404,8 +404,8 @@ steps:
- signal_reason: agent_stop
limit: 3

- label: 9.1.5 / bwc
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.5#bwcTest
- label: 9.1.6 / bwc
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.6#bwcTest
timeout_in_minutes: 300
agents:
provider: gcp
Expand All @@ -414,7 +414,7 @@ steps:
buildDirectory: /dev/shm/bk
preemptible: true
env:
BWC_VERSION: 9.1.5
BWC_VERSION: 9.1.6
retry:
automatic:
- exit_status: "-1"
Expand Down Expand Up @@ -538,7 +538,7 @@ steps:
timeout_in_minutes: 300
matrix:
setup:
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.5", "9.2.0"]
BWC_VERSION: ["8.18.9", "8.19.6", "9.0.9", "9.1.6", "9.2.0", "9.3.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2404
Expand Down
24 changes: 12 additions & 12 deletions .buildkite/pipelines/periodic-packaging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ steps:
env:
BWC_VERSION: 8.17.10

- label: "{{matrix.image}} / 8.18.8 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.8
- label: "{{matrix.image}} / 8.18.9 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.9
timeout_in_minutes: 300
matrix:
setup:
Expand All @@ -332,10 +332,10 @@ steps:
machineType: custom-16-32768
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 8.18.8
BWC_VERSION: 8.18.9

- label: "{{matrix.image}} / 8.19.5 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.5
- label: "{{matrix.image}} / 8.19.6 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.6
timeout_in_minutes: 300
matrix:
setup:
Expand All @@ -348,10 +348,10 @@ steps:
machineType: custom-16-32768
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 8.19.5
BWC_VERSION: 8.19.6

- label: "{{matrix.image}} / 9.0.8 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.8
- label: "{{matrix.image}} / 9.0.9 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.9
timeout_in_minutes: 300
matrix:
setup:
Expand All @@ -364,10 +364,10 @@ steps:
machineType: custom-16-32768
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 9.0.8
BWC_VERSION: 9.0.9

- label: "{{matrix.image}} / 9.1.5 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.5
- label: "{{matrix.image}} / 9.1.6 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.6
timeout_in_minutes: 300
matrix:
setup:
Expand All @@ -380,7 +380,7 @@ steps:
machineType: custom-16-32768
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 9.1.5
BWC_VERSION: 9.1.6

- label: "{{matrix.image}} / 9.2.0 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.0
Expand Down
28 changes: 14 additions & 14 deletions .buildkite/pipelines/periodic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,8 @@ steps:
- signal_reason: agent_stop
limit: 3

- label: 8.18.8 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.8#bwcTest
- label: 8.18.9 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.9#bwcTest
timeout_in_minutes: 300
agents:
provider: gcp
Expand All @@ -354,7 +354,7 @@ steps:
buildDirectory: /dev/shm/bk
preemptible: true
env:
BWC_VERSION: 8.18.8
BWC_VERSION: 8.18.9
retry:
automatic:
- exit_status: "-1"
Expand All @@ -363,8 +363,8 @@ steps:
- signal_reason: agent_stop
limit: 3

- label: 8.19.5 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.19.5#bwcTest
- label: 8.19.6 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.19.6#bwcTest
timeout_in_minutes: 300
agents:
provider: gcp
Expand All @@ -373,7 +373,7 @@ steps:
buildDirectory: /dev/shm/bk
preemptible: true
env:
BWC_VERSION: 8.19.5
BWC_VERSION: 8.19.6
retry:
automatic:
- exit_status: "-1"
Expand All @@ -382,8 +382,8 @@ steps:
- signal_reason: agent_stop
limit: 3

- label: 9.0.8 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.8#bwcTest
- label: 9.0.9 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.9#bwcTest
timeout_in_minutes: 300
agents:
provider: gcp
Expand All @@ -392,7 +392,7 @@ steps:
buildDirectory: /dev/shm/bk
preemptible: true
env:
BWC_VERSION: 9.0.8
BWC_VERSION: 9.0.9
retry:
automatic:
- exit_status: "-1"
Expand All @@ -401,8 +401,8 @@ steps:
- signal_reason: agent_stop
limit: 3

- label: 9.1.5 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.1.5#bwcTest
- label: 9.1.6 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.1.6#bwcTest
timeout_in_minutes: 300
agents:
provider: gcp
Expand All @@ -411,7 +411,7 @@ steps:
buildDirectory: /dev/shm/bk
preemptible: true
env:
BWC_VERSION: 9.1.5
BWC_VERSION: 9.1.6
retry:
automatic:
- exit_status: "-1"
Expand Down Expand Up @@ -525,7 +525,7 @@ steps:
setup:
ES_RUNTIME_JAVA:
- openjdk21
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.5", "9.2.0"]
BWC_VERSION: ["8.18.9", "8.19.6", "9.0.9", "9.1.6", "9.2.0", "9.3.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2404
Expand Down Expand Up @@ -569,7 +569,7 @@ steps:
ES_RUNTIME_JAVA:
- openjdk21
- openjdk23
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.5", "9.2.0"]
BWC_VERSION: ["8.18.9", "8.19.6", "9.0.9", "9.1.6", "9.2.0", "9.3.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2404
Expand Down
8 changes: 4 additions & 4 deletions .ci/bwcVersions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ BWC_VERSION:
- "8.15.5"
- "8.16.6"
- "8.17.10"
- "8.18.8"
- "8.19.5"
- "9.0.8"
- "9.1.5"
- "8.18.9"
- "8.19.6"
- "9.0.9"
- "9.1.6"
- "9.2.0"
- "9.3.0"
9 changes: 5 additions & 4 deletions .ci/snapshotBwcVersions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
BWC_VERSION:
- "8.18.8"
- "8.19.5"
- "9.0.8"
- "9.1.5"
- "8.18.9"
- "8.19.6"
- "9.0.9"
- "9.1.6"
- "9.2.0"
- "9.3.0"
8 changes: 4 additions & 4 deletions branches.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
},
{
"branch" : "9.1",
"version" : "9.1.5"
"version" : "9.1.6"
},
{
"branch" : "9.0",
"version" : "9.0.8"
"version" : "9.0.9"
},
{
"branch" : "8.19",
"version" : "8.19.5"
"version" : "8.19.6"
},
{
"branch" : "8.18",
"version" : "8.18.8"
"version" : "8.18.9"
},
{
"branch" : "7.17",
Expand Down
6 changes: 0 additions & 6 deletions docs/changelog/134461.yaml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions docs/changelog/134582.yaml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions docs/changelog/134636.yaml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions docs/changelog/134656.yaml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions docs/changelog/134673.yaml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions docs/changelog/134790.yaml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/134887.yaml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions docs/changelog/134955.yaml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions docs/changelog/134963.yaml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions docs/changelog/135012.yaml
View file
Open in desktop

This file was deleted.

Loading
Loading