Skip to content

Commit 675ed14

Browse files
ChrisHegartyChrisHegarty
committed
Merge branch 'main' into fork
2 parents a990ff3 + 2ae80c7 commit 675ed14

File tree

673 files changed

+17817
-8643
lines changed

Some content is hidden

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

673 files changed

+17817
-8643
lines changed

‎.buildkite/hooks/pre-command‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ export GRADLE_BUILD_CACHE_USERNAME
4444
GRADLE_BUILD_CACHE_PASSWORD=$(vault read -field=password secret/ci/elastic-elasticsearch/migrated/gradle-build-cache)
4545
export GRADLE_BUILD_CACHE_PASSWORD
4646

47+
DEVELOCITY_ACCESS_KEY="gradle-enterprise.elastic.co=$(vault read -field=accesskey secret/ci/elastic-elasticsearch/migrated/gradle-build-cache)"
48+
export DEVELOCITY_ACCESS_KEY
49+
4750
BUILDKITE_API_TOKEN=$(vault read -field=token secret/ci/elastic-elasticsearch/buildkite-api-token)
4851
export BUILDKITE_API_TOKEN
4952

‎.buildkite/pipelines/intake.yml‎

Lines changed: 2 additions & 2 deletions
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.16.4", "8.17.2", "8.18.0", "8.19.0", "9.0.0", "9.1.0"]
59+
BWC_VERSION: ["8.16.5", "8.17.3", "8.18.0", "8.19.0", "9.0.0", "9.1.0"]
6060
agents:
6161
provider: gcp
6262
image: family/elasticsearch-ubuntu-2004
@@ -76,7 +76,7 @@ steps:
7676
ES_VERSION:
7777
- "9.0.0"
7878
ES_COMMIT:
79-
- "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578" # update to match last commit before lucene bump
79+
- "10352e57d85505984582616e1e38530d3ec6ca59" # update to match last commit before lucene bump / head of combat-lucene-10-0-0
8080
agents:
8181
provider: gcp
8282
image: family/elasticsearch-ubuntu-2004

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,8 @@ steps:
287287
env:
288288
BWC_VERSION: 8.15.5
289289

290-
- label: "{{matrix.image}} / 8.16.4 / packaging-tests-upgrade"
291-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.4
290+
- label: "{{matrix.image}} / 8.16.5 / packaging-tests-upgrade"
291+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.5
292292
timeout_in_minutes: 300
293293
matrix:
294294
setup:
@@ -301,10 +301,10 @@ steps:
301301
machineType: custom-16-32768
302302
buildDirectory: /dev/shm/bk
303303
env:
304-
BWC_VERSION: 8.16.4
304+
BWC_VERSION: 8.16.5
305305

306-
- label: "{{matrix.image}} / 8.17.2 / packaging-tests-upgrade"
307-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.2
306+
- label: "{{matrix.image}} / 8.17.3 / packaging-tests-upgrade"
307+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.3
308308
timeout_in_minutes: 300
309309
matrix:
310310
setup:
@@ -317,7 +317,7 @@ steps:
317317
machineType: custom-16-32768
318318
buildDirectory: /dev/shm/bk
319319
env:
320-
BWC_VERSION: 8.17.2
320+
BWC_VERSION: 8.17.3
321321

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

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ steps:
7878
BWC_VERSION: "{{matrix.BWC_VERSION}}"
7979
- group: java-matrix
8080
steps:
81-
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.GRADLE_TASK}} / java-matrix"
82-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true $$GRADLE_TASK
81+
- label: "{{matrix.ES_RUNTIME_JAVA}} / entitlements={{matrix.ENTITLEMENTS_ENABLED}} / {{matrix.GRADLE_TASK}} / java-matrix"
82+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline="-Des.entitlements.enabled=$$ENTITLEMENTS_ENABLED" $$GRADLE_TASK
8383
timeout_in_minutes: 300
8484
matrix:
8585
setup:
@@ -94,6 +94,9 @@ steps:
9494
- checkPart4
9595
- checkPart5
9696
- checkRestCompat
97+
ENTITLEMENTS_ENABLED:
98+
- "true"
99+
- "false"
97100
agents:
98101
provider: gcp
99102
image: family/elasticsearch-ubuntu-2004
@@ -102,6 +105,7 @@ steps:
102105
env:
103106
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
104107
GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
108+
ENTITLEMENTS_ENABLED: "{{matrix.ENTITLEMENTS_ENABLED}}"
105109
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.BWC_VERSION}} / java-matrix-bwc"
106110
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest
107111
timeout_in_minutes: 300

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,8 @@ steps:
306306
- signal_reason: agent_stop
307307
limit: 3
308308

309-
- label: 8.16.4 / bwc
310-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.4#bwcTest
309+
- label: 8.16.5 / bwc
310+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.5#bwcTest
311311
timeout_in_minutes: 300
312312
agents:
313313
provider: gcp
@@ -316,7 +316,7 @@ steps:
316316
buildDirectory: /dev/shm/bk
317317
preemptible: true
318318
env:
319-
BWC_VERSION: 8.16.4
319+
BWC_VERSION: 8.16.5
320320
retry:
321321
automatic:
322322
- exit_status: "-1"
@@ -325,8 +325,8 @@ steps:
325325
- signal_reason: agent_stop
326326
limit: 3
327327

328-
- label: 8.17.2 / bwc
329-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.2#bwcTest
328+
- label: 8.17.3 / bwc
329+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.3#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.2
338+
BWC_VERSION: 8.17.3
339339
retry:
340340
automatic:
341341
- exit_status: "-1"
@@ -486,7 +486,7 @@ steps:
486486
setup:
487487
ES_RUNTIME_JAVA:
488488
- openjdk21
489-
BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "8.19.0", "9.0.0", "9.1.0"]
489+
BWC_VERSION: ["8.16.5", "8.17.3", "8.18.0", "8.19.0", "9.0.0", "9.1.0"]
490490
agents:
491491
provider: gcp
492492
image: family/elasticsearch-ubuntu-2004
@@ -497,8 +497,8 @@ steps:
497497
BWC_VERSION: "{{matrix.BWC_VERSION}}"
498498
- group: java-matrix
499499
steps:
500-
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.GRADLE_TASK}} / java-matrix"
501-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true $$GRADLE_TASK
500+
- label: "{{matrix.ES_RUNTIME_JAVA}} / entitlements={{matrix.ENTITLEMENTS_ENABLED}} / {{matrix.GRADLE_TASK}} / java-matrix"
501+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline="-Des.entitlements.enabled=$$ENTITLEMENTS_ENABLED" $$GRADLE_TASK
502502
timeout_in_minutes: 300
503503
matrix:
504504
setup:
@@ -513,6 +513,9 @@ steps:
513513
- checkPart4
514514
- checkPart5
515515
- checkRestCompat
516+
ENTITLEMENTS_ENABLED:
517+
- "true"
518+
- "false"
516519
agents:
517520
provider: gcp
518521
image: family/elasticsearch-ubuntu-2004
@@ -521,6 +524,7 @@ steps:
521524
env:
522525
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
523526
GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
527+
ENTITLEMENTS_ENABLED: "{{matrix.ENTITLEMENTS_ENABLED}}"
524528
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.BWC_VERSION}} / java-matrix-bwc"
525529
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest
526530
timeout_in_minutes: 300
@@ -529,7 +533,7 @@ steps:
529533
ES_RUNTIME_JAVA:
530534
- openjdk21
531535
- openjdk23
532-
BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "8.19.0", "9.0.0", "9.1.0"]
536+
BWC_VERSION: ["8.16.5", "8.17.3", "8.18.0", "8.19.0", "9.0.0", "9.1.0"]
533537
agents:
534538
provider: gcp
535539
image: family/elasticsearch-ubuntu-2004

‎.ci/bwcVersions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ BWC_VERSION:
1515
- "8.13.4"
1616
- "8.14.3"
1717
- "8.15.5"
18-
- "8.16.4"
19-
- "8.17.2"
18+
- "8.16.5"
19+
- "8.17.3"
2020
- "8.18.0"
2121
- "8.19.0"
2222
- "9.0.0"

‎.ci/init.gradle‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,24 @@
1+
final String buildCacheUrl = System.getProperty('org.elasticsearch.build.cache.url')
2+
final boolean buildCachePush = Boolean.valueOf(System.getProperty('org.elasticsearch.build.cache.push', 'false'))
3+
14
gradle.settingsEvaluated { settings ->
25
settings.pluginManager.withPlugin("com.gradle.develocity") {
36
settings.develocity {
4-
server = 'https://gradle-enterprise.elastic.co'
7+
server = "https://gradle-enterprise.elastic.co"
58
}
6-
}
7-
}
8-
9-
final String buildCacheUrl = System.getProperty('org.elasticsearch.build.cache.url')
10-
final boolean buildCachePush = Boolean.valueOf(System.getProperty('org.elasticsearch.build.cache.push', 'false'))
11-
12-
if (buildCacheUrl) {
13-
gradle.settingsEvaluated { settings ->
14-
settings.buildCache {
15-
local {
16-
// Disable the local build cache in CI since we use ephemeral workers and it incurs an IO penalty
17-
enabled = false
18-
}
19-
remote(HttpBuildCache) {
20-
url = buildCacheUrl
21-
push = buildCachePush
22-
credentials {
23-
username = System.getenv("GRADLE_BUILD_CACHE_USERNAME")
24-
password = System.getenv("GRADLE_BUILD_CACHE_PASSWORD")
9+
if (buildCacheUrl) {
10+
settings.buildCache {
11+
local {
12+
// Disable the local build cache in CI since we use ephemeral workers and it incurs an IO penalty
13+
enabled = false
14+
}
15+
remote(settings.develocity.buildCache) {
16+
enabled = true
17+
push = buildCachePush
2518
}
2619
}
2720
}
2821
}
2922
}
23+
24+

‎.ci/snapshotBwcVersions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BWC_VERSION:
2-
- "8.16.4"
3-
- "8.17.2"
2+
- "8.16.5"
3+
- "8.17.3"
44
- "8.18.0"
55
- "8.19.0"
66
- "9.0.0"

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ distribution/docker/src @elastic/es-delivery
4949
# Core/Infra
5050
distribution/tools @elastic/es-core-infra
5151
libs/core @elastic/es-core-infra
52+
libs/entitlement @elastic/es-core-infra
5253
libs/logging @elastic/es-core-infra
5354
libs/native @elastic/es-core-infra
5455
libs/plugin-analysis-api @elastic/es-core-infra

‎benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/ValuesSourceReaderBenchmark.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,8 @@ private static BlockLoader numericBlockLoader(WhereAndBaseName w, NumberFieldMap
261261
null,
262262
false,
263263
null,
264-
null
264+
null,
265+
false
265266
).blockLoader(null);
266267
}
267268

0 commit comments

Comments
 (0)