Skip to content

Commit 20f91c5

Browse files
committed
Merge branch 'main' into esql-telemetry
2 parents 5137537 + c449da8 commit 20f91c5

File tree

2,471 files changed

+77599
-25827
lines changed

Some content is hidden

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

2,471 files changed

+77599
-25827
lines changed

.buildkite/hooks/pre-command

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ export GRADLE_BUILD_CACHE_PASSWORD
4747
BUILDKITE_API_TOKEN=$(vault read -field=token secret/ci/elastic-elasticsearch/buildkite-api-token)
4848
export BUILDKITE_API_TOKEN
4949

50+
export GH_TOKEN="$VAULT_GITHUB_TOKEN"
51+
5052
if [[ "${USE_LUCENE_SNAPSHOT_CREDS:-}" == "true" ]]; then
5153
data=$(.buildkite/scripts/get-legacy-secret.sh aws-elastic/creds/lucene-snapshots)
5254

@@ -117,3 +119,5 @@ if [[ -f /etc/os-release ]] && grep -q '"Amazon Linux 2"' /etc/os-release; then
117119
echo "$(hostname -i | cut -d' ' -f 2) $(hostname -f)." | sudo tee /etc/dnsmasq.hosts
118120
sudo systemctl restart dnsmasq.service
119121
fi
122+
123+
.buildkite/scripts/get-latest-test-mutes.sh

.buildkite/hooks/pre-command.bat

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@ set BUILD_NUMBER=%BUILDKITE_BUILD_NUMBER%
1515
set COMPOSE_HTTP_TIMEOUT=120
1616
set JOB_BRANCH=%BUILDKITE_BRANCH%
1717

18+
set GH_TOKEN=%VAULT_GITHUB_TOKEN%
19+
1820
set GRADLE_BUILD_CACHE_USERNAME=vault read -field=username secret/ci/elastic-elasticsearch/migrated/gradle-build-cache
1921
set GRADLE_BUILD_CACHE_PASSWORD=vault read -field=password secret/ci/elastic-elasticsearch/migrated/gradle-build-cache
2022

2123
bash.exe -c "nohup bash .buildkite/scripts/setup-monitoring.sh </dev/null >/dev/null 2>&1 &"
24+
bash.exe -c "bash .buildkite/scripts/get-latest-test-mutes.sh"
2225

2326
exit /b 0

.buildkite/pipelines/intake.template.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
steps:
22
- label: sanity-check
3-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files precommit
3+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints precommit
44
timeout_in_minutes: 300
55
agents:
66
provider: gcp
@@ -9,39 +9,39 @@ steps:
99
buildDirectory: /dev/shm/bk
1010
- wait
1111
- label: part1
12-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart1
12+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart1
1313
timeout_in_minutes: 300
1414
agents:
1515
provider: gcp
1616
image: family/elasticsearch-ubuntu-2004
1717
machineType: n1-standard-32
1818
buildDirectory: /dev/shm/bk
1919
- label: part2
20-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart2
20+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart2
2121
timeout_in_minutes: 300
2222
agents:
2323
provider: gcp
2424
image: family/elasticsearch-ubuntu-2004
2525
machineType: n1-standard-32
2626
buildDirectory: /dev/shm/bk
2727
- label: part3
28-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart3
28+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart3
2929
timeout_in_minutes: 300
3030
agents:
3131
provider: gcp
3232
image: family/elasticsearch-ubuntu-2004
3333
machineType: n1-standard-32
3434
buildDirectory: /dev/shm/bk
3535
- label: part4
36-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart4
36+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart4
3737
timeout_in_minutes: 300
3838
agents:
3939
provider: gcp
4040
image: family/elasticsearch-ubuntu-2004
4141
machineType: n1-standard-32
4242
buildDirectory: /dev/shm/bk
4343
- label: part5
44-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart5
44+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart5
4545
timeout_in_minutes: 300
4646
agents:
4747
provider: gcp
@@ -51,7 +51,7 @@ steps:
5151
- group: bwc-snapshots
5252
steps:
5353
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
54-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files v$$BWC_VERSION#bwcTest
54+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints v$$BWC_VERSION#bwcTest
5555
timeout_in_minutes: 300
5656
matrix:
5757
setup:
@@ -64,7 +64,7 @@ steps:
6464
env:
6565
BWC_VERSION: "{{matrix.BWC_VERSION}}"
6666
- label: rest-compat
67-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkRestCompat
67+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkRestCompat
6868
timeout_in_minutes: 300
6969
agents:
7070
provider: gcp

.buildkite/pipelines/intake.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file is auto-generated. See .buildkite/pipelines/intake.template.yml
22
steps:
33
- label: sanity-check
4-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files precommit
4+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints precommit
55
timeout_in_minutes: 300
66
agents:
77
provider: gcp
@@ -10,39 +10,39 @@ steps:
1010
buildDirectory: /dev/shm/bk
1111
- wait
1212
- label: part1
13-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart1
13+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart1
1414
timeout_in_minutes: 300
1515
agents:
1616
provider: gcp
1717
image: family/elasticsearch-ubuntu-2004
1818
machineType: n1-standard-32
1919
buildDirectory: /dev/shm/bk
2020
- label: part2
21-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart2
21+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart2
2222
timeout_in_minutes: 300
2323
agents:
2424
provider: gcp
2525
image: family/elasticsearch-ubuntu-2004
2626
machineType: n1-standard-32
2727
buildDirectory: /dev/shm/bk
2828
- label: part3
29-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart3
29+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart3
3030
timeout_in_minutes: 300
3131
agents:
3232
provider: gcp
3333
image: family/elasticsearch-ubuntu-2004
3434
machineType: n1-standard-32
3535
buildDirectory: /dev/shm/bk
3636
- label: part4
37-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart4
37+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart4
3838
timeout_in_minutes: 300
3939
agents:
4040
provider: gcp
4141
image: family/elasticsearch-ubuntu-2004
4242
machineType: n1-standard-32
4343
buildDirectory: /dev/shm/bk
4444
- label: part5
45-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart5
45+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart5
4646
timeout_in_minutes: 300
4747
agents:
4848
provider: gcp
@@ -52,7 +52,7 @@ steps:
5252
- group: bwc-snapshots
5353
steps:
5454
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
55-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files v$$BWC_VERSION#bwcTest
55+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints v$$BWC_VERSION#bwcTest
5656
timeout_in_minutes: 300
5757
matrix:
5858
setup:
@@ -65,7 +65,7 @@ steps:
6565
env:
6666
BWC_VERSION: "{{matrix.BWC_VERSION}}"
6767
- label: rest-compat
68-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkRestCompat
68+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkRestCompat
6969
timeout_in_minutes: 300
7070
agents:
7171
provider: gcp

.buildkite/pipelines/lucene-snapshot/run-tests.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
steps:
22
- label: sanity-check
3-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files precommit
3+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints precommit
44
timeout_in_minutes: 300
55
agents:
66
provider: gcp
@@ -9,39 +9,39 @@ steps:
99
buildDirectory: /dev/shm/bk
1010
- wait: null
1111
- label: part1
12-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart1
12+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart1
1313
timeout_in_minutes: 300
1414
agents:
1515
provider: gcp
1616
image: family/elasticsearch-ubuntu-2004
1717
machineType: custom-32-98304
1818
buildDirectory: /dev/shm/bk
1919
- label: part2
20-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart2
20+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart2
2121
timeout_in_minutes: 300
2222
agents:
2323
provider: gcp
2424
image: family/elasticsearch-ubuntu-2004
2525
machineType: custom-32-98304
2626
buildDirectory: /dev/shm/bk
2727
- label: part3
28-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart3
28+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart3
2929
timeout_in_minutes: 300
3030
agents:
3131
provider: gcp
3232
image: family/elasticsearch-ubuntu-2004
3333
machineType: custom-32-98304
3434
buildDirectory: /dev/shm/bk
3535
- label: part4
36-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart4
36+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart4
3737
timeout_in_minutes: 300
3838
agents:
3939
provider: gcp
4040
image: family/elasticsearch-ubuntu-2004
4141
machineType: custom-32-98304
4242
buildDirectory: /dev/shm/bk
4343
- label: part5
44-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart5
44+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart5
4545
timeout_in_minutes: 300
4646
agents:
4747
provider: gcp
@@ -51,7 +51,7 @@ steps:
5151
- group: bwc-snapshots
5252
steps:
5353
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
54-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files v$$BWC_VERSION#bwcTest
54+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints v$$BWC_VERSION#bwcTest
5555
timeout_in_minutes: 300
5656
matrix:
5757
setup:
@@ -66,7 +66,7 @@ steps:
6666
env:
6767
BWC_VERSION: "{{matrix.BWC_VERSION}}"
6868
- label: rest-compat
69-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkRestCompat
69+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkRestCompat
7070
timeout_in_minutes: 300
7171
agents:
7272
provider: gcp

.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.4 / packaging-tests-upgrade"
277-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.4
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.4
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: 3 additions & 3 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.4 / bwc
291-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.4#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.4
300+
BWC_VERSION: 8.15.5
301301
retry:
302302
automatic:
303303
- exit_status: "-1"

.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

0 commit comments

Comments
 (0)