Skip to content

Commit 61f025e

Browse files
Mikep86Mikep86
committed
Merge branch 'main' into inference_metadata_fields
2 parents de13467 + b4610c8 commit 61f025e

File tree

732 files changed

+18594
-6782
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

732 files changed

+18594
-6782
lines changed

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ steps:
5656
timeout_in_minutes: 300
5757
matrix:
5858
setup:
59-
BWC_VERSION: ["8.15.6", "8.16.2", "8.17.0", "8.18.0", "9.0.0"]
59+
BWC_VERSION: ["8.16.2", "8.17.1", "8.18.0", "9.0.0"]
6060
agents:
6161
provider: gcp
6262
image: family/elasticsearch-ubuntu-2004

‎.buildkite/pipelines/periodic-packaging.template.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ steps:
1818
- rhel-8
1919
- rhel-9
2020
- almalinux-8
21+
- almalinux-9
2122
agents:
2223
provider: gcp
2324
image: family/elasticsearch-{{matrix.image}}

‎.buildkite/pipelines/periodic-packaging.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ steps:
1919
- rhel-8
2020
- rhel-9
2121
- almalinux-8
22+
- almalinux-9
2223
agents:
2324
provider: gcp
2425
image: family/elasticsearch-{{matrix.image}}
@@ -268,8 +269,8 @@ steps:
268269
env:
269270
BWC_VERSION: 8.14.3
270271

271-
- label: "{{matrix.image}} / 8.15.6 / packaging-tests-upgrade"
272-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.6
272+
- label: "{{matrix.image}} / 8.15.5 / packaging-tests-upgrade"
273+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.5
273274
timeout_in_minutes: 300
274275
matrix:
275276
setup:
@@ -282,7 +283,7 @@ steps:
282283
machineType: custom-16-32768
283284
buildDirectory: /dev/shm/bk
284285
env:
285-
BWC_VERSION: 8.15.6
286+
BWC_VERSION: 8.15.5
286287

287288
- label: "{{matrix.image}} / 8.16.2 / packaging-tests-upgrade"
288289
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.2
@@ -300,8 +301,8 @@ steps:
300301
env:
301302
BWC_VERSION: 8.16.2
302303

303-
- label: "{{matrix.image}} / 8.17.0 / packaging-tests-upgrade"
304-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.0
304+
- label: "{{matrix.image}} / 8.17.1 / packaging-tests-upgrade"
305+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.1
305306
timeout_in_minutes: 300
306307
matrix:
307308
setup:
@@ -314,7 +315,7 @@ steps:
314315
machineType: custom-16-32768
315316
buildDirectory: /dev/shm/bk
316317
env:
317-
BWC_VERSION: 8.17.0
318+
BWC_VERSION: 8.17.1
318319

319320
- label: "{{matrix.image}} / 8.18.0 / packaging-tests-upgrade"
320321
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.0

‎.buildkite/pipelines/periodic-platform-support.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ steps:
1818
- rhel-8
1919
- rhel-9
2020
- almalinux-8
21+
- almalinux-9
2122
agents:
2223
provider: gcp
2324
image: family/elasticsearch-{{matrix.image}}

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,8 @@ steps:
287287
- signal_reason: agent_stop
288288
limit: 3
289289

290-
- label: 8.15.6 / bwc
291-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.6#bwcTest
290+
- label: 8.15.5 / bwc
291+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.5#bwcTest
292292
timeout_in_minutes: 300
293293
agents:
294294
provider: gcp
@@ -297,7 +297,7 @@ steps:
297297
buildDirectory: /dev/shm/bk
298298
preemptible: true
299299
env:
300-
BWC_VERSION: 8.15.6
300+
BWC_VERSION: 8.15.5
301301
retry:
302302
automatic:
303303
- exit_status: "-1"
@@ -325,8 +325,8 @@ steps:
325325
- signal_reason: agent_stop
326326
limit: 3
327327

328-
- label: 8.17.0 / bwc
329-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.0#bwcTest
328+
- label: 8.17.1 / bwc
329+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.1#bwcTest
330330
timeout_in_minutes: 300
331331
agents:
332332
provider: gcp
@@ -335,7 +335,7 @@ steps:
335335
buildDirectory: /dev/shm/bk
336336
preemptible: true
337337
env:
338-
BWC_VERSION: 8.17.0
338+
BWC_VERSION: 8.17.1
339339
retry:
340340
automatic:
341341
- exit_status: "-1"
@@ -448,7 +448,7 @@ steps:
448448
setup:
449449
ES_RUNTIME_JAVA:
450450
- openjdk21
451-
BWC_VERSION: ["8.15.6", "8.16.2", "8.17.0", "8.18.0", "9.0.0"]
451+
BWC_VERSION: ["8.16.2", "8.17.1", "8.18.0", "9.0.0"]
452452
agents:
453453
provider: gcp
454454
image: family/elasticsearch-ubuntu-2004
@@ -490,7 +490,7 @@ steps:
490490
ES_RUNTIME_JAVA:
491491
- openjdk21
492492
- openjdk23
493-
BWC_VERSION: ["8.15.6", "8.16.2", "8.17.0", "8.18.0", "9.0.0"]
493+
BWC_VERSION: ["8.16.2", "8.17.1", "8.18.0", "9.0.0"]
494494
agents:
495495
provider: gcp
496496
image: family/elasticsearch-ubuntu-2004

‎.buildkite/pipelines/pull-request/packaging-tests-unix.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ steps:
2121
- rhel-8
2222
- rhel-9
2323
- almalinux-8
24+
- almalinux-9
2425
PACKAGING_TASK:
2526
- docker
2627
- docker-cloud-ess

‎.ci/bwcVersions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ BWC_VERSION:
1414
- "8.12.2"
1515
- "8.13.4"
1616
- "8.14.3"
17-
- "8.15.6"
17+
- "8.15.5"
1818
- "8.16.2"
19-
- "8.17.0"
19+
- "8.17.1"
2020
- "8.18.0"
2121
- "9.0.0"

‎.ci/snapshotBwcVersions‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
BWC_VERSION:
2-
- "8.15.6"
32
- "8.16.2"
4-
- "8.17.0"
3+
- "8.17.1"
54
- "8.18.0"
65
- "9.0.0"

‎branches.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
{
1414
"branch": "8.x"
1515
},
16-
{
17-
"branch": "8.15"
18-
},
1916
{
2017
"branch": "7.17"
2118
}

‎build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/FormattingPrecommitPlugin.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import org.gradle.api.Project;
1818

1919
import java.io.File;
20-
import java.util.Arrays;
21-
import java.util.Map;
2220

2321
/**
2422
* This plugin configures formatting for Java source using Spotless
@@ -66,8 +64,7 @@ public void apply(Project project) {
6664
java.importOrderFile(new File(elasticsearchWorkspace, importOrderPath));
6765

6866
// Most formatting is done through the Eclipse formatter
69-
java.eclipse().withP2Mirrors(Map.of("https://download.eclipse.org/", "https://mirror.umd.edu/eclipse/"))
70-
.configFile(new File(elasticsearchWorkspace, formatterConfigPath));
67+
java.eclipse().configFile(new File(elasticsearchWorkspace, formatterConfigPath));
7168

7269
// Ensure blank lines are actually empty. Since formatters are applied in
7370
// order, apply this one last, otherwise non-empty blank lines can creep

0 commit comments

Comments
 (0)