Skip to content

Commit c0a677b

Browse files
smalyshevsmalyshev
authored
Merge branch 'main' into skip-on-fail
2 parents 496c273 + 38a34d9 commit c0a677b

File tree

1,404 files changed

+44140
-15083
lines changed

Some content is hidden

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

1,404 files changed

+44140
-15083
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.0", "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 & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,18 @@ steps:
77
matrix:
88
setup:
99
image:
10-
- debian-11
1110
- debian-12
1211
- opensuse-leap-15
13-
- oraclelinux-7
1412
- oraclelinux-8
15-
- sles-12
1613
- sles-15
17-
- ubuntu-1804
1814
- ubuntu-2004
1915
- ubuntu-2204
2016
- rocky-8
2117
- rocky-9
22-
- rhel-7
2318
- rhel-8
2419
- rhel-9
2520
- almalinux-8
21+
- almalinux-9
2622
agents:
2723
provider: gcp
2824
image: family/elasticsearch-{{matrix.image}}

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,18 @@ steps:
88
matrix:
99
setup:
1010
image:
11-
- debian-11
1211
- debian-12
1312
- opensuse-leap-15
14-
- oraclelinux-7
1513
- oraclelinux-8
16-
- sles-12
1714
- sles-15
18-
- ubuntu-1804
1915
- ubuntu-2004
2016
- ubuntu-2204
2117
- rocky-8
2218
- rocky-9
23-
- rhel-7
2419
- rhel-8
2520
- rhel-9
2621
- almalinux-8
22+
- almalinux-9
2723
agents:
2824
provider: gcp
2925
image: family/elasticsearch-{{matrix.image}}
@@ -273,8 +269,8 @@ steps:
273269
env:
274270
BWC_VERSION: 8.14.3
275271

276-
- label: "{{matrix.image}} / 8.15.6 / packaging-tests-upgrade"
277-
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
278274
timeout_in_minutes: 300
279275
matrix:
280276
setup:
@@ -287,7 +283,7 @@ steps:
287283
machineType: custom-16-32768
288284
buildDirectory: /dev/shm/bk
289285
env:
290-
BWC_VERSION: 8.15.6
286+
BWC_VERSION: 8.15.5
291287

292288
- label: "{{matrix.image}} / 8.16.2 / packaging-tests-upgrade"
293289
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.2

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,18 @@ steps:
77
matrix:
88
setup:
99
image:
10-
- debian-11
1110
- debian-12
1211
- opensuse-leap-15
13-
- oraclelinux-7
1412
- oraclelinux-8
15-
- sles-12
1613
- sles-15
17-
- ubuntu-1804
1814
- ubuntu-2004
1915
- ubuntu-2204
2016
- rocky-8
2117
- rocky-9
22-
- rhel-7
2318
- rhel-8
2419
- rhel-9
2520
- almalinux-8
21+
- almalinux-9
2622
agents:
2723
provider: gcp
2824
image: family/elasticsearch-{{matrix.image}}
@@ -90,7 +86,6 @@ steps:
9086
setup:
9187
image:
9288
- amazonlinux-2023
93-
- amazonlinux-2
9489
agents:
9590
provider: aws
9691
imagePrefix: elasticsearch-{{matrix.image}}

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 5 additions & 5 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"
@@ -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.0", "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.0", "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 & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,18 @@ steps:
1010
matrix:
1111
setup:
1212
image:
13-
- debian-11
1413
- debian-12
1514
- opensuse-leap-15
16-
- oraclelinux-7
1715
- oraclelinux-8
18-
- sles-12
1916
- sles-15
20-
- ubuntu-1804
2117
- ubuntu-2004
2218
- ubuntu-2204
2319
- rocky-8
2420
- rocky-9
25-
- rhel-7
2621
- rhel-8
2722
- rhel-9
2823
- almalinux-8
24+
- almalinux-9
2925
PACKAGING_TASK:
3026
- docker
3127
- docker-cloud-ess

‎.ci/bwcVersions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ 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"
1919
- "8.17.0"
2020
- "8.18.0"

‎.ci/snapshotBwcVersions‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
BWC_VERSION:
2-
- "8.15.6"
32
- "8.16.2"
43
- "8.17.0"
54
- "8.18.0"

‎benchmarks/src/main/java/org/elasticsearch/benchmark/search/fetch/subphase/FetchSourcePhaseBenchmark.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void setup() throws IOException {
6363
);
6464
includesSet = Set.of(fetchContext.includes());
6565
excludesSet = Set.of(fetchContext.excludes());
66-
parserConfig = XContentParserConfiguration.EMPTY.withFiltering(includesSet, excludesSet, false);
66+
parserConfig = XContentParserConfiguration.EMPTY.withFiltering(null, includesSet, excludesSet, false);
6767
}
6868

6969
private BytesReference read300BytesExample() throws IOException {

‎benchmarks/src/main/java/org/elasticsearch/benchmark/xcontent/FilterContentBenchmark.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ private XContentParserConfiguration buildParseConfig(boolean matchDotsInFieldNam
170170
includes = null;
171171
excludes = filters;
172172
}
173-
return XContentParserConfiguration.EMPTY.withFiltering(includes, excludes, matchDotsInFieldNames);
173+
return XContentParserConfiguration.EMPTY.withFiltering(null, includes, excludes, matchDotsInFieldNames);
174174
}
175175

176176
private BytesReference filter(XContentParserConfiguration contentParserConfiguration) throws IOException {

0 commit comments

Comments
 (0)