Skip to content

Commit 75ca7d7

Browse files
elasticmachineelasticmachine
authored
Merge branch '9.0' into backport/9.0/pr-121335
2 parents bf44259 + 0cf22ae commit 75ca7d7

File tree

1,131 files changed

+21741
-10098
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,131 files changed

+21741
-10098
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/dra-workflow.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ steps:
2020
env:
2121
DRA_WORKFLOW: staging
2222
USE_PROD_DOCKER_CREDENTIALS: "true"
23+
VERSION_QUALIFIER: "${VERSION_QUALIFIER}"
2324
if: build.env('DRA_WORKFLOW') == 'staging'

‎.buildkite/pipelines/intake.template.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ steps:
9696
- trigger: elasticsearch-dra-workflow
9797
label: Trigger DRA snapshot workflow
9898
async: true
99-
branches: "main 8.* 7.17"
99+
branches: "main 9.* 8.* 7.17"
100100
build:
101101
branch: "$BUILDKITE_BRANCH"
102102
commit: "$BUILDKITE_COMMIT"

‎.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"]
59+
BWC_VERSION: ["8.16.5", "8.17.3", "8.18.0", "9.0.0"]
6060
agents:
6161
provider: gcp
6262
image: family/elasticsearch-ubuntu-2004
@@ -97,7 +97,7 @@ steps:
9797
- trigger: elasticsearch-dra-workflow
9898
label: Trigger DRA snapshot workflow
9999
async: true
100-
branches: "main 8.* 7.17"
100+
branches: "main 9.* 8.* 7.17"
101101
build:
102102
branch: "$BUILDKITE_BRANCH"
103103
commit: "$BUILDKITE_COMMIT"

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

Lines changed: 6 additions & 22 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
@@ -335,22 +335,6 @@ steps:
335335
env:
336336
BWC_VERSION: 8.18.0
337337

338-
- label: "{{matrix.image}} / 8.19.0 / packaging-tests-upgrade"
339-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.0
340-
timeout_in_minutes: 300
341-
matrix:
342-
setup:
343-
image:
344-
- rocky-8
345-
- ubuntu-2004
346-
agents:
347-
provider: gcp
348-
image: family/elasticsearch-{{matrix.image}}
349-
machineType: custom-16-32768
350-
buildDirectory: /dev/shm/bk
351-
env:
352-
BWC_VERSION: 8.19.0
353-
354338
- label: "{{matrix.image}} / 9.0.0 / packaging-tests-upgrade"
355339
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.0
356340
timeout_in_minutes: 300

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 8 additions & 27 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"
@@ -363,25 +363,6 @@ steps:
363363
- signal_reason: agent_stop
364364
limit: 3
365365

366-
- label: 8.19.0 / bwc
367-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.19.0#bwcTest
368-
timeout_in_minutes: 300
369-
agents:
370-
provider: gcp
371-
image: family/elasticsearch-ubuntu-2004
372-
machineType: n1-standard-32
373-
buildDirectory: /dev/shm/bk
374-
preemptible: true
375-
env:
376-
BWC_VERSION: 8.19.0
377-
retry:
378-
automatic:
379-
- exit_status: "-1"
380-
limit: 3
381-
signal_reason: none
382-
- signal_reason: agent_stop
383-
limit: 3
384-
385366
- label: 9.0.0 / bwc
386367
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.0#bwcTest
387368
timeout_in_minutes: 300
@@ -467,7 +448,7 @@ steps:
467448
setup:
468449
ES_RUNTIME_JAVA:
469450
- openjdk21
470-
BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "8.19.0", "9.0.0"]
451+
BWC_VERSION: ["8.16.5", "8.17.3", "8.18.0", "9.0.0"]
471452
agents:
472453
provider: gcp
473454
image: family/elasticsearch-ubuntu-2004
@@ -509,7 +490,7 @@ steps:
509490
ES_RUNTIME_JAVA:
510491
- openjdk21
511492
- openjdk23
512-
BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "8.19.0", "9.0.0"]
493+
BWC_VERSION: ["8.16.5", "8.17.3", "8.18.0", "9.0.0"]
513494
agents:
514495
provider: gcp
515496
image: family/elasticsearch-ubuntu-2004

‎.ci/bwcVersions‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ 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"
21-
- "8.19.0"
2221
- "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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
BWC_VERSION:
2-
- "8.16.4"
3-
- "8.17.2"
2+
- "8.16.5"
3+
- "8.17.3"
44
- "8.18.0"
5-
- "8.19.0"
65
- "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

0 commit comments

Comments
 (0)