Skip to content

Commit 7c46dac

Browse files
weizijunweizijun
authored
Merge branch 'main' into fix-dense-vector-cosine
2 parents e7def9d + f2afb88 commit 7c46dac

File tree

1,799 files changed

+67620
-20391
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,799 files changed

+67620
-20391
lines changed

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ steps:
6565
timeout_in_minutes: 300
6666
matrix:
6767
setup:
68-
BWC_VERSION: ["8.19.6", "9.1.7", "9.2.1", "9.3.0"]
68+
BWC_VERSION: ["8.19.7", "9.1.7", "9.2.1", "9.3.0"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
steps:
22
- label: "{{matrix.FWC_VERSION}} / fwc"
3-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$FWC_VERSION#fwcTest -Dtests.bwc.snapshot=false
3+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v$$FWC_VERSION#fwcTest -Dtests.bwc.snapshot=false
44
timeout_in_minutes: 300
55
agents:
66
provider: gcp

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file is auto-generated. See .buildkite/pipelines/periodic-fwc.template.yml
22
steps:
33
- label: "{{matrix.FWC_VERSION}} / fwc"
4-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$FWC_VERSION#fwcTest -Dtests.bwc.snapshot=false
4+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v$$FWC_VERSION#fwcTest -Dtests.bwc.snapshot=false
55
timeout_in_minutes: 300
66
agents:
77
provider: gcp

‎.buildkite/pipelines/periodic-java-ea.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,8 @@ steps:
366366
- signal_reason: agent_stop
367367
limit: 3
368368

369-
- label: 8.19.6 / bwc
370-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.19.6#bwcTest
369+
- label: 8.19.7 / bwc
370+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.19.7#bwcTest
371371
timeout_in_minutes: 300
372372
agents:
373373
provider: gcp
@@ -376,7 +376,7 @@ steps:
376376
buildDirectory: /dev/shm/bk
377377
preemptible: true
378378
env:
379-
BWC_VERSION: 8.19.6
379+
BWC_VERSION: 8.19.7
380380
retry:
381381
automatic:
382382
- exit_status: "-1"
@@ -538,7 +538,7 @@ steps:
538538
timeout_in_minutes: 300
539539
matrix:
540540
setup:
541-
BWC_VERSION: ["8.19.6", "9.1.7", "9.2.1", "9.3.0"]
541+
BWC_VERSION: ["8.19.7", "9.1.7", "9.2.1", "9.3.0"]
542542
agents:
543543
provider: gcp
544544
image: family/elasticsearch-ubuntu-2404

‎.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
- rocky-9
1919
- rhel-8
2020
- rhel-9
21+
- rhel-10
2122
- almalinux-8
2223
- almalinux-9
2324
agents:

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ steps:
1919
- rocky-9
2020
- rhel-8
2121
- rhel-9
22+
- rhel-10
2223
- almalinux-8
2324
- almalinux-9
2425
agents:
@@ -334,8 +335,8 @@ steps:
334335
env:
335336
BWC_VERSION: 8.18.8
336337

337-
- label: "{{matrix.image}} / 8.19.6 / packaging-tests-upgrade"
338-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.6
338+
- label: "{{matrix.image}} / 8.19.7 / packaging-tests-upgrade"
339+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.7
339340
timeout_in_minutes: 300
340341
matrix:
341342
setup:
@@ -348,7 +349,7 @@ steps:
348349
machineType: custom-16-32768
349350
buildDirectory: /dev/shm/bk
350351
env:
351-
BWC_VERSION: 8.19.6
352+
BWC_VERSION: 8.19.7
352353

353354
- label: "{{matrix.image}} / 9.0.7 / packaging-tests-upgrade"
354355
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.7

‎.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
- rocky-9
1919
- rhel-8
2020
- rhel-9
21+
- rhel-10
2122
- almalinux-8
2223
- almalinux-9
2324
agents:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- label: $BWC_VERSION / bwc
2-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$BWC_VERSION#bwcTest
2+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v$BWC_VERSION#bwcTest
33
timeout_in_minutes: 300
44
agents:
55
provider: gcp

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

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ steps:
22
- group: bwc
33
steps: $BWC_STEPS
44
- label: concurrent-search-tests
5-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true functionalTests
5+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true functionalTests
66
timeout_in_minutes: 420
77
agents:
88
provider: gcp
99
image: family/elasticsearch-ubuntu-2404
1010
diskSizeGb: 350
1111
machineType: custom-32-98304
12+
1213
- label: encryption-at-rest
1314
command: .buildkite/scripts/encryption-at-rest.sh
1415
timeout_in_minutes: 420
@@ -17,6 +18,7 @@ steps:
1718
image: family/elasticsearch-ubuntu-2404
1819
diskSizeGb: 350
1920
machineType: custom-32-98304
21+
2022
- label: eql-correctness
2123
command: .buildkite/scripts/eql-correctness.sh
2224
timeout_in_minutes: 300
@@ -25,6 +27,7 @@ steps:
2527
image: family/elasticsearch-ubuntu-2404
2628
machineType: custom-32-98304
2729
buildDirectory: /dev/shm/bk
30+
2831
- label: example-plugins
2932
command: |-
3033
cd $$WORKSPACE/plugins/examples
@@ -36,10 +39,11 @@ steps:
3639
image: family/elasticsearch-ubuntu-2404
3740
machineType: custom-32-98304
3841
buildDirectory: /dev/shm/bk
42+
3943
- group: java-fips-matrix
4044
steps:
4145
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.GRADLE_TASK}} / java-fips-matrix"
42-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.fips.enabled=true $$GRADLE_TASK
46+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true -Dtests.fips.enabled=true $$GRADLE_TASK
4347
timeout_in_minutes: 300
4448
matrix:
4549
setup:
@@ -61,8 +65,9 @@ steps:
6165
env:
6266
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
6367
GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
68+
6469
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.BWC_VERSION}} / java-fips-matrix-bwc"
65-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.fips.enabled=true v$$BWC_VERSION#bwcTest
70+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true -Dtests.fips.enabled=true v$$BWC_VERSION#bwcTest
6671
timeout_in_minutes: 300
6772
matrix:
6873
setup:
@@ -77,10 +82,11 @@ steps:
7782
env:
7883
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
7984
BWC_VERSION: "{{matrix.BWC_VERSION}}"
85+
8086
- group: java-matrix
8187
steps:
8288
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.GRADLE_TASK}} / java-matrix"
83-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true $$GRADLE_TASK
89+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true $$GRADLE_TASK
8490
timeout_in_minutes: 300
8591
matrix:
8692
setup:
@@ -104,8 +110,9 @@ steps:
104110
env:
105111
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
106112
GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
113+
107114
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.BWC_VERSION}} / java-matrix-bwc"
108-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest
115+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest
109116
timeout_in_minutes: 300
110117
matrix:
111118
setup:
@@ -121,6 +128,7 @@ steps:
121128
env:
122129
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
123130
BWC_VERSION: "{{matrix.BWC_VERSION}}"
131+
124132
- label: release-tests
125133
command: .buildkite/scripts/release-tests.sh
126134
timeout_in_minutes: 360
@@ -129,22 +137,24 @@ steps:
129137
image: family/elasticsearch-ubuntu-2404
130138
diskSizeGb: 350
131139
machineType: custom-32-98304
140+
132141
- label: single-processor-node-tests
133-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.configure_test_clusters_with_one_processor=true functionalTests
142+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true -Dtests.configure_test_clusters_with_one_processor=true functionalTests
134143
timeout_in_minutes: 420
135144
agents:
136145
provider: gcp
137146
image: family/elasticsearch-ubuntu-2404
138147
diskSizeGb: 350
139148
machineType: custom-32-98304
149+
140150
- group: third-party tests
141151
steps:
142152
- label: third-party / azure-sas
143153
command: |
144154
export azure_storage_container=elasticsearch-ci-thirdparty-sas
145155
export azure_storage_base_path=$BUILDKITE_BRANCH
146156
147-
.ci/scripts/run-gradle.sh azureThirdPartyTest
157+
.ci/scripts/run-gradle.sh --continue azureThirdPartyTest
148158
env:
149159
USE_3RD_PARTY_AZURE_SAS_CREDENTIALS: "true"
150160
timeout_in_minutes: 30
@@ -153,12 +163,13 @@ steps:
153163
image: family/elasticsearch-ubuntu-2404
154164
machineType: n2-standard-8
155165
buildDirectory: /dev/shm/bk
166+
156167
- label: third-party / azure
157168
command: |
158169
export azure_storage_container=elasticsearch-ci-thirdparty
159170
export azure_storage_base_path=$BUILDKITE_BRANCH
160171
161-
.ci/scripts/run-gradle.sh azureThirdPartyTest
172+
.ci/scripts/run-gradle.sh --continue azureThirdPartyTest
162173
env:
163174
USE_3RD_PARTY_AZURE_CREDENTIALS: "true"
164175
timeout_in_minutes: 30
@@ -167,12 +178,13 @@ steps:
167178
image: family/elasticsearch-ubuntu-2404
168179
machineType: n2-standard-8
169180
buildDirectory: /dev/shm/bk
181+
170182
- label: third-party / gcs
171183
command: |
172184
export google_storage_bucket=elasticsearch-ci-thirdparty
173185
export google_storage_base_path=$BUILDKITE_BRANCH
174186
175-
.ci/scripts/run-gradle.sh gcsThirdPartyTest
187+
.ci/scripts/run-gradle.sh --continue gcsThirdPartyTest
176188
env:
177189
USE_3RD_PARTY_GCS_CREDENTIALS: "true"
178190
timeout_in_minutes: 30
@@ -181,21 +193,23 @@ steps:
181193
image: family/elasticsearch-ubuntu-2404
182194
machineType: n2-standard-8
183195
buildDirectory: /dev/shm/bk
196+
184197
- label: third-party / geoip
185198
command: |
186-
.ci/scripts/run-gradle.sh :modules:ingest-geoip:internalClusterTest -Dtests.jvm.argline="-Dgeoip_use_service=true"
199+
.ci/scripts/run-gradle.sh --continue :modules:ingest-geoip:internalClusterTest -Dtests.jvm.argline="-Dgeoip_use_service=true"
187200
timeout_in_minutes: 30
188201
agents:
189202
provider: gcp
190203
image: family/elasticsearch-ubuntu-2404
191204
machineType: n2-standard-8
192205
buildDirectory: /dev/shm/bk
206+
193207
- label: third-party / s3
194208
command: |
195209
export amazon_s3_bucket=elasticsearch-ci.us-west-2
196210
export amazon_s3_base_path=$BUILDKITE_BRANCH
197211
198-
.ci/scripts/run-gradle.sh s3ThirdPartyTest
212+
.ci/scripts/run-gradle.sh --continue s3ThirdPartyTest
199213
env:
200214
USE_3RD_PARTY_S3_CREDENTIALS: "true"
201215
timeout_in_minutes: 30
@@ -204,9 +218,10 @@ steps:
204218
image: family/elasticsearch-ubuntu-2404
205219
machineType: n2-standard-8
206220
buildDirectory: /dev/shm/bk
221+
207222
- label: third-party / ms-graph
208223
command: |
209-
.ci/scripts/run-gradle.sh msGraphThirdPartyTest
224+
.ci/scripts/run-gradle.sh --continue msGraphThirdPartyTest
210225
env:
211226
USE_3RD_PARTY_MS_GRAPH_CREDENTIALS: "true"
212227
timeout_in_minutes: 30
@@ -215,10 +230,11 @@ steps:
215230
image: family/elasticsearch-ubuntu-2404
216231
machineType: n2-standard-8
217232
buildDirectory: /dev/shm/bk
233+
218234
- group: lucene-compat
219235
steps:
220236
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"
221-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints -Dtests.bwc.main.version=$$ES_VERSION -Dtests.bwc.refspec.main=$$ES_COMMIT luceneBwcTest
237+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints -Dtests.bwc.main.version=$$ES_VERSION -Dtests.bwc.refspec.main=$$ES_COMMIT luceneBwcTest
222238
timeout_in_minutes: 300
223239
matrix:
224240
setup:
@@ -236,6 +252,7 @@ steps:
236252
env:
237253
ES_VERSION: "{{matrix.ES_VERSION}}"
238254
ES_COMMIT: "{{matrix.ES_COMMIT}}"
255+
239256
- label: Upload Snyk Dependency Graph
240257
command: .ci/scripts/run-gradle.sh uploadSnykDependencyGraph -PsnykTargetReference=$BUILDKITE_BRANCH
241258
env:
@@ -247,13 +264,15 @@ steps:
247264
machineType: n2-standard-8
248265
buildDirectory: /dev/shm/bk
249266
if: build.branch =~ /^(main|\d+\.\d+|\d+\.x)$$/
267+
250268
- label: check-branch-consistency
251269
command: .ci/scripts/run-gradle.sh branchConsistency
252270
timeout_in_minutes: 15
253271
agents:
254272
provider: gcp
255273
image: family/elasticsearch-ubuntu-2404
256274
machineType: n2-standard-2
275+
257276
- label: check-branch-protection-rules
258277
command: .buildkite/scripts/branch-protection.sh
259278
timeout_in_minutes: 5

0 commit comments

Comments
 (0)